[Bf-blender-cvs] [1a3681b83c2] temp-ui-cpp: Cleanup: Move interface_intern.hh
Hans Goudey
noreply at git.blender.org
Sat Nov 26 07:23:06 CET 2022
Commit: 1a3681b83c28218e2a3f4b6b613fbef78c80edce
Author: Hans Goudey
Date: Sat Nov 26 00:21:17 2022 -0600
Branches: temp-ui-cpp
https://developer.blender.org/rB1a3681b83c28218e2a3f4b6b613fbef78c80edce
Cleanup: Move interface_intern.hh
The entire interface directory is now compiled as C++ files!
===================================================================
M source/blender/editors/interface/CMakeLists.txt
M source/blender/editors/interface/eyedroppers/eyedropper_color.cc
M source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc
M source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc
M source/blender/editors/interface/eyedroppers/eyedropper_depth.cc
M source/blender/editors/interface/eyedroppers/eyedropper_driver.cc
M source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc
M source/blender/editors/interface/eyedroppers/interface_eyedropper.cc
M source/blender/editors/interface/interface.cc
M source/blender/editors/interface/interface_align.cc
M source/blender/editors/interface/interface_anim.cc
M source/blender/editors/interface/interface_button_group.cc
M source/blender/editors/interface/interface_context_menu.cc
M source/blender/editors/interface/interface_drag.cc
M source/blender/editors/interface/interface_draw.cc
M source/blender/editors/interface/interface_handlers.cc
M source/blender/editors/interface/interface_icons.cc
M source/blender/editors/interface/interface_icons_event.cc
R062 source/blender/editors/interface/interface_intern.h source/blender/editors/interface/interface_intern.hh
M source/blender/editors/interface/interface_layout.cc
M source/blender/editors/interface/interface_ops.cc
M source/blender/editors/interface/interface_panel.cc
M source/blender/editors/interface/interface_query.cc
M source/blender/editors/interface/interface_region_color_picker.cc
M source/blender/editors/interface/interface_region_hud.cc
M source/blender/editors/interface/interface_region_menu_pie.cc
M source/blender/editors/interface/interface_region_menu_popup.cc
M source/blender/editors/interface/interface_region_popover.cc
M source/blender/editors/interface/interface_region_popup.cc
M source/blender/editors/interface/interface_region_search.cc
M source/blender/editors/interface/interface_region_tooltip.cc
M source/blender/editors/interface/interface_style.cc
M source/blender/editors/interface/interface_template_asset_view.cc
M source/blender/editors/interface/interface_template_list.cc
M source/blender/editors/interface/interface_template_search_menu.cc
M source/blender/editors/interface/interface_template_search_operator.cc
M source/blender/editors/interface/interface_templates.cc
M source/blender/editors/interface/interface_undo.cc
M source/blender/editors/interface/interface_utils.cc
M source/blender/editors/interface/interface_widgets.cc
M source/blender/editors/interface/resources.cc
M source/blender/editors/interface/view2d.cc
M source/blender/editors/interface/view2d_draw.cc
M source/blender/editors/interface/views/abstract_view.cc
M source/blender/editors/interface/views/abstract_view_item.cc
M source/blender/editors/interface/views/grid_view.cc
M source/blender/editors/interface/views/interface_view.cc
M source/blender/editors/interface/views/tree_view.cc
M source/blender/editors/space_buttons/buttons_texture.cc
M source/blender/editors/space_node/node_draw.cc
M source/blender/editors/space_node/node_templates.cc
===================================================================
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index ee6a4e3d279..e3c809b6ccd 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -82,7 +82,7 @@ set(SRC
views/tree_view.cc
eyedroppers/eyedropper_intern.hh
- interface_intern.h
+ interface_intern.hh
interface_regions_intern.hh
)
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc
index 1e68f8a7aac..7f755d54650 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc
@@ -41,7 +41,7 @@
#include "RNA_define.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
#include "ED_clip.h"
#include "ED_image.h"
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc b/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc
index 910c62d8f18..0f0155529c9 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc
@@ -33,7 +33,7 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
#include "eyedropper_intern.hh"
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc
index be5d4da5b48..81b8ca96170 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc
@@ -39,7 +39,7 @@
#include "ED_view3d.h"
#include "eyedropper_intern.hh"
-#include "interface_intern.h"
+#include "interface_intern.hh"
/**
* \note #DataDropper is only internal name to avoid confusion with other kinds of eye-droppers.
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc b/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc
index 0a16691575c..64d953dc764 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc
@@ -39,7 +39,7 @@
#include "ED_view3d.h"
#include "eyedropper_intern.hh"
-#include "interface_intern.h"
+#include "interface_intern.hh"
/**
* \note #DepthDropper is only internal name to avoid confusion with other kinds of eye-droppers.
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc b/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc
index eb691905c1f..b5245fae2a9 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc
@@ -34,7 +34,7 @@
#include "ED_keyframing.h"
#include "eyedropper_intern.hh"
-#include "interface_intern.h"
+#include "interface_intern.hh"
struct DriverDropper {
/* Destination property (i.e. where we'll add a driver) */
@@ -156,7 +156,7 @@ static int driverdropper_modal(bContext *C, wmOperator *op, const wmEvent *event
}
/* Modal Operator init */
-static int driverdropper_invoke(bContext *C, wmOperator *op, const wmEvent */*event*/)
+static int driverdropper_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/)
{
/* init */
if (driverdropper_init(C, op)) {
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc
index e16f265dc1e..ca54fbc15c4 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc
@@ -47,7 +47,7 @@
#include "DEG_depsgraph_build.h"
#include "eyedropper_intern.hh"
-#include "interface_intern.h"
+#include "interface_intern.hh"
struct EyedropperGPencil {
struct ColorManagedDisplay *display;
diff --git a/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc b/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc
index db54f5c3789..b0eee560076 100644
--- a/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc
+++ b/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc
@@ -19,7 +19,7 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
#include "eyedropper_intern.hh" /* own include */
diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc
index 331d1581db5..4d423f989a6 100644
--- a/source/blender/editors/interface/interface.cc
+++ b/source/blender/editors/interface/interface.cc
@@ -73,7 +73,7 @@
#include "DEG_depsgraph_query.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
using blender::Vector;
diff --git a/source/blender/editors/interface/interface_align.cc b/source/blender/editors/interface/interface_align.cc
index d7a9f3bce97..162509f3f27 100644
--- a/source/blender/editors/interface/interface_align.cc
+++ b/source/blender/editors/interface/interface_align.cc
@@ -14,7 +14,7 @@
#include "UI_interface.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
#include "MEM_guardedalloc.h"
diff --git a/source/blender/editors/interface/interface_anim.cc b/source/blender/editors/interface/interface_anim.cc
index 58a7ac93242..aa218aa51f4 100644
--- a/source/blender/editors/interface/interface_anim.cc
+++ b/source/blender/editors/interface/interface_anim.cc
@@ -40,7 +40,7 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
static FCurve *ui_but_get_fcurve(
uiBut *but, AnimData **adt, bAction **action, bool *r_driven, bool *r_special)
diff --git a/source/blender/editors/interface/interface_button_group.cc b/source/blender/editors/interface/interface_button_group.cc
index 2ce6fbd2147..ed9065423e4 100644
--- a/source/blender/editors/interface/interface_button_group.cc
+++ b/source/blender/editors/interface/interface_button_group.cc
@@ -8,7 +8,7 @@
#include "MEM_guardedalloc.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
/* -------------------------------------------------------------------- */
/** \name Button Groups
diff --git a/source/blender/editors/interface/interface_context_menu.cc b/source/blender/editors/interface/interface_context_menu.cc
index da7ed892632..4032fb4539f 100644
--- a/source/blender/editors/interface/interface_context_menu.cc
+++ b/source/blender/editors/interface/interface_context_menu.cc
@@ -30,7 +30,7 @@
#include "UI_interface.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
#include "RNA_access.h"
#include "RNA_prototypes.h"
diff --git a/source/blender/editors/interface/interface_drag.cc b/source/blender/editors/interface/interface_drag.cc
index e959986d19e..462cef50317 100644
--- a/source/blender/editors/interface/interface_drag.cc
+++ b/source/blender/editors/interface/interface_drag.cc
@@ -8,7 +8,7 @@
#include "WM_api.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
void UI_but_drag_set_id(uiBut *but, ID *id)
{
diff --git a/source/blender/editors/interface/interface_draw.cc b/source/blender/editors/interface/interface_draw.cc
index ffe4443ead4..bdac2ff4ba4 100644
--- a/source/blender/editors/interface/interface_draw.cc
+++ b/source/blender/editors/interface/interface_draw.cc
@@ -48,7 +48,7 @@
#include "UI_interface.h"
/* own include */
-#include "interface_intern.h"
+#include "interface_intern.hh"
static int roundboxtype = UI_CNR_ALL;
diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc
index a9229983995..fdecfb4ea60 100644
--- a/source/blender/editors/interface/interface_handlers.cc
+++ b/source/blender/editors/interface/interface_handlers.cc
@@ -57,7 +57,7 @@
#include "BLF_api.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
#include "RNA_access.h"
#include "RNA_prototypes.h"
diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc
index 1d0677843ff..dab9d923428 100644
--- a/source/blender/editors/interface/interface_icons.cc
+++ b/source/blender/editors/interface/interface_icons.cc
@@ -62,7 +62,7 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
#ifndef WITH_HEADLESS
# define ICON_GRID_COLS 26
diff --git a/source/blender/editors/interface/interface_icons_event.cc b/source/blender/editors/interface/interface_icons_event.cc
index ec3246c273c..5d8af37c55f 100644
--- a/source/blender/editors/interface/interface_icons_event.cc
+++ b/source/blender/editors/interface/interface_icons_event.cc
@@ -18,7 +18,7 @@
#include "UI_interface.h"
-#include "interface_intern.h"
+#include "interface_intern.hh"
static void icon_draw_rect_input_text(
const rctf *rect, const float color[4], const char *str, float font_size, float v_offset)
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.hh
similarity index 62%
rename from source/blender/editors/interface/interface_intern.h
rename to source/blender/editors/interface/interface_intern.hh
index 1b7aaad7832..1b846a97403 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.hh
@@ -15,26 +15,26 @@
#include "UI_interface.h"
#include "UI_resources.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ARegion;
struct AnimationEvalContext;
+struct ARegion;
+struct bContext;
+struct bContextStore;
+struct ColorManagedDisplay;
struct CurveMapping;
struct CurveProfile;
+struct GPUBatch;
struct IconTextOverlay;
struct ID;
struct ImBuf;
struct Main;
struct Scene;
-struct bContext;
-struct bContextStore;
struct uiHandleButtonData;
struct uiLayout;
+struct uiListType;
struct uiStyle;
struct uiUndoStack_Text;
struct uiWidgetColors;
+struct UnitSettings;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list