maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Drivers, main, servers: Ensure classes match their header filename

Browse source 
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`
This commit is contained in:
Rémi Verschelde 2019-02-12 14:23:35 +01:00
parent b7cc2bb1e2
commit 75dae1b9a9
21 changed files with 51 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/alsamidi/alsa_midi.cpp → drivers/alsamidi/midi_driver_alsamidi.cpp
View file

@ -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

10
drivers/alsamidi/alsa_midi.h → drivers/alsamidi/midi_driver_alsamidi.h
View file

@ -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

6
drivers/coremidi/core_midi.cpp → drivers/coremidi/midi_driver_coremidi.cpp
View file

@ -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

10
drivers/coremidi/core_midi.h → drivers/coremidi/midi_driver_coremidi.h
View file

@ -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

6
drivers/winmidi/win_midi.cpp → drivers/winmidi/midi_driver_winmidi.cpp
View file

@ -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

10
drivers/winmidi/win_midi.h → drivers/winmidi/midi_driver_winmidi.h
View file

@ -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

2
main/main.cpp
View file

@ -53,11 +53,11 @@
#include "drivers/register_driver_types.h"
#include "main/app_icon.gen.h"
#include "main/input_default.h"
#include "main/main_timer_sync.h"
#include "main/performance.h"
#include "main/splash.gen.h"
#include "main/splash_editor.gen.h"
#include "main/tests/test_main.h"
#include "main/timer_sync.h"
#include "modules/register_module_types.h"
#include "platform/register_platform_apis.h"
#include "scene/main/scene_tree.h"

4
main/timer_sync.cpp → main/main_timer_sync.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* timer_sync.cpp */
/* main_timer_sync.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "timer_sync.h"
#include "main_timer_sync.h"
void MainFrameTime::clamp_idle(float min_idle_step, float max_idle_step) {
if (idle_step < min_idle_step) {

8
main/timer_sync.h → main/main_timer_sync.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* timer_sync.h */
/* main_timer_sync.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef TIMER_SYNC_H
#define TIMER_SYNC_H
#ifndef MAIN_TIMER_SYNC_H
#define MAIN_TIMER_SYNC_H
#include "core/engine.h"
@ -98,4 +98,4 @@ public:
MainFrameTime advance(float p_frame_slice, int p_iterations_per_second);
};
#endif // TIMER_SYNC_H
#endif // MAIN_TIMER_SYNC_H

2
modules/gdnative/arvr/arvr_interface_gdnative.cpp
View file

@ -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

2
modules/mobile_vr/mobile_vr_interface.cpp
View file

@ -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";

2
platform/osx/os_osx.h
View file

@ -34,7 +34,7 @@
#include "core/os/input.h"
#include "crash_handler_osx.h"
#include "drivers/coreaudio/audio_driver_coreaudio.h"
#include "drivers/coremidi/core_midi.h"
#include "drivers/coremidi/midi_driver_coremidi.h"
#include "drivers/unix/os_unix.h"
#include "joypad_osx.h"
#include "main/input_default.h"

9
platform/windows/os_windows.h
View file

@ -30,14 +30,18 @@
#ifndef OS_WINDOWS_H
#define OS_WINDOWS_H
#include "context_gl_win.h"
#include "core/os/input.h"
#include "core/os/os.h"
#include "core/project_settings.h"
#include "crash_handler_win.h"
#include "drivers/rtaudio/audio_driver_rtaudio.h"
#include "drivers/unix/ip_unix.h"
#include "drivers/wasapi/audio_driver_wasapi.h"
#include "drivers/winmidi/win_midi.h"
#include "drivers/winmidi/midi_driver_winmidi.h"
#include "key_mapping_win.h"
#include "main/input_default.h"
#include "power_windows.h"
#include "servers/audio_server.h"
#include "servers/visual/rasterizer.h"
@ -45,9 +49,6 @@
#ifdef XAUDIO2_ENABLED
#include "drivers/xaudio2/audio_driver_xaudio2.h"
#endif
#include "drivers/unix/ip_unix.h"
#include "key_mapping_win.h"
#include "main/input_default.h"
#include <fcntl.h>
#include <io.h>

2
platform/x11/os_x11.h
View file

@ -35,7 +35,7 @@
#include "core/os/input.h"
#include "crash_handler_x11.h"
#include "drivers/alsa/audio_driver_alsa.h"
#include "drivers/alsamidi/alsa_midi.h"
#include "drivers/alsamidi/midi_driver_alsamidi.h"
#include "drivers/pulseaudio/audio_driver_pulseaudio.h"
#include "drivers/unix/os_unix.h"
#include "joypad_linux.h"

2
servers/visual/visual_server_canvas.cpp
View file

@ -29,7 +29,7 @@
/*************************************************************************/
#include "visual_server_canvas.h"
#include "visual_server_global.h"
#include "visual_server_globals.h"
#include "visual_server_raster.h"
#include "visual_server_viewport.h"

4
servers/visual/visual_server_global.cpp → servers/visual/visual_server_globals.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* visual_server_global.cpp */
/* visual_server_globals.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "visual_server_global.h"
#include "visual_server_globals.h"
RasterizerStorage *VisualServerGlobals::storage = NULL;
RasterizerCanvas *VisualServerGlobals::canvas_render = NULL;

8
servers/visual/visual_server_global.h → servers/visual/visual_server_globals.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* visual_server_global.h */
/* visual_server_globals.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef VISUALSERVERGLOBAL_H
#define VISUALSERVERGLOBAL_H
#ifndef VISUAL_SERVER_GLOBALS_H
#define VISUAL_SERVER_GLOBALS_H
#include "rasterizer.h"
@ -51,4 +51,4 @@ public:
#define VSG VisualServerGlobals
#endif // VISUALSERVERGLOBAL_H
#endif // VISUAL_SERVER_GLOBALS_H

2
servers/visual/visual_server_raster.cpp
View file

@ -35,7 +35,7 @@
#include "core/project_settings.h"
#include "core/sort_array.h"
#include "visual_server_canvas.h"
#include "visual_server_global.h"
#include "visual_server_globals.h"
#include "visual_server_scene.h"
// careful, these may run in different threads than the visual server

2
servers/visual/visual_server_raster.h
View file

@ -35,7 +35,7 @@
#include "servers/visual/rasterizer.h"
#include "servers/visual_server.h"
#include "visual_server_canvas.h"
#include "visual_server_global.h"
#include "visual_server_globals.h"
#include "visual_server_scene.h"
#include "visual_server_viewport.h"
/**

2
servers/visual/visual_server_scene.cpp
View file

@ -30,7 +30,7 @@
#include "visual_server_scene.h"
#include "core/os/os.h"
#include "visual_server_global.h"
#include "visual_server_globals.h"
#include "visual_server_raster.h"
#include <new>
/* CAMERA API */

2
servers/visual/visual_server_viewport.cpp
View file

@ -32,7 +32,7 @@
#include "core/project_settings.h"
#include "visual_server_canvas.h"
#include "visual_server_global.h"
#include "visual_server_globals.h"
#include "visual_server_scene.h"
void VisualServerViewport::_draw_viewport(Viewport *p_viewport, ARVRInterface::Eyes p_eye) {