summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-02-12 14:23:35 +0100
committerRémi Verschelde <rverschelde@gmail.com>2019-02-12 14:39:47 +0100
commit75dae1b9a9db8f29f53cadce6ebbccf8698939b3 (patch)
tree250984dc63df520ee12592b394ad7072e6273431 /drivers
parentb7cc2bb1e281b360fdbf4b845cfa61e3a5998ddb (diff)
Drivers, main, servers: Ensure classes match their header filename
Renamed: - `drivers/alsamidi/alsa_midi.h` -> `midi_driver_alsamidi.h` (same for `coremidi` and `winmidi`) - `main/timer_sync.h` -> `main_timer_sync.h` - `servers/visual/visual_server_global.h` -> `visual_server_globals.h`
Diffstat (limited to 'drivers')
-rw-r--r--drivers/alsamidi/midi_driver_alsamidi.cpp (renamed from drivers/alsamidi/alsa_midi.cpp)6
-rw-r--r--drivers/alsamidi/midi_driver_alsamidi.h (renamed from drivers/alsamidi/alsa_midi.h)10
-rw-r--r--drivers/coremidi/midi_driver_coremidi.cpp (renamed from drivers/coremidi/core_midi.cpp)6
-rw-r--r--drivers/coremidi/midi_driver_coremidi.h (renamed from drivers/coremidi/core_midi.h)10
-rw-r--r--drivers/winmidi/midi_driver_winmidi.cpp (renamed from drivers/winmidi/win_midi.cpp)6
-rw-r--r--drivers/winmidi/midi_driver_winmidi.h (renamed from drivers/winmidi/win_midi.h)10
6 files changed, 24 insertions, 24 deletions
diff --git a/drivers/alsamidi/alsa_midi.cpp b/drivers/alsamidi/midi_driver_alsamidi.cpp
index cd90c8912b..aae0ae0216 100644
--- a/drivers/alsamidi/alsa_midi.cpp
+++ b/drivers/alsamidi/midi_driver_alsamidi.cpp
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* alsa_midi.cpp */
+/* midi_driver_alsamidi.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -30,7 +30,7 @@
#ifdef ALSAMIDI_ENABLED
-#include "alsa_midi.h"
+#include "midi_driver_alsamidi.h"
#include "core/os/os.h"
#include "core/print_string.h"
@@ -199,4 +199,4 @@ MIDIDriverALSAMidi::~MIDIDriverALSAMidi() {
close();
}
-#endif
+#endif // ALSAMIDI_ENABLED
diff --git a/drivers/alsamidi/alsa_midi.h b/drivers/alsamidi/midi_driver_alsamidi.h
index 054a7b474e..b6956cc32f 100644
--- a/drivers/alsamidi/alsa_midi.h
+++ b/drivers/alsamidi/midi_driver_alsamidi.h
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* alsa_midi.h */
+/* midi_driver_alsamidi.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -30,8 +30,8 @@
#ifdef ALSAMIDI_ENABLED
-#ifndef ALSA_MIDI_H
-#define ALSA_MIDI_H
+#ifndef MIDI_DRIVER_ALSAMIDI_H
+#define MIDI_DRIVER_ALSAMIDI_H
#include "core/os/midi_driver.h"
#include "core/os/mutex.h"
@@ -65,5 +65,5 @@ public:
virtual ~MIDIDriverALSAMidi();
};
-#endif
-#endif
+#endif // MIDI_DRIVER_ALSAMIDI_H
+#endif // ALSAMIDI_ENABLED
diff --git a/drivers/coremidi/core_midi.cpp b/drivers/coremidi/midi_driver_coremidi.cpp
index 7d3477213f..7a92ac0702 100644
--- a/drivers/coremidi/core_midi.cpp
+++ b/drivers/coremidi/midi_driver_coremidi.cpp
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* core_midi.cpp */
+/* midi_driver_coremidi.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -30,7 +30,7 @@
#ifdef COREMIDI_ENABLED
-#include "core_midi.h"
+#include "midi_driver_coremidi.h"
#include "core/print_string.h"
@@ -120,4 +120,4 @@ MIDIDriverCoreMidi::~MIDIDriverCoreMidi() {
close();
}
-#endif
+#endif // COREMIDI_ENABLED
diff --git a/drivers/coremidi/core_midi.h b/drivers/coremidi/midi_driver_coremidi.h
index 7a10b5548e..23c2a19812 100644
--- a/drivers/coremidi/core_midi.h
+++ b/drivers/coremidi/midi_driver_coremidi.h
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* core_midi.h */
+/* midi_driver_coremidi.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -30,8 +30,8 @@
#ifdef COREMIDI_ENABLED
-#ifndef CORE_MIDI_H
-#define CORE_MIDI_H
+#ifndef MIDI_DRIVER_COREMIDI_H
+#define MIDI_DRIVER_COREMIDI_H
#include "core/os/midi_driver.h"
#include "core/vector.h"
@@ -58,5 +58,5 @@ public:
virtual ~MIDIDriverCoreMidi();
};
-#endif
-#endif
+#endif // MIDI_DRIVER_COREMIDI_H
+#endif // COREMIDI_ENABLED
diff --git a/drivers/winmidi/win_midi.cpp b/drivers/winmidi/midi_driver_winmidi.cpp
index 26bba34661..65676b629a 100644
--- a/drivers/winmidi/win_midi.cpp
+++ b/drivers/winmidi/midi_driver_winmidi.cpp
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* win_midi.cpp */
+/* midi_driver_winmidi.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -30,7 +30,7 @@
#ifdef WINMIDI_ENABLED
-#include "win_midi.h"
+#include "midi_driver_winmidi.h"
#include "core/print_string.h"
@@ -104,4 +104,4 @@ MIDIDriverWinMidi::~MIDIDriverWinMidi() {
close();
}
-#endif
+#endif // WINMIDI_ENABLED
diff --git a/drivers/winmidi/win_midi.h b/drivers/winmidi/midi_driver_winmidi.h
index 4341f7ca7e..2eaa70ef8d 100644
--- a/drivers/winmidi/win_midi.h
+++ b/drivers/winmidi/midi_driver_winmidi.h
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* win_midi.h */
+/* midi_driver_winmidi.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -30,8 +30,8 @@
#ifdef WINMIDI_ENABLED
-#ifndef WIN_MIDI_H
-#define WIN_MIDI_H
+#ifndef MIDI_DRIVER_WINMIDI_H
+#define MIDI_DRIVER_WINMIDI_H
#include "core/os/midi_driver.h"
#include "core/vector.h"
@@ -57,5 +57,5 @@ public:
virtual ~MIDIDriverWinMidi();
};
-#endif
-#endif
+#endif // MIDI_DRIVER_WINMIDI_H
+#endif // WINMIDI_ENABLED