[Bf-blender-cvs] [4b2ac33] temp_widgets_files_refactor: Cleanup includes
Julian Eisel
noreply at git.blender.org
Mon Feb 8 20:48:00 CET 2016
Commit: 4b2ac333c23ca152d72b2a526b512d73b75bdf46
Author: Julian Eisel
Date: Mon Feb 8 20:47:06 2016 +0100
Branches: temp_widgets_files_refactor
https://developer.blender.org/rB4b2ac333c23ca152d72b2a526b512d73b75bdf46
Cleanup includes
===================================================================
M source/blender/windowmanager/widgets/WM_widgets_api.h
M source/blender/windowmanager/widgets/WM_widgets_types.h
M source/blender/windowmanager/widgets/widget_library/arrow_widget.c
M source/blender/windowmanager/widgets/widget_library/cage_widget.c
M source/blender/windowmanager/widgets/widget_library/dial_widget.c
M source/blender/windowmanager/widgets/widget_library/facemap_widget.c
M source/blender/windowmanager/widgets/widget_library/plane_widget.c
M source/blender/windowmanager/widgets/wm_widget.c
M source/blender/windowmanager/widgets/wm_widgetgroup.c
M source/blender/windowmanager/widgets/wm_widgetmap.c
M source/blender/windowmanager/widgets/wm_widgets.h
M source/blender/windowmanager/widgets/wm_widgets_intern.h
===================================================================
diff --git a/source/blender/windowmanager/widgets/WM_widgets_api.h b/source/blender/windowmanager/widgets/WM_widgets_api.h
index 0039dd8..9d8cfa1 100644
--- a/source/blender/windowmanager/widgets/WM_widgets_api.h
+++ b/source/blender/windowmanager/widgets/WM_widgets_api.h
@@ -41,6 +41,9 @@
struct ARegion;
struct Main;
struct wmEventHandler;
+struct wmKeyConfig;
+struct wmKeyMap;
+struct wmOperator;
struct wmWidgetGroupType;
struct wmWidgetMap;
struct wmWidgetMapType;
@@ -75,13 +78,13 @@ struct wmWidgetGroupType *WM_widgetgrouptype_register_ptr(
const struct Main *bmain, struct wmWidgetMapType *wmaptype,
int (*poll)(const struct bContext *, struct wmWidgetGroupType *),
void (*create)(const struct bContext *, struct wmWidgetGroup *),
- wmKeyMap *(*keymap_init)(const struct wmWidgetGroupType *wgrouptype, struct wmKeyConfig *config),
+ struct wmKeyMap *(*keymap_init)(const struct wmWidgetGroupType *wgrouptype, struct wmKeyConfig *config),
const char *name);
struct wmWidgetGroupType *WM_widgetgrouptype_register(
const struct Main *bmain, const struct wmWidgetMapType_Params *wmap_params,
int (*poll)(const struct bContext *, struct wmWidgetGroupType *),
void (*create)(const struct bContext *, struct wmWidgetGroup *),
- wmKeyMap *(*keymap_init)(const struct wmWidgetGroupType *wgrouptype, struct wmKeyConfig *config),
+ struct wmKeyMap *(*keymap_init)(const struct wmWidgetGroupType *wgrouptype, struct wmKeyConfig *config),
const char *name);
void WM_widgetgrouptype_init_runtime(
const struct Main *bmain, struct wmWidgetMapType *wmaptype,
@@ -90,7 +93,7 @@ void WM_widgetgrouptype_unregister(struct bContext *C, struct Main *bmain, struc
void WM_widgetgroup_attach_to_modal_handler(struct bContext *C, struct wmEventHandler *handler,
struct wmWidgetGroupType *wgrouptype, struct wmOperator *op);
-wmKeyMap *WM_widgetgroup_keymap_common(const struct wmWidgetGroupType *wgrouptype, wmKeyConfig *config);
+struct wmKeyMap *WM_widgetgroup_keymap_common(const struct wmWidgetGroupType *wgrouptype, struct wmKeyConfig *config);
/* -------------------------------------------------------------------- */
diff --git a/source/blender/windowmanager/widgets/WM_widgets_types.h b/source/blender/windowmanager/widgets/WM_widgets_types.h
index ee9c400..97e69bf 100644
--- a/source/blender/windowmanager/widgets/WM_widgets_types.h
+++ b/source/blender/windowmanager/widgets/WM_widgets_types.h
@@ -39,6 +39,7 @@
#include "BLI_compiler_attrs.h"
struct wmWidgetGroup;
+struct wmKeyConfig;
/* factory class for a widgetgroup type, gets called every time a new area is spawned */
diff --git a/source/blender/windowmanager/widgets/widget_library/arrow_widget.c b/source/blender/windowmanager/widgets/widget_library/arrow_widget.c
index 952adcf..be56c35 100644
--- a/source/blender/windowmanager/widgets/widget_library/arrow_widget.c
+++ b/source/blender/windowmanager/widgets/widget_library/arrow_widget.c
@@ -53,9 +53,9 @@
#include "WM_types.h"
#include "WM_api.h"
-#include "wm.h"
#include "widget_geometry.h"
+#include "../wm_widgets.h"
#include "../wm_widgets_intern.h"
diff --git a/source/blender/windowmanager/widgets/widget_library/cage_widget.c b/source/blender/windowmanager/widgets/widget_library/cage_widget.c
index cec8774..46ec67e 100644
--- a/source/blender/windowmanager/widgets/widget_library/cage_widget.c
+++ b/source/blender/windowmanager/widgets/widget_library/cage_widget.c
@@ -49,7 +49,8 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "wm.h"
+
+#include "../wm_widgets.h"
#include "../wm_widgets_intern.h"
diff --git a/source/blender/windowmanager/widgets/widget_library/dial_widget.c b/source/blender/windowmanager/widgets/widget_library/dial_widget.c
index fef09b3..ebfeaba 100644
--- a/source/blender/windowmanager/widgets/widget_library/dial_widget.c
+++ b/source/blender/windowmanager/widgets/widget_library/dial_widget.c
@@ -48,11 +48,10 @@
#include "MEM_guardedalloc.h"
-#include "WM_api.h"
-#include "WM_types.h"
-#include "wm.h"
-
#include "widget_geometry.h"
+#include "../WM_widgets_api.h"
+#include "../WM_widgets_types.h"
+#include "../wm_widgets.h"
#include "../wm_widgets_intern.h"
diff --git a/source/blender/windowmanager/widgets/widget_library/facemap_widget.c b/source/blender/windowmanager/widgets/widget_library/facemap_widget.c
index 8a4b128..4670ad0 100644
--- a/source/blender/windowmanager/widgets/widget_library/facemap_widget.c
+++ b/source/blender/windowmanager/widgets/widget_library/facemap_widget.c
@@ -51,12 +51,11 @@
#include "MEM_guardedalloc.h"
-#include "WM_api.h"
-#include "WM_types.h"
-#include "wm.h"
-
-#include "../wm_widgets_intern.h"
#include "widget_geometry.h"
+#include "../WM_widgets_api.h"
+#include "../WM_widgets_types.h"
+#include "../wm_widgets.h"
+#include "../wm_widgets_intern.h"
typedef struct FacemapWidget {
diff --git a/source/blender/windowmanager/widgets/widget_library/plane_widget.c b/source/blender/windowmanager/widgets/widget_library/plane_widget.c
index 4e8f8c2..83c7e11 100644
--- a/source/blender/windowmanager/widgets/widget_library/plane_widget.c
+++ b/source/blender/windowmanager/widgets/widget_library/plane_widget.c
@@ -44,9 +44,9 @@
#include "MEM_guardedalloc.h"
-#include "WM_api.h"
-#include "WM_types.h"
-#include "wm.h"
+#include "../WM_widgets_api.h"
+#include "../WM_widgets_types.h"
+#include "../wm_widgets.h"
#include "../wm_widgets_intern.h"
diff --git a/source/blender/windowmanager/widgets/wm_widget.c b/source/blender/windowmanager/widgets/wm_widget.c
index 7c8eff8..3ca6a63 100644
--- a/source/blender/windowmanager/widgets/wm_widget.c
+++ b/source/blender/windowmanager/widgets/wm_widget.c
@@ -37,7 +37,6 @@
#include "DNA_userdef_types.h"
#include "DNA_view3d_types.h"
-#include "DNA_widget_types.h"
#include "ED_screen.h"
#include "ED_view3d.h"
@@ -51,10 +50,8 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "wm_event_system.h"
#include "wm_widgets.h"
-#include "WM_widgets_types.h"
#include "wm_widgets_intern.h"
/**
diff --git a/source/blender/windowmanager/widgets/wm_widgetgroup.c b/source/blender/windowmanager/widgets/wm_widgetgroup.c
index 43b5302..809a963 100644
--- a/source/blender/windowmanager/widgets/wm_widgetgroup.c
+++ b/source/blender/windowmanager/widgets/wm_widgetgroup.c
@@ -52,9 +52,9 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "wm.h"
#include "wm_event_system.h"
+#include "wm_widgets.h"
#include "wm_widgets_intern.h"
diff --git a/source/blender/windowmanager/widgets/wm_widgetmap.c b/source/blender/windowmanager/widgets/wm_widgetmap.c
index d3017ea..c80e3f6 100644
--- a/source/blender/windowmanager/widgets/wm_widgetmap.c
+++ b/source/blender/windowmanager/widgets/wm_widgetmap.c
@@ -50,8 +50,8 @@
#include "WM_api.h"
#include "WM_types.h"
#include "wm_event_system.h"
-#include "wm.h"
+#include "wm_widgets.h"
#include "wm_widgets_intern.h"
/**
diff --git a/source/blender/windowmanager/widgets/wm_widgets.h b/source/blender/windowmanager/widgets/wm_widgets.h
index 922651f..99932f3 100644
--- a/source/blender/windowmanager/widgets/wm_widgets.h
+++ b/source/blender/windowmanager/widgets/wm_widgets.h
@@ -36,6 +36,9 @@
#ifndef __WM_WIDGETS__
#define __WM_WIDGETS__
+struct wmEventHandler;
+struct wmOperatorType;
+
/* -------------------------------------------------------------------- */
/* wmWidget */
@@ -72,7 +75,7 @@ typedef struct wmWidget {
int (*invoke)(struct bContext *C, const struct wmEvent *event, struct wmWidget *widget);
/* called when widget tweaking is done - used to free data and reset property when cancelling */
- void (*exit)(bContext *C, wmWidget *widget, const bool cancel);
+ void (*exit)(bContext *C, struct wmWidget *widget, const bool cancel);
int (*get_cursor)(struct wmWidget *widget);
@@ -115,29 +118,32 @@ typedef struct wmWidget {
/* -------------------------------------------------------------------- */
/* wmWidgetGroup */
-void WIDGETGROUP_OT_widget_select(wmOperatorType *ot);
-void WIDGETGROUP_OT_widget_tweak(wmOperatorType *ot);
+void WIDGETGROUP_OT_widget_select(struct wmOperatorType *ot);
+void WIDGETGROUP_OT_widget_tweak(struct wmOperatorType *ot);
/* -------------------------------------------------------------------- */
/* wmWidgetMap */
-void wm_widgets_keymap(wmKeyConfig *keyconf);
+void wm_widgets_keymap(struct wmKeyConfig *keyconf);
-bool wm_widgetmap_is_3d(const wmWidgetMap *wmap);
+bool wm_widgetmap_is_3d(const struct wmWidgetMap *wmap);
-void wm_widgetmaps_handled_modal_update(bContext *C, wmEvent *event, struct wmEventHandler *handler);
+void wm_widgetmaps_handled_modal_update(bContext *C, struct wmEvent *event, struct wmEventHandler *handler);
void wm_widgetmap_handler_context(bContext *C, struct wmEventHandler *handler);
-wmWidget *wm_widget_find_highlighted_3D(wmWidgetMap *wmap, bContext *C, const wmEvent *event, unsigned char *part);
-wmWidget *wm_widget_find_highlighted(wmWidgetMap *wmap, bContext *C, const wmEvent *event, unsigned char *part);
-void wm_widgetmap_set_highlighted_widget(wmWidgetMap *wmap, bContext *C, wmWidget *widget, unsigned char part);
-wmWidget *wm_widgetmap_get_highlighted_widget(wmWidgetMap *wmap);
-
-void wm_widgetmap_set_active_widget(wmWidgetMap *wmap, bContext *C, const wmEvent *event, wmWidget *widget);
-wmWidget *wm_widgetmap_get_active_widget(wmWidgetMap *wmap);
-
-bool wm_widgetmap_deselect_all(wmWidgetMap *wmap, wmWidget ***sel);
+wmWidget *wm_widget_find_highlighted_3D(struct wmWidgetMap *wmap, bContext *C,
+ const struct wmEvent *event, unsigned char *part);
+wmWidget *wm_widget_find_highlighted(struct wmWidgetMap *wmap, bContext *C,
+ const struct wmEvent *event, unsigned char *part);
+void wm_widgetmap_set_highlighted_widget(struct wmWidgetMap *wmap, bContext *C,
+ wmWidget *widget, unsigned char part);
+wmWidget *wm_widgetmap_get_highlighted_widget(struct wmWidgetMap *wmap);
+void wm_widge
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list