WM: rename files, manipulator -> gizmo

Edit doxy files and header guards only.

14 files changed, 56 insertions, 56 deletions

diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 67674dae4f3..edf76364503 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -25,8 +25,8 @@
 
 set(INC
 	.
-	manipulators
-	manipulators/intern
+	gizmo
+	gizmo/intern
 	../blenfont
 	../blenkernel
 	../blenlib
@@ -79,12 +79,12 @@ set(SRC
 	intern/wm_tooltip.c
 	intern/wm_uilist_type.c
 	intern/wm_window.c
-	manipulators/intern/wm_manipulator.c
-	manipulators/intern/wm_manipulator_group.c
-	manipulators/intern/wm_manipulator_group_type.c
-	manipulators/intern/wm_manipulator_map.c
-	manipulators/intern/wm_manipulator_target_props.c
-	manipulators/intern/wm_manipulator_type.c
+	gizmo/intern/wm_gizmo.c
+	gizmo/intern/wm_gizmo_group.c
+	gizmo/intern/wm_gizmo_group_type.c
+	gizmo/intern/wm_gizmo_map.c
+	gizmo/intern/wm_gizmo_target_props.c
+	gizmo/intern/wm_gizmo_type.c
 	message_bus/intern/wm_message_bus.c
 	message_bus/intern/wm_message_bus_rna.c
 	message_bus/intern/wm_message_bus_static.c
@@ -100,11 +100,11 @@ set(SRC
 	wm_event_types.h
 	wm_files.h
 	wm_window.h
-	manipulators/WM_manipulator_api.h
-	manipulators/WM_manipulator_types.h
-	manipulators/wm_manipulator_fn.h
-	manipulators/wm_manipulator_wmapi.h
-	manipulators/intern/wm_manipulator_intern.h
+	gizmo/WM_gizmo_api.h
+	gizmo/WM_gizmo_types.h
+	gizmo/wm_gizmo_fn.h
+	gizmo/wm_gizmo_wmapi.h
+	gizmo/intern/wm_gizmo_intern.h
 	message_bus/intern/wm_message_bus_intern.h
 	message_bus/wm_message_bus.h
 )
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 8b7633b635b..486eae0a0ed 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -121,10 +121,10 @@ struct ImBuf;
 /* exported types for WM */
 #include "wm_cursors.h"
 #include "wm_event_types.h"
-#include "manipulators/WM_manipulator_types.h"
+#include "gizmo/WM_gizmo_types.h"
 
 /* Include external manipulator API's */
-#include "manipulators/WM_manipulator_api.h"
+#include "gizmo/WM_gizmo_api.h"
 
 /* ************** wmOperatorType ************************ */
 
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
index b88956ac28d..ffd18af496e 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/WM_manipulator_api.h
+/** \file blender/windowmanager/gizmos/WM_gizmo_api.h
  *  \ingroup wm
  *
  * \name Manipulator API
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef __WM_MANIPULATOR_API_H__
-#define __WM_MANIPULATOR_API_H__
+#ifndef __WM_GIZMO_API_H__
+#define __WM_GIZMO_API_H__
 
 struct ARegion;
 struct GHashIterator;
@@ -54,7 +54,7 @@ struct wmManipulatorMapType_Params;
 struct wmMsgSubscribeKey;
 struct wmMsgSubscribeValue;
 
-#include "wm_manipulator_fn.h"
+#include "wm_gizmo_fn.h"
 
 /* -------------------------------------------------------------------- */
 /* wmManipulator */
@@ -340,4 +340,4 @@ bool WM_manipulator_context_check_drawstep(const struct bContext *C, eWM_Manipul
 
 bool WM_manipulator_group_type_poll(const struct bContext *C, const struct wmManipulatorGroupType *wgt);
 
-#endif  /* __WM_MANIPULATOR_API_H__ */
+#endif  /* __WM_GIZMO_API_H__ */
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_types.h b/source/blender/windowmanager/gizmo/WM_gizmo_types.h
index ee2f833858a..0f6af6db24c 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_types.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.h
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/WM_manipulator_types.h
+/** \file blender/windowmanager/gizmo/WM_gizmo_types.h
  *  \ingroup wm
  *
  * \name Manipulator Types
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef __WM_MANIPULATOR_TYPES_H__
-#define __WM_MANIPULATOR_TYPES_H__
+#ifndef __WM_GIZMO_TYPES_H__
+#define __WM_GIZMO_TYPES_H__
 
 #include "BLI_compiler_attrs.h"
 
@@ -148,7 +148,7 @@ typedef enum {
 	WM_MANIPULATOR_TWEAK_SNAP = (1 << 1),
 } eWM_ManipulatorTweak;
 
-#include "wm_manipulator_fn.h"
+#include "wm_gizmo_fn.h"
 
 typedef struct wmManipulatorOpElem {
 	struct wmOperatorType *type;
@@ -419,4 +419,4 @@ typedef enum eWM_ManipulatorMapDrawStep {
 } eWM_ManipulatorMapDrawStep;
 #define WM_MANIPULATORMAP_DRAWSTEP_MAX 2
 
-#endif  /* __WM_MANIPULATOR_TYPES_H__ */
+#endif  /* __WM_GIZMO_TYPES_H__ */
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c
index d6eb110dca0..bef193f6c56 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo.c
  *  \ingroup wm
  */
 
@@ -63,8 +63,8 @@
 #include "wm.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 static void wm_manipulator_register(
         wmManipulatorGroup *mgroup, wmManipulator *mpr);
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
index 8bda9e91db7..83af1a71163 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_group.c
  *  \ingroup wm
  *
  * \name Manipulator-Group
@@ -57,8 +57,8 @@
 #include "ED_undo.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
index b32eb84e289..f93beb0ac9f 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
  *  \ingroup wm
  */
 
@@ -40,8 +40,8 @@
 #include "wm.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 
 /** \name ManipulatorGroup Type Append
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
index ecf4ffd2ac4..7a007a8a909 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
@@ -20,20 +20,20 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
  *  \ingroup wm
  */
 
 
-#ifndef __WM_MANIPULATOR_INTERN_H__
-#define __WM_MANIPULATOR_INTERN_H__
+#ifndef __WM_GIZMO_INTERN_H__
+#define __WM_GIZMO_INTERN_H__
 
 struct wmKeyConfig;
 struct wmManipulatorMap;
 struct ManipulatorGeomInfo;
 struct GHashIterator;
 
-#include "wm_manipulator_fn.h"
+#include "wm_gizmo_fn.h"
 
 /* -------------------------------------------------------------------- */
 /* wmManipulator */
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
index 2a3aa5df197..94db6b45887 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_map.c
  *  \ingroup wm
  */
 
@@ -57,8 +57,8 @@
 #include "DEG_depsgraph.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 /**
  * Store all manipulator-maps here. Anyone who wants to register a manipulator for a certain
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
index 137e8f5639d..78d12e4e4ba 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
  *  \ingroup wm
  */
 
@@ -43,8 +43,8 @@
 #include "ED_view3d.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 /* -------------------------------------------------------------------- */
 
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
index fd7f31db903..4f31afb5b56 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_type.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_type.c
  *  \ingroup wm
  */
 
@@ -48,8 +48,8 @@
 #include "wm.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 
 /** \name Manipulator Type Append
diff --git a/source/blender/windowmanager/manipulators/wm_manipulator_fn.h b/source/blender/windowmanager/gizmo/wm_gizmo_fn.h
index 305d04eab68..8d28febbd5d 100644
--- a/source/blender/windowmanager/manipulators/wm_manipulator_fn.h
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_fn.h
@@ -18,14 +18,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/wm_manipulator_fn.h
+/** \file blender/windowmanager/gizmo/wm_gizmo_fn.h
  *  \ingroup wm
  *
  * Callback function definitions, needed for both Types & API headers.
  */
 
-#ifndef __WM_MANIPULATOR_FN_H__
-#define __WM_MANIPULATOR_FN_H__
+#ifndef __WM_GIZMO_FN_H__
+#define __WM_GIZMO_FN_H__
 
 #include "BLI_compiler_attrs.h"
 
@@ -85,4 +85,4 @@ typedef struct wmManipulatorPropertyFnParams {
 	void *user_data;
 } wmManipulatorPropertyFnParams;
 
-#endif  /* __WM_MANIPULATOR_FN_H__ */
+#endif  /* __WM_GIZMO_FN_H__ */
diff --git a/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
index a470c5c28ea..80418cbfeb3 100644
--- a/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/wm_manipulator_wmapi.h
+/** \file blender/windowmanager/gizmo/wm_gizmo_wmapi.h
  *  \ingroup wm
  *
  * \name Manipulators Window Manager API
@@ -35,8 +35,8 @@
  */
 
 
-#ifndef __WM_MANIPULATOR_WMAPI_H__
-#define __WM_MANIPULATOR_WMAPI_H__
+#ifndef __WM_GIZMO_WMAPI_H__
+#define __WM_GIZMO_WMAPI_H__
 
 struct wmEventHandler;
 struct wmManipulatorMap;
@@ -94,4 +94,4 @@ struct ListBase *wm_manipulatormap_groups_get(wmManipulatorMap *mmap);
 
 void wm_manipulatormaptypes_free(void);
 
-#endif  /* __WM_MANIPULATOR_WMAPI_H__ */
+#endif  /* __WM_GIZMO_WMAPI_H__ */
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index d17d5f7d157..04353b55334 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -35,7 +35,7 @@ struct ARegion;
 struct wmWindow;
 struct ReportList;
 
-#include "manipulators/wm_manipulator_wmapi.h"
+#include "gizmo/wm_gizmo_wmapi.h"
 
 typedef struct wmPaintCursor {
 	struct wmPaintCursor *next, *prev;