[Bf-blender-cvs] [10cfa75e1d1] master: Cleanup: use .hh extension for C++ headers

Campbell Barton noreply at git.blender.org
Sat Mar 27 04:06:33 CET 2021


Commit: 10cfa75e1d1e80b32da640a0e7de2b50f831dcfd
Author: Campbell Barton
Date:   Sat Mar 27 14:00:01 2021 +1100
Branches: master
https://developer.blender.org/rB10cfa75e1d1e80b32da640a0e7de2b50f831dcfd

Cleanup: use .hh extension for C++ headers

Follow documented convention for file naming.

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

M	source/blender/io/gpencil/CMakeLists.txt
M	source/blender/io/gpencil/intern/gpencil_io_base.cc
R100	source/blender/io/gpencil/intern/gpencil_io_base.h	source/blender/io/gpencil/intern/gpencil_io_base.hh
M	source/blender/io/gpencil/intern/gpencil_io_capi.cc
R097	source/blender/io/gpencil/intern/gpencil_io_export_base.h	source/blender/io/gpencil/intern/gpencil_io_export_base.hh
M	source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
R100	source/blender/io/gpencil/intern/gpencil_io_export_pdf.h	source/blender/io/gpencil/intern/gpencil_io_export_pdf.hh
M	source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
R098	source/blender/io/gpencil/intern/gpencil_io_export_svg.h	source/blender/io/gpencil/intern/gpencil_io_export_svg.hh
M	source/blender/io/gpencil/intern/gpencil_io_import_base.cc
R097	source/blender/io/gpencil/intern/gpencil_io_import_base.h	source/blender/io/gpencil/intern/gpencil_io_import_base.hh
M	source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
R097	source/blender/io/gpencil/intern/gpencil_io_import_svg.h	source/blender/io/gpencil/intern/gpencil_io_import_svg.hh

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

