noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

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

Browse Source 
Ensure classes match their header filename
This commit is contained in:
Rémi Verschelde
2019-02-13 08:49:39 +01:00
committed by GitHub
parent a18ceb6a30 fe7e11e008
commit 55ca2a7c88
178 changed files with 495 additions and 1658 deletions
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

2
drivers/gles2/rasterizer_storage_gles2.h
View File

@@ -31,7 +31,7 @@
#ifndef RASTERIZERSTORAGEGLES2_H
#define RASTERIZERSTORAGEGLES2_H
#include "core/dvector.h"
#include "core/pool_vector.h"
#include "core/self_list.h"
#include "servers/visual/rasterizer.h"
#include "servers/visual/shader_language.h"

67
drivers/windows/shell_windows.cpp
View File

@@ -1,67 +0,0 @@
/*************************************************************************/
/* shell_windows.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef WINDOWS_ENABLED
#ifdef UWP_ENABLED
// Use Launcher class on windows 8
#else
//
// C++ Implementation: shell_windows
//
// Description:
//
//
// Author: Juan Linietsky <reduzio@gmail.com>, (C) 2008
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "shell_windows.h"
#include <windows.h>
void ShellWindows::execute(String p_path) {
ShellExecuteW(NULL, L"open", p_path.c_str(), NULL, NULL, SW_SHOWNORMAL);
}
ShellWindows::ShellWindows() {
}
ShellWindows::~ShellWindows() {
}
#endif
#endif

52
drivers/windows/shell_windows.h
View File

@@ -1,52 +0,0 @@
/*************************************************************************/
/* shell_windows.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SHELL_WINDOWS_H
#define SHELL_WINDOWS_H
#include "core/os/shell.h"
#ifdef WINDOWS_ENABLED
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
class ShellWindows : public Shell {
public:
virtual void execute(String p_path);
ShellWindows();
~ShellWindows();
};
#endif
#endif

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