[Bf-blender-cvs] [472c67eec2b] soc-2020-io-performance: Style Guide: Rename .h header files to .hh.
Ankit Meel
noreply at git.blender.org
Sat Jun 6 14:54:19 CEST 2020
Commit: 472c67eec2bfa9df8d14226f21cf45807d3e59ce
Author: Ankit Meel
Date: Thu Jun 4 18:44:20 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB472c67eec2bfa9df8d14226f21cf45807d3e59ce
Style Guide: Rename .h header files to .hh.
Since all headers internal to wavefront_obj are C++ headers, renamed
them to `.hh` following the style guide about extensions.
All occurrences of the header files & their include guards are also
modified.
===================================================================
M source/blender/io/wavefront_obj/CMakeLists.txt
M source/blender/io/wavefront_obj/intern/wavefront_obj.cc
R094 source/blender/io/wavefront_obj/intern/wavefront_obj.h source/blender/io/wavefront_obj/intern/wavefront_obj.hh
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
R090 source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.h source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh
M source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
R089 source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.h source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
M source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
R091 source/blender/io/wavefront_obj/intern/wavefront_obj_importer.h source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
===================================================================
diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
index 9e18a1c45f5..42ae3ae5fbd 100644
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -45,10 +45,10 @@ set(SRC
intern/wavefront_obj_file_handler.cc
intern/wavefront_obj_importer.cc
- intern/wavefront_obj.h
- intern/wavefront_obj_exporter.h
- intern/wavefront_obj_file_handler.h
- intern/wavefront_obj_importer.h
+ intern/wavefront_obj.hh
+ intern/wavefront_obj_exporter.hh
+ intern/wavefront_obj_file_handler.hh
+ intern/wavefront_obj_importer.hh
)
set(LIB
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
index ae9583f393c..c360b9ca9a8 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
@@ -21,8 +21,8 @@
* \ingroup obj
*/
-#include "wavefront_obj.h"
-#include "wavefront_obj_exporter.h"
+#include "wavefront_obj.hh"
+#include "wavefront_obj_exporter.hh"
bool OBJ_export(bContext *C, OBJExportParams *export_params)
{
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj.h b/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
similarity index 94%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj.h
rename to source/blender/io/wavefront_obj/intern/wavefront_obj.hh
index 5dd4c508c03..83d26beba70 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj.h
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
@@ -18,8 +18,8 @@
* \ingroup obj
*/
-#ifndef __WAVEFRONT_OBJ_H__
-#define __WAVEFRONT_OBJ_H__
+#ifndef __WAVEFRONT_OBJ_HH__
+#define __WAVEFRONT_OBJ_HH__
#include "BKE_context.h"
@@ -64,4 +64,4 @@ bool OBJ_export(struct bContext *C, struct OBJExportParams *export_params);
}
#endif
-#endif /* __WAVEFRONT_OBJ_H__ */
+#endif /* __WAVEFRONT_OBJ_HH__ */
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
index ff6ef53576b..5b7d3b71ef9 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -21,8 +21,8 @@
* \ingroup obj
*/
-#include "wavefront_obj_exporter.h"
-#include "wavefront_obj_file_handler.h"
+#include "wavefront_obj_exporter.hh"
+#include "wavefront_obj_file_handler.hh"
#include <array>
#include <fstream>
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.h b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh
similarity index 90%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.h
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh
index 8710aa0f887..05ac8e89886 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.h
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh
@@ -21,10 +21,10 @@
* \ingroup obj
*/
-#ifndef __WAVEFRONT_OBJ_EXPORTER_H__
-#define __WAVEFRONT_OBJ_EXPORTER_H__
+#ifndef __WAVEFRONT_OBJ_EXPORTER_HH__
+#define __WAVEFRONT_OBJ_EXPORTER_HH__
-#include "wavefront_obj.h"
+#include "wavefront_obj.hh"
void prepare_vertices(Object *ob_eval, OBJ_data_to_export *data_to_export);
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
index 524c478950a..72c67d8eb7b 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <vector>
-#include "wavefront_obj_file_handler.h"
+#include "wavefront_obj_file_handler.hh"
#include "DNA_meshdata_types.h"
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.h b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
similarity index 89%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.h
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
index 3fbe225916b..bf3ee31124b 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.h
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
@@ -20,13 +20,13 @@
/** \file
* \ingroup obj
*/
-#ifndef __WAVEFRONT_OBJ_FILE_HANDLER_H__
-#define __WAVEFRONT_OBJ_FILE_HANDLER_H__
+#ifndef __WAVEFRONT_OBJ_FILE_HANDLER_HH__
+#define __WAVEFRONT_OBJ_FILE_HANDLER_HH__
#include <fstream>
#include <stdio.h>
-#include "wavefront_obj.h"
+#include "wavefront_obj.hh"
void write_prepared_data(const char *filepath, OBJ_data_to_export *data_to_export);
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
index 1788ff98edd..fcfd402704f 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
@@ -21,4 +21,4 @@
* \ingroup obj
*/
-#include "wavefront_obj_file_handler.h"
+#include "wavefront_obj_file_handler.hh"
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.h b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
similarity index 91%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_importer.h
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
index 95fe85ec365..6a47c738a90 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.h
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
@@ -21,7 +21,7 @@
* \ingroup obj
*/
-#ifndef __WAVEFRONT_OBJ_IMPORTER_H__
-#define __WAVEFRONT_OBJ_IMPORTER_H__
+#ifndef __WAVEFRONT_OBJ_IMPORTER_HH__
+#define __WAVEFRONT_OBJ_IMPORTER_HH__
#endif
More information about the Bf-blender-cvs
mailing list