Modules: Ensure classes match their header filename

Renamed: - `modules/mono/mono_gd/gd_mono_class_member.h` -> `i_mono_class_member.h` - `modules/upnp/upnpdevice.h` -> `upnp_device.h` - `modules/websocket/websocket_multiplayer.h` -> `websocket_multiplayer_peer.h`
godotengine · Feb 12, 2019 · fe7e11e · fe7e11e
1 parent c5dcbeb
commit fe7e11e
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 20 deletions.
diff --git 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 {
 

diff --git 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 {
 

diff --git 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 {
 

diff --git a/modules/mono/mono_gd/gd_mono_class_member.h → modules/mono/mono_gd/i_mono_class_member.h b/modules/mono/mono_gd/gd_mono_class_member.h → modules/mono/mono_gd/i_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 @@ class IMonoClassMember {
 	virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) = 0;
 };
 
-#endif // GD_MONO_CLASS_MEMBER_H
+#endif // I_MONO_CLASS_MEMBER_H
diff --git 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() {
 

diff --git 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>
 

diff --git a/modules/upnp/upnpdevice.cpp → modules/upnp/upnp_device.cpp b/modules/upnp/upnpdevice.cpp → 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"
 

diff --git a/modules/upnp/upnpdevice.h → modules/upnp/upnp_device.h b/modules/upnp/upnpdevice.h → 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 @@ class UPNPDevice : public Reference {
 
 VARIANT_ENUM_CAST(UPNPDevice::IGDStatus)
 
-#endif // GODOT_UPNPDEVICE_H
+#endif // GODOT_UPNP_DEVICE_H
diff --git 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 {

diff --git a/modules/websocket/websocket_multiplayer.cpp → .../websocket/websocket_multiplayer_peer.cpp b/modules/websocket/websocket_multiplayer.cpp → .../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() {

diff --git a/modules/websocket/websocket_multiplayer.h → ...es/websocket/websocket_multiplayer_peer.h b/modules/websocket/websocket_multiplayer.h → ...es/websocket/websocket_multiplayer_peer.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  websocket_multiplayer.h                                              */
+/*  websocket_multiplayer_peer.h                                         */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */

diff --git 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 {