diff --git a/source/blender/io/gpencil/CMakeLists.txt b/source/blender/io/gpencil/CMakeLists.txt
index a41bc3e1155..be46f876129 100644
--- a/source/blender/io/gpencil/CMakeLists.txt
+++ b/source/blender/io/gpencil/CMakeLists.txt
@@ -48,10 +48,10 @@ set(SRC
   nanosvg/nanosvg.h
 
   gpencil_io.h
-  intern/gpencil_io_base.h
-  intern/gpencil_io_export_base.h
-  intern/gpencil_io_import_base.h
-  intern/gpencil_io_import_svg.h
+  intern/gpencil_io_base.hh
+  intern/gpencil_io_export_base.hh
+  intern/gpencil_io_import_base.hh
+  intern/gpencil_io_import_svg.hh
 )
 
 set(LIB
@@ -64,7 +64,7 @@ if(WITH_PUGIXML)
   list(APPEND SRC
     intern/gpencil_io_export_svg.cc
 
-    intern/gpencil_io_export_svg.h
+    intern/gpencil_io_export_svg.hh
   )
   list(APPEND INC_SYS
     ${PUGIXML_INCLUDE_DIR}
@@ -79,7 +79,7 @@ if(WITH_HARU)
   list(APPEND SRC
     intern/gpencil_io_export_pdf.cc
 
-    intern/gpencil_io_export_pdf.h
+    intern/gpencil_io_export_pdf.hh
   )
   list(APPEND INC_SYS
     ${HARU_INCLUDE_DIRS}
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index e41209811f5..8da1ec27b9c 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -49,7 +49,7 @@
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
 
-#include "gpencil_io_base.h"
+#include "gpencil_io_base.hh"
 
 using blender::Span;
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.hh
similarity index 100%
rename from source/blender/io/gpencil/intern/gpencil_io_base.h
rename to source/blender/io/gpencil/intern/gpencil_io_base.hh
diff --git a/source/blender/io/gpencil/intern/gpencil_io_capi.cc b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
index ae1a4e32b1c..a710c175a77 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_capi.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
@@ -40,14 +40,14 @@
 #include "../gpencil_io.h"
 
 #ifdef WITH_HARU
-#  include "gpencil_io_export_pdf.h"
+#  include "gpencil_io_export_pdf.hh"
 #endif
 
 #ifdef WITH_PUGIXML
-#  include "gpencil_io_export_svg.h"
+#  include "gpencil_io_export_svg.hh"
 #endif
 
-#include "gpencil_io_import_svg.h"
+#include "gpencil_io_import_svg.hh"
 
 #ifdef WITH_HARU
 using blender::io::gpencil::GpencilExporterPDF;
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_base.h b/source/blender/io/gpencil/intern/gpencil_io_export_base.hh
similarity index 97%
rename from source/blender/io/gpencil/intern/gpencil_io_export_base.h
rename to source/blender/io/gpencil/intern/gpencil_io_export_base.hh
index 19a24a75fd2..ffb1c6ce262 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_base.hh
@@ -21,7 +21,7 @@
 /** \file
  * \ingroup bgpencil
  */
-#include "gpencil_io_base.h"
+#include "gpencil_io_base.hh"
 
 namespace blender::io::gpencil {
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
index ba16d635c2d..9b2dc6d12a3 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
@@ -49,7 +49,7 @@
 #include "UI_view2d.h"
 
 #include "gpencil_io.h"
-#include "gpencil_io_export_pdf.h"
+#include "gpencil_io_export_pdf.hh"
 
 namespace blender ::io ::gpencil {
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.h b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.hh
similarity index 100%
rename from source/blender/io/gpencil/intern/gpencil_io_export_pdf.h
rename to source/blender/io/gpencil/intern/gpencil_io_export_pdf.hh
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
index faa3e377f9c..8747419d0aa 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
@@ -49,7 +49,7 @@
 #include "UI_view2d.h"
 
 #include "gpencil_io.h"
-#include "gpencil_io_export_svg.h"
+#include "gpencil_io_export_svg.hh"
 
 #include "pugixml.hpp"
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.h b/source/blender/io/gpencil/intern/gpencil_io_export_svg.hh
similarity index 98%
rename from source/blender/io/gpencil/intern/gpencil_io_export_svg.h
rename to source/blender/io/gpencil/intern/gpencil_io_export_svg.hh
index 837bc4f94a7..3bff31f20bf 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.hh
@@ -23,7 +23,7 @@
  */
 #include "BLI_path_util.h"
 
-#include "gpencil_io_export_base.h"
+#include "gpencil_io_export_base.hh"
 #include "pugixml.hpp"
 
 struct GpencilIOParams;
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
index 2e7cfdeb5cd..d0b6e20bda2 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
@@ -33,7 +33,7 @@
 
 #include "ED_gpencil.h"
 
-#include "gpencil_io_import_base.h"
+#include "gpencil_io_import_base.hh"
 
 namespace blender::io::gpencil {
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_base.h b/source/blender/io/gpencil/intern/gpencil_io_import_base.hh
similarity index 97%
rename from source/blender/io/gpencil/intern/gpencil_io_import_base.h
rename to source/blender/io/gpencil/intern/gpencil_io_import_base.hh
index efe6264e4e9..7d6fad2340b 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_base.hh
@@ -21,7 +21,7 @@
 /** \file
  * \ingroup bgpencil
  */
-#include "gpencil_io_base.h"
+#include "gpencil_io_base.hh"
 
 namespace blender::io::gpencil {
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
index 171357b6c77..4894cfc1ada 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
@@ -36,7 +36,7 @@
 #include "ED_gpencil.h"
 
 #include "gpencil_io.h"
-#include "gpencil_io_import_svg.h"
+#include "gpencil_io_import_svg.hh"
 
 /* Custom flags for NanoSVG. */
 #define NANOSVG_ALL_COLOR_KEYWORDS
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.h b/source/blender/io/gpencil/intern/gpencil_io_import_svg.hh
similarity index 97%
rename from source/blender/io/gpencil/intern/gpencil_io_import_svg.h
rename to source/blender/io/gpencil/intern/gpencil_io_import_svg.hh
index 6a34ec8423b..0e9271dd2c6 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.hh
@@ -21,7 +21,7 @@
 /** \file
  * \ingroup bgpencil
  */
-#include "gpencil_io_import_base.h"
+#include "gpencil_io_import_base.hh"
 
 struct GpencilIOParams;
 struct NSVGshape;



More information about the Bf-blender-cvs mailing list