[Bf-blender-cvs] [2495018] temp_widgets_c++_experiment: Move widget files to a proper place

[Julian Eisel]

Commit: 2495018e5e68e7078e6221180ec1aa82969ef689
Author: Julian Eisel
Date:   Thu Dec 24 23:19:59 2015 +0100
Branches: temp_widgets_c++_experiment
https://developer.blender.org/rB2495018e5e68e7078e6221180ec1aa82969ef689

Move widget files to a proper place

===================================================================

D	source/blender/windowmanager/3d_widgets/arrow_widget.c
D	source/blender/windowmanager/3d_widgets/cube_widget.c
D	source/blender/windowmanager/3d_widgets/dial_widget.c
D	source/blender/windowmanager/3d_widgets/ui_widget_library.h
M	source/blender/windowmanager/CMakeLists.txt
M	source/blender/windowmanager/WM_api.h
D	source/blender/windowmanager/intern/widgets/wm_widget.cc
D	source/blender/windowmanager/intern/widgets/wm_widget.h
D	source/blender/windowmanager/intern/widgets/wm_widgetgroup.cc
D	source/blender/windowmanager/intern/widgets/wm_widgetgroup.h
D	source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.cc
D	source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.h
D	source/blender/windowmanager/intern/widgets/wm_widgetmap.cc
D	source/blender/windowmanager/intern/widgets/wm_widgetmap.h
D	source/blender/windowmanager/intern/widgets/wm_widgetmaptype.cc
D	source/blender/windowmanager/intern/widgets/wm_widgetmaptype.h
D	source/blender/windowmanager/intern/widgets/wm_widgets_c_api.cc
D	source/blender/windowmanager/intern/widgets/wm_widgets_c_api.h
M	source/blender/windowmanager/intern/wm_generic_widgets.c
A	source/blender/windowmanager/widgets/3d_widgets/arrow_widget.c
A	source/blender/windowmanager/widgets/3d_widgets/cube_widget.c
A	source/blender/windowmanager/widgets/3d_widgets/dial_widget.c
A	source/blender/windowmanager/widgets/3d_widgets/wm_widget_library.h
A	source/blender/windowmanager/widgets/wm_widget.cc
A	source/blender/windowmanager/widgets/wm_widget.h
A	source/blender/windowmanager/widgets/wm_widgetgroup.cc
A	source/blender/windowmanager/widgets/wm_widgetgroup.h
A	source/blender/windowmanager/widgets/wm_widgetgrouptype.cc
A	source/blender/windowmanager/widgets/wm_widgetgrouptype.h
A	source/blender/windowmanager/widgets/wm_widgetmap.cc
A	source/blender/windowmanager/widgets/wm_widgetmap.h
A	source/blender/windowmanager/widgets/wm_widgetmaptype.cc
A	source/blender/windowmanager/widgets/wm_widgetmaptype.h
A	source/blender/windowmanager/widgets/wm_widgets_c_api.cc
A	source/blender/windowmanager/widgets/wm_widgets_c_api.h

===================================================================

diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 62ee5d1..afd66f7 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -67,9 +67,6 @@ set(SRC
 	intern/wm_window.c
 	intern/wm_stereo.c
 	intern/wm_generic_widgets.c
-	3d_widgets/arrow_widget.c
-	3d_widgets/cube_widget.c
-	3d_widgets/dial_widget.c
 
 	WM_api.h
 	WM_keymap.h
@@ -82,21 +79,24 @@ set(SRC
 	wm_files.h
 	wm_subwindow.h
 	wm_window.h
-	3d_widgets/ui_widget_library.h
-
-	intern/widgets/wm_widget.cc
-	intern/widgets/wm_widgetgroup.cc
-	intern/widgets/wm_widgetgrouptype.cc
-	intern/widgets/wm_widgetmap.cc
-	intern/widgets/wm_widgetmaptype.cc
-	intern/widgets/wm_widgets_c_api.cc
-
-	intern/widgets/wm_widget.h
-	intern/widgets/wm_widgetgroup.h
-	intern/widgets/wm_widgetgrouptype.h
-	intern/widgets/wm_widgetmap.h
-	intern/widgets/wm_widgetmaptype.h
-	intern/widgets/wm_widgets_c_api.h
+
+	widgets/wm_widget.cc
+	widgets/wm_widgetgroup.cc
+	widgets/wm_widgetgrouptype.cc
+	widgets/wm_widgetmap.cc
+	widgets/wm_widgetmaptype.cc
+	widgets/wm_widgets_c_api.cc
+	widgets/3d_widgets/arrow_widget.c
+	widgets/3d_widgets/cube_widget.c
+	widgets/3d_widgets/dial_widget.c
+
+	widgets/wm_widget.h
+	widgets/wm_widgetgroup.h
+	widgets/wm_widgetgrouptype.h
+	widgets/wm_widgetmap.h
+	widgets/wm_widgetmaptype.h
+	widgets/wm_widgets_c_api.h
+	widgets/3d_widgets/wm_widget_library.h
 )
 
 if(WITH_AUDASPACE)
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 61fe583..5bcd6e5 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -43,7 +43,7 @@
 #include "WM_keymap.h"
 #include "BLI_compiler_attrs.h"
 
-#include "intern/widgets/wm_widgets_c_api.h"
+#include "widgets/wm_widgets_c_api.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/windowmanager/intern/wm_generic_widgets.c b/source/blender/windowmanager/intern/wm_generic_widgets.c
index 26a017f..bb2d79d 100644
--- a/source/blender/windowmanager/intern/wm_generic_widgets.c
+++ b/source/blender/windowmanager/intern/wm_generic_widgets.c
@@ -68,7 +68,7 @@
 
 #include "UI_interface.h"
 
-#include "3d_widgets/ui_widget_library.h"
+#include "widgets/3d_widgets/wm_widget_library.h"
 
 #include "wm.h"
 #include "WM_types.h"
diff --git a/source/blender/windowmanager/3d_widgets/arrow_widget.c b/source/blender/windowmanager/widgets/3d_widgets/arrow_widget.c
similarity index 100%
rename from source/blender/windowmanager/3d_widgets/arrow_widget.c
rename to source/blender/windowmanager/widgets/3d_widgets/arrow_widget.c
diff --git a/source/blender/windowmanager/3d_widgets/cube_widget.c b/source/blender/windowmanager/widgets/3d_widgets/cube_widget.c
similarity index 100%
rename from source/blender/windowmanager/3d_widgets/cube_widget.c
rename to source/blender/windowmanager/widgets/3d_widgets/cube_widget.c
diff --git a/source/blender/windowmanager/3d_widgets/dial_widget.c b/source/blender/windowmanager/widgets/3d_widgets/dial_widget.c
similarity index 100%
rename from source/blender/windowmanager/3d_widgets/dial_widget.c
rename to source/blender/windowmanager/widgets/3d_widgets/dial_widget.c
diff --git a/source/blender/windowmanager/3d_widgets/ui_widget_library.h b/source/blender/windowmanager/widgets/3d_widgets/wm_widget_library.h
similarity index 100%
rename from source/blender/windowmanager/3d_widgets/ui_widget_library.h
rename to source/blender/windowmanager/widgets/3d_widgets/wm_widget_library.h
diff --git a/source/blender/windowmanager/intern/widgets/wm_widget.cc b/source/blender/windowmanager/widgets/wm_widget.cc
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widget.cc
rename to source/blender/windowmanager/widgets/wm_widget.cc
diff --git a/source/blender/windowmanager/intern/widgets/wm_widget.h b/source/blender/windowmanager/widgets/wm_widget.h
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widget.h
rename to source/blender/windowmanager/widgets/wm_widget.h
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgetgroup.cc b/source/blender/windowmanager/widgets/wm_widgetgroup.cc
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widgetgroup.cc
rename to source/blender/windowmanager/widgets/wm_widgetgroup.cc
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgetgroup.h b/source/blender/windowmanager/widgets/wm_widgetgroup.h
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widgetgroup.h
rename to source/blender/windowmanager/widgets/wm_widgetgroup.h
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.cc b/source/blender/windowmanager/widgets/wm_widgetgrouptype.cc
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.cc
rename to source/blender/windowmanager/widgets/wm_widgetgrouptype.cc
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.h b/source/blender/windowmanager/widgets/wm_widgetgrouptype.h
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.h
rename to source/blender/windowmanager/widgets/wm_widgetgrouptype.h
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgetmap.cc b/source/blender/windowmanager/widgets/wm_widgetmap.cc
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widgetmap.cc
rename to source/blender/windowmanager/widgets/wm_widgetmap.cc
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgetmap.h b/source/blender/windowmanager/widgets/wm_widgetmap.h
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widgetmap.h
rename to source/blender/windowmanager/widgets/wm_widgetmap.h
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgetmaptype.cc b/source/blender/windowmanager/widgets/wm_widgetmaptype.cc
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widgetmaptype.cc
rename to source/blender/windowmanager/widgets/wm_widgetmaptype.cc
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgetmaptype.h b/source/blender/windowmanager/widgets/wm_widgetmaptype.h
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widgetmaptype.h
rename to source/blender/windowmanager/widgets/wm_widgetmaptype.h
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgets_c_api.cc b/source/blender/windowmanager/widgets/wm_widgets_c_api.cc
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widgets_c_api.cc
rename to source/blender/windowmanager/widgets/wm_widgets_c_api.cc
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgets_c_api.h b/source/blender/windowmanager/widgets/wm_widgets_c_api.h
similarity index 100%
rename from source/blender/windowmanager/intern/widgets/wm_widgets_c_api.h
rename to source/blender/windowmanager/widgets/wm_widgets_c_api.h