Merge pull request #25821 from akien-mga/sync-class-and-filenames

Ensure classes match their header filename
godotengine · Feb 13, 2019 · 55ca2a7 · 55ca2a7
2 parents a18ceb6 + fe7e11e
commit 55ca2a7
Show file tree

Hide file tree

Showing 178 changed files with 495 additions and 1,658 deletions.
diff --git a/core/allocators.h b/core/allocators.h
diff --git a/core/core_string_names.h b/core/core_string_names.h
@@ -31,7 +31,7 @@
 #ifndef CORE_STRING_NAMES_H
 #define CORE_STRING_NAMES_H
 
-#include "core/string_db.h"
+#include "core/string_name.h"
 
 class CoreStringNames {
 

diff --git a/core/global_constants.h b/core/global_constants.h
@@ -31,7 +31,7 @@
 #ifndef GLOBAL_CONSTANTS_H
 #define GLOBAL_CONSTANTS_H
 
-#include "core/string_db.h"
+#include "core/string_name.h"
 
 class GlobalConstants {
 public:

diff --git a/core/hashfuncs.h b/core/hashfuncs.h
@@ -34,7 +34,7 @@
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/node_path.h"
-#include "core/string_db.h"
+#include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
 

diff --git a/core/image.h b/core/image.h
@@ -32,8 +32,8 @@
 #define IMAGE_H
 
 #include "core/color.h"
-#include "core/dvector.h"
 #include "core/math/rect2.h"
+#include "core/pool_vector.h"
 #include "core/resource.h"
 
 /**

diff --git a/core/io/file_access_buffered.h b/core/io/file_access_buffered.h
@@ -31,8 +31,8 @@
 #ifndef FILE_ACCESS_BUFFERED_H
 #define FILE_ACCESS_BUFFERED_H
 
-#include "core/dvector.h"
 #include "core/os/file_access.h"
+#include "core/pool_vector.h"
 #include "core/ustring.h"
 
 class FileAccessBuffered : public FileAccess {

diff --git a/core/io/file_access_buffered_fa.h b/core/io/file_access_buffered_fa.h
@@ -54,7 +54,7 @@ class FileAccessBufferedFA : public FileAccessBuffered {
 			cache.offset = p_offset;
 			cache.buffer.resize(p_size);
 
-			// on dvector
+			// on PoolVector
 			//PoolVector<uint8_t>::Write write = cache.buffer.write();
 			//f.get_buffer(write.ptrw(), p_size);
 

diff --git a/core/io/resource_import.cpp → core/io/resource_importer.cpp b/core/io/resource_import.cpp → core/io/resource_importer.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  resource_import.cpp                                                  */
+/*  resource_importer.cpp                                                */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "resource_import.h"
+#include "resource_importer.h"
 
 #include "core/os/os.h"
 #include "core/variant_parser.h"

diff --git a/core/io/resource_import.h → core/io/resource_importer.h b/core/io/resource_import.h → core/io/resource_importer.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  resource_import.h                                                    */
+/*  resource_importer.h                                                  */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef RESOURCE_IMPORT_H
-#define RESOURCE_IMPORT_H
+#ifndef RESOURCE_IMPORTER_H
+#define RESOURCE_IMPORTER_H
 
 #include "core/io/resource_loader.h"
 
@@ -110,4 +110,4 @@ class ResourceImporter : public Reference {
 	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = NULL) = 0;
 };
 
-#endif // RESOURCE_IMPORT_H
+#endif // RESOURCE_IMPORTER_H
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
@@ -30,7 +30,7 @@
 
 #include "resource_loader.h"
 
-#include "core/io/resource_import.h"
+#include "core/io/resource_importer.h"
 #include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "core/path_remap.h"

diff --git a/core/list.h b/core/list.h
@@ -32,7 +32,7 @@
 #define GLOBALS_LIST_H
 
 #include "core/os/memory.h"
-#include "core/sort.h"
+#include "core/sort_array.h"
 
 /**
  * Generic Templatized Linked List Implementation.

diff --git a/core/math/bsp_tree.h b/core/math/bsp_tree.h
@@ -31,11 +31,11 @@
 #ifndef BSP_TREE_H
 #define BSP_TREE_H
 
-#include "core/dvector.h"
 #include "core/math/aabb.h"
 #include "core/math/face3.h"
 #include "core/math/plane.h"
 #include "core/method_ptrcall.h"
+#include "core/pool_vector.h"
 #include "core/variant.h"
 #include "core/vector.h"
 /**

diff --git a/core/math/geometry.h b/core/math/geometry.h
@@ -31,12 +31,12 @@
 #ifndef GEOMETRY_H
 #define GEOMETRY_H
 
-#include "core/dvector.h"
 #include "core/math/face3.h"
 #include "core/math/rect2.h"
 #include "core/math/triangulate.h"
 #include "core/math/vector3.h"
 #include "core/object.h"
+#include "core/pool_vector.h"
 #include "core/print_string.h"
 #include "core/vector.h"
 

diff --git a/core/math/triangle_mesh.cpp b/core/math/triangle_mesh.cpp
@@ -30,7 +30,7 @@
 
 #include "triangle_mesh.h"
 
-#include "core/sort.h"
+#include "core/sort_array.h"
 
 int TriangleMesh::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, int p_depth, int &max_depth, int &max_alloc) {
 

diff --git a/core/node_path.h b/core/node_path.h
@@ -31,7 +31,7 @@
 #ifndef NODE_PATH_H
 #define NODE_PATH_H
 
-#include "core/string_db.h"
+#include "core/string_name.h"
 #include "core/ustring.h"
 
 /**