From dcd0512eb15cef950ab24ae1955eef88fed6e92e Mon Sep 17 00:00:00 2001
From: Hans Goudey <h.goudey@me.com>
Date: Fri, 8 Sep 2023 08:23:01 -0400
Subject: [PATCH] Cleanup: Move sequencer_intern.hh to C++

See #103343
---
 source/blender/editors/space_sequencer/CMakeLists.txt     | 2 +-
 source/blender/editors/space_sequencer/sequencer_add.cc   | 2 +-
 .../blender/editors/space_sequencer/sequencer_buttons.cc  | 2 +-
 .../editors/space_sequencer/sequencer_channels_draw.cc    | 2 +-
 .../editors/space_sequencer/sequencer_channels_edit.cc    | 2 +-
 .../editors/space_sequencer/sequencer_drag_drop.cc        | 2 +-
 source/blender/editors/space_sequencer/sequencer_edit.cc  | 2 +-
 .../editors/space_sequencer/sequencer_gizmo_retime.cc     | 2 +-
 .../space_sequencer/sequencer_gizmo_retime_type.cc        | 2 +-
 .../{sequencer_intern.h => sequencer_intern.hh}           | 8 --------
 .../blender/editors/space_sequencer/sequencer_modifier.cc | 2 +-
 source/blender/editors/space_sequencer/sequencer_ops.cc   | 2 +-
 .../blender/editors/space_sequencer/sequencer_preview.cc  | 2 +-
 .../editors/space_sequencer/sequencer_preview_draw.cc     | 2 +-
 source/blender/editors/space_sequencer/sequencer_proxy.cc | 2 +-
 .../blender/editors/space_sequencer/sequencer_retiming.cc | 2 +-
 .../blender/editors/space_sequencer/sequencer_scopes.cc   | 2 +-
 .../blender/editors/space_sequencer/sequencer_select.cc   | 2 +-
 .../editors/space_sequencer/sequencer_thumbnails.cc       | 2 +-
 .../editors/space_sequencer/sequencer_timeline_draw.cc    | 2 +-
 source/blender/editors/space_sequencer/sequencer_view.cc  | 2 +-
 source/blender/editors/space_sequencer/space_sequencer.cc | 2 +-
 source/blender/editors/util/ed_util_imbuf.cc              | 2 +-
 23 files changed, 22 insertions(+), 30 deletions(-)
 rename source/blender/editors/space_sequencer/{sequencer_intern.h => sequencer_intern.hh} (99%)

diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index 058c8aeb9f2..5a211fe5a9a 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -45,7 +45,7 @@ set(SRC
   sequencer_view.cc
   space_sequencer.cc
 
-  sequencer_intern.h
+  sequencer_intern.hh
 )
 
 set(LIB
diff --git a/source/blender/editors/space_sequencer/sequencer_add.cc b/source/blender/editors/space_sequencer/sequencer_add.cc
index 0fb6ea6f772..411b2ce148d 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.cc
+++ b/source/blender/editors/space_sequencer/sequencer_add.cc
@@ -70,7 +70,7 @@
 #include "DEG_depsgraph_build.h"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 struct SequencerAddData {
   ImageFormatData im_format;
diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.cc b/source/blender/editors/space_sequencer/sequencer_buttons.cc
index bc73ab429e5..a9e952e3220 100644
--- a/source/blender/editors/space_sequencer/sequencer_buttons.cc
+++ b/source/blender/editors/space_sequencer/sequencer_buttons.cc
@@ -27,7 +27,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 /* **************************** buttons ********************************* */
 
diff --git a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc
index 97af472a66a..c827bb8272d 100644
--- a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc
@@ -41,7 +41,7 @@
 #include "WM_api.hh"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 static float draw_offset_get(const View2D *timeline_region_v2d)
 {
diff --git a/source/blender/editors/space_sequencer/sequencer_channels_edit.cc b/source/blender/editors/space_sequencer/sequencer_channels_edit.cc
index f6e4febdb79..1efa361cbf6 100644
--- a/source/blender/editors/space_sequencer/sequencer_channels_edit.cc
+++ b/source/blender/editors/space_sequencer/sequencer_channels_edit.cc
@@ -29,7 +29,7 @@
 #include "RNA_enum_types.hh"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 static int sequencer_rename_channel_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event)
 {
diff --git a/source/blender/editors/space_sequencer/sequencer_drag_drop.cc b/source/blender/editors/space_sequencer/sequencer_drag_drop.cc
index ac72095a307..b38a6541283 100644
--- a/source/blender/editors/space_sequencer/sequencer_drag_drop.cc
+++ b/source/blender/editors/space_sequencer/sequencer_drag_drop.cc
@@ -47,7 +47,7 @@
 #endif
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 struct SeqDropCoords {
   float start_frame, channel;
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc
index 86d040d43aa..f5f9a083cc8 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.cc
+++ b/source/blender/editors/space_sequencer/sequencer_edit.cc
@@ -72,7 +72,7 @@
 #include "DEG_depsgraph_build.h"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Structs & Enums
diff --git a/source/blender/editors/space_sequencer/sequencer_gizmo_retime.cc b/source/blender/editors/space_sequencer/sequencer_gizmo_retime.cc
index ef5e9316148..1567de277f0 100644
--- a/source/blender/editors/space_sequencer/sequencer_gizmo_retime.cc
+++ b/source/blender/editors/space_sequencer/sequencer_gizmo_retime.cc
@@ -31,7 +31,7 @@
 #include "SEQ_sequencer.h"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 struct GizmoGroup_retime {
   wmGizmo *add_handle_gizmo;
diff --git a/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc b/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc
index a7f5bc8ffcd..5a0d6a07c5a 100644
--- a/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc
+++ b/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc
@@ -51,7 +51,7 @@
 #include "SEQ_time.h"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 using blender::MutableSpan;
 
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.hh
similarity index 99%
rename from source/blender/editors/space_sequencer/sequencer_intern.h
rename to source/blender/editors/space_sequencer/sequencer_intern.hh
index e832f7301f4..feb916cef57 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.hh
@@ -11,10 +11,6 @@
 #include "DNA_sequence_types.h"
 #include "RNA_access.hh"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Internal exports only. */
 
 struct ARegion;
@@ -328,7 +324,3 @@ void GIZMO_GT_retime_handle_add(struct wmGizmoType *gzt);
 void GIZMO_GT_retime_handle(struct wmGizmoType *gzt);
 void GIZMO_GT_retime_remove(struct wmGizmoType *gzt);
 void GIZMO_GT_speed_set_remove(struct wmGizmoType *gzt);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.cc b/source/blender/editors/space_sequencer/sequencer_modifier.cc
index 3f39882b84c..f71e5179b5a 100644
--- a/source/blender/editors/space_sequencer/sequencer_modifier.cc
+++ b/source/blender/editors/space_sequencer/sequencer_modifier.cc
@@ -29,7 +29,7 @@
 #include "SEQ_sound.h"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 /*********************** Add modifier operator *************************/
 
diff --git a/source/blender/editors/space_sequencer/sequencer_ops.cc b/source/blender/editors/space_sequencer/sequencer_ops.cc
index 789d81482d4..225267a9d9f 100644
--- a/source/blender/editors/space_sequencer/sequencer_ops.cc
+++ b/source/blender/editors/space_sequencer/sequencer_ops.cc
@@ -16,7 +16,7 @@
 
 #include "ED_sequencer.hh"
 
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 /* ************************** registration **********************************/
 
diff --git a/source/blender/editors/space_sequencer/sequencer_preview.cc b/source/blender/editors/space_sequencer/sequencer_preview.cc
index 230ad25a8a0..dbf47ec65e0 100644
--- a/source/blender/editors/space_sequencer/sequencer_preview.cc
+++ b/source/blender/editors/space_sequencer/sequencer_preview.cc
@@ -24,7 +24,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 struct PreviewJob {
   ListBase previews;
diff --git a/source/blender/editors/space_sequencer/sequencer_preview_draw.cc b/source/blender/editors/space_sequencer/sequencer_preview_draw.cc
index c0d195709d6..3e859fa020b 100644
--- a/source/blender/editors/space_sequencer/sequencer_preview_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_preview_draw.cc
@@ -57,7 +57,7 @@
 #include "WM_types.hh"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 static Sequence *special_seq_update = nullptr;
 
diff --git a/source/blender/editors/space_sequencer/sequencer_proxy.cc b/source/blender/editors/space_sequencer/sequencer_proxy.cc
index eeb532a12b1..13253e38f26 100644
--- a/source/blender/editors/space_sequencer/sequencer_proxy.cc
+++ b/source/blender/editors/space_sequencer/sequencer_proxy.cc
@@ -32,7 +32,7 @@
 #include "ED_screen.hh"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Rebuild Proxy and Timecode Indices Operator
diff --git a/source/blender/editors/space_sequencer/sequencer_retiming.cc b/source/blender/editors/space_sequencer/sequencer_retiming.cc
index e10f59ad98b..0b33be18101 100644
--- a/source/blender/editors/space_sequencer/sequencer_retiming.cc
+++ b/source/blender/editors/space_sequencer/sequencer_retiming.cc
@@ -35,7 +35,7 @@
 #include "DEG_depsgraph.h"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 using blender::MutableSpan;
 
diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.cc b/source/blender/editors/space_sequencer/sequencer_scopes.cc
index 7b0348bdc0d..53bbb7bf122 100644
--- a/source/blender/editors/space_sequencer/sequencer_scopes.cc
+++ b/source/blender/editors/space_sequencer/sequencer_scopes.cc
@@ -16,7 +16,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 /* XXX(@ideasman42): why is this function better than BLI_math version?
  * only difference is it does some normalize after, need to double check on this. */
diff --git a/source/blender/editors/space_sequencer/sequencer_select.cc b/source/blender/editors/space_sequencer/sequencer_select.cc
index 271ce3746bc..58b0ea37c79 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.cc
+++ b/source/blender/editors/space_sequencer/sequencer_select.cc
@@ -46,7 +46,7 @@
 #include "UI_view2d.hh"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Selection Utilities
diff --git a/source/blender/editors/space_sequencer/sequencer_thumbnails.cc b/source/blender/editors/space_sequencer/sequencer_thumbnails.cc
index bbbfc5550ca..903c17699d8 100644
--- a/source/blender/editors/space_sequencer/sequencer_thumbnails.cc
+++ b/source/blender/editors/space_sequencer/sequencer_thumbnails.cc
@@ -31,7 +31,7 @@
 #include "MEM_guardedalloc.h"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 struct ThumbnailDrawJob {
   SeqRenderData context;
diff --git a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
index bc88785c6d3..0464130dbd5 100644
--- a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
@@ -69,7 +69,7 @@
 #include "MEM_guardedalloc.h"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 #define SEQ_LEFTHANDLE 1
 #define SEQ_RIGHTHANDLE 2
diff --git a/source/blender/editors/space_sequencer/sequencer_view.cc b/source/blender/editors/space_sequencer/sequencer_view.cc
index 37f5cdca822..24743f2d13f 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.cc
+++ b/source/blender/editors/space_sequencer/sequencer_view.cc
@@ -34,7 +34,7 @@
 #include "ED_util_imbuf.hh"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Sequencer Sample Backdrop Operator
diff --git a/source/blender/editors/space_sequencer/space_sequencer.cc b/source/blender/editors/space_sequencer/space_sequencer.cc
index 02e8b01dab8..afbf7206152 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.cc
+++ b/source/blender/editors/space_sequencer/space_sequencer.cc
@@ -55,7 +55,7 @@
 #include "DRW_engine.h"
 
 /* Own include. */
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 /**************************** common state *****************************/
 
diff --git a/source/blender/editors/util/ed_util_imbuf.cc b/source/blender/editors/util/ed_util_imbuf.cc
index e3ebae3ca6c..9f1c16d6a70 100644
--- a/source/blender/editors/util/ed_util_imbuf.cc
+++ b/source/blender/editors/util/ed_util_imbuf.cc
@@ -36,7 +36,7 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "sequencer_intern.h"
+#include "sequencer_intern.hh"
 
 /* Own define. */
 #include "ED_util_imbuf.hh"