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

Ensure classes match their header filename
2019-02-13 08:49:39 +01:00 · 2019-02-13 08:49:39 +01:00 · 55ca2a7c88
commit 55ca2a7c88
parent a18ceb6a30 fe7e11e008
178 changed files with 495 additions and 1658 deletions
--- a/modules/csg/csg.cpp
+++ b/modules/csg/csg.cpp
@ -32,7 +32,7 @@
 #include "core/math/face3.h"
 #include "core/math/geometry.h"
 #include "core/os/os.h"
-#include "core/sort.h"
+#include "core/sort_array.h"
 #include "thirdparty/misc/triangulator.h"

 void CSGBrush::clear() {
--- a/modules/csg/csg.h
+++ b/modules/csg/csg.h
@ -31,7 +31,6 @@
 #ifndef CSG_H
 #define CSG_H

-#include "core/dvector.h"
 #include "core/map.h"
 #include "core/math/aabb.h"
 #include "core/math/plane.h"
@ -39,6 +38,7 @@
 #include "core/math/transform.h"
 #include "core/math/vector3.h"
 #include "core/oa_hash_map.h"
+#include "core/pool_vector.h"
 #include "scene/resources/material.h"

 struct CSGBrush {
--- a/modules/gdnative/arvr/arvr_interface_gdnative.cpp
+++ b/modules/gdnative/arvr/arvr_interface_gdnative.cpp
@ -31,7 +31,7 @@
 #include "arvr_interface_gdnative.h"
 #include "main/input_default.h"
 #include "servers/arvr/arvr_positional_tracker.h"
-#include "servers/visual/visual_server_global.h"
+#include "servers/visual/visual_server_globals.h"

 ARVRInterfaceGDNative::ARVRInterfaceGDNative() {
 	// testing
--- a/modules/gdnative/gdnative/array.cpp
+++ b/modules/gdnative/gdnative/array.cpp
@ -34,7 +34,7 @@
 #include "core/os/memory.h"

 #include "core/color.h"
-#include "core/dvector.h"
+#include "core/pool_vector.h"

 #include "core/variant.h"

--- a/modules/gdnative/gdnative/pool_arrays.cpp
+++ b/modules/gdnative/gdnative/pool_arrays.cpp
@ -31,7 +31,7 @@
 #include "gdnative/pool_arrays.h"

 #include "core/array.h"
-#include "core/dvector.h"
+#include "core/pool_vector.h"
 #include "core/variant.h"

 #include "core/color.h"
--- a/modules/gdnative/gdnative/string.cpp
+++ b/modules/gdnative/gdnative/string.cpp
@ -30,7 +30,7 @@

 #include "gdnative/string.h"

-#include "core/string_db.h"
+#include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"

--- a/modules/gdnative/gdnative/string_name.cpp
+++ b/modules/gdnative/gdnative/string_name.cpp
@ -30,7 +30,7 @@

 #include "gdnative/string_name.h"

-#include "core/string_db.h"
+#include "core/string_name.h"
 #include "core/ustring.h"

 #include <string.h>
--- a/modules/gdnative/nativescript/nativescript.cpp
+++ b/modules/gdnative/nativescript/nativescript.cpp
@ -39,7 +39,7 @@
 #include "core/project_settings.h"

 #include "scene/main/scene_tree.h"
-#include "scene/resources/scene_format_text.h"
+#include "scene/resources/resource_format_text.h"

 #include <stdlib.h>

--- a/modules/gdscript/gdscript_function.h
+++ b/modules/gdscript/gdscript_function.h
@ -36,7 +36,7 @@
 #include "core/reference.h"
 #include "core/script_language.h"
 #include "core/self_list.h"
-#include "core/string_db.h"
+#include "core/string_name.h"
 #include "core/variant.h"

 class GDScriptInstance;
--- a/modules/gdscript/gdscript_tokenizer.h
+++ b/modules/gdscript/gdscript_tokenizer.h
@ -32,7 +32,7 @@
 #define GDSCRIPT_TOKENIZER_H

 #include "core/pair.h"
-#include "core/string_db.h"
+#include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
 #include "core/vmap.h"
--- a/modules/mobile_vr/mobile_vr_interface.cpp
+++ b/modules/mobile_vr/mobile_vr_interface.cpp
@ -31,7 +31,7 @@
 #include "mobile_vr_interface.h"
 #include "core/os/input.h"
 #include "core/os/os.h"
-#include "servers/visual/visual_server_global.h"
+#include "servers/visual/visual_server_globals.h"

 StringName MobileVRInterface::get_name() const {
 	return "Native mobile";
--- a/modules/mono/glue/base_object_glue.cpp
+++ b/modules/mono/glue/base_object_glue.cpp
@ -33,7 +33,7 @@
 #ifdef MONO_GLUE_ENABLED

 #include "core/reference.h"
-#include "core/string_db.h"
+#include "core/string_name.h"

 #include "../csharp_script.h"
 #include "../mono_gd/gd_mono_internals.h"
--- a/modules/mono/mono_gd/gd_mono_field.h
+++ b/modules/mono/mono_gd/gd_mono_field.h
@ -32,8 +32,8 @@
 #define GDMONOFIELD_H

 #include "gd_mono.h"
-#include "gd_mono_class_member.h"
 #include "gd_mono_header.h"
+#include "i_mono_class_member.h"

 class GDMonoField : public IMonoClassMember {

--- a/modules/mono/mono_gd/gd_mono_method.h
+++ b/modules/mono/mono_gd/gd_mono_method.h
@ -32,8 +32,8 @@
 #define GD_MONO_METHOD_H

 #include "gd_mono.h"
-#include "gd_mono_class_member.h"
 #include "gd_mono_header.h"
+#include "i_mono_class_member.h"

 class GDMonoMethod : public IMonoClassMember {

--- a/modules/mono/mono_gd/gd_mono_property.h
+++ b/modules/mono/mono_gd/gd_mono_property.h
@ -32,8 +32,8 @@
 #define GD_MONO_PROPERTY_H

 #include "gd_mono.h"
-#include "gd_mono_class_member.h"
 #include "gd_mono_header.h"
+#include "i_mono_class_member.h"

 class GDMonoProperty : public IMonoClassMember {

--- a/modules/mono/mono_gd/gd_mono_class_member.h
+++ b/modules/mono/mono_gd/gd_mono_class_member.h
@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  gd_mono_class_member.h                                               */
+/*  i_mono_class_member.h                                                */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef GD_MONO_CLASS_MEMBER_H
-#define GD_MONO_CLASS_MEMBER_H
+#ifndef I_MONO_CLASS_MEMBER_H
+#define I_MONO_CLASS_MEMBER_H

 #include "gd_mono_header.h"

@ -65,4 +65,4 @@ public:
 	virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) = 0;
 };

-#endif // GD_MONO_CLASS_MEMBER_H
+#endif // I_MONO_CLASS_MEMBER_H
--- a/modules/stb_vorbis/resource_importer_ogg_vorbis.h
+++ b/modules/stb_vorbis/resource_importer_ogg_vorbis.h
@ -32,7 +32,7 @@
 #define RESOURCEIMPORTEROGGVORBIS_H

 #include "audio_stream_ogg_vorbis.h"
-#include "core/io/resource_import.h"
+#include "core/io/resource_importer.h"

 class ResourceImporterOGGVorbis : public ResourceImporter {
 	GDCLASS(ResourceImporterOGGVorbis, ResourceImporter)
--- a/modules/upnp/register_types.cpp
+++ b/modules/upnp/register_types.cpp
@ -33,7 +33,7 @@
 #include "core/error_macros.h"

 #include "upnp.h"
-#include "upnpdevice.h"
+#include "upnp_device.h"

 void register_upnp_types() {

--- a/modules/upnp/upnp.h
+++ b/modules/upnp/upnp.h
@ -33,7 +33,7 @@

 #include "core/reference.h"

-#include "upnpdevice.h"
+#include "upnp_device.h"

 #include <miniupnpc/miniupnpc.h>

--- a/modules/upnp/upnp_device.cpp
+++ b/modules/upnp/upnp_device.cpp
@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  upnpdevice.cpp                                                       */
+/*  upnp_device.cpp                                                      */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#include "upnpdevice.h"
+#include "upnp_device.h"

 #include "upnp.h"

--- a/modules/upnp/upnp_device.h
+++ b/modules/upnp/upnp_device.h
@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  upnpdevice.h                                                         */
+/*  upnp_device.h                                                        */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef GODOT_UPNPDEVICE_H
-#define GODOT_UPNPDEVICE_H
+#ifndef GODOT_UPNP_DEVICE_H
+#define GODOT_UPNP_DEVICE_H

 #include "core/reference.h"

@ -92,4 +92,4 @@ private:

 VARIANT_ENUM_CAST(UPNPDevice::IGDStatus)

-#endif // GODOT_UPNPDEVICE_H
+#endif // GODOT_UPNP_DEVICE_H
--- a/modules/websocket/websocket_client.h
+++ b/modules/websocket/websocket_client.h
@ -32,7 +32,7 @@
 #define WEBSOCKET_CLIENT_H

 #include "core/error_list.h"
-#include "websocket_multiplayer.h"
+#include "websocket_multiplayer_peer.h"
 #include "websocket_peer.h"

 class WebSocketClient : public WebSocketMultiplayerPeer {
--- a/modules/websocket/websocket_multiplayer_peer.cpp
+++ b/modules/websocket/websocket_multiplayer_peer.cpp
@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  websocket_multiplayer.cpp                                            */
+/*  websocket_multiplayer_peer.cpp                                       */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@ -28,7 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#include "websocket_multiplayer.h"
+#include "websocket_multiplayer_peer.h"
+
 #include "core/os/os.h"

 WebSocketMultiplayerPeer::WebSocketMultiplayerPeer() {
--- a/modules/websocket/websocket_multiplayer_peer.h
+++ b/modules/websocket/websocket_multiplayer_peer.h
@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  websocket_multiplayer.h                                              */
+/*  websocket_multiplayer_peer.h                                         */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
--- a/modules/websocket/websocket_server.h
+++ b/modules/websocket/websocket_server.h
@ -32,7 +32,7 @@
 #define WEBSOCKET_H

 #include "core/reference.h"
-#include "websocket_multiplayer.h"
+#include "websocket_multiplayer_peer.h"
 #include "websocket_peer.h"

 class WebSocketServer : public WebSocketMultiplayerPeer {