marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename files implementing C4AbstractApp and C4Window

Günther Brammer 2011-10-03 17:19:24 +02:00
parent c2908d5bd5
commit 1cafba4be8
36 changed files with 90 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
CMakeLists.txt
View File

@ -161,9 +161,9 @@ set(OC_CLONK_SOURCES
src/C4Globals.cpp
src/C4GraphicsSystem.cpp
src/C4GraphicsSystem.h
src/c4group/C4Components.h
src/c4group/C4ComponentHost.cpp
src/c4group/C4ComponentHost.h
src/c4group/C4Components.h
src/c4group/C4Extra.cpp
src/c4group/C4Extra.h
src/c4group/C4Group.cpp
@ -210,9 +210,9 @@ set(OC_CLONK_SOURCES
src/control/C4Teams.cpp
src/control/C4Teams.h
src/editor/C4Console.cpp
src/editor/C4Console.h
src/editor/C4ConsoleGUI.h
src/editor/C4ConsoleGUICommon.h
src/editor/C4ConsoleGUI.h
src/editor/C4Console.h
src/editor/C4DevmodeDlg.cpp
src/editor/C4DevmodeDlg.h
src/editor/C4EditCursor.cpp
@ -225,8 +225,8 @@ set(OC_CLONK_SOURCES
src/game/C4Physics.h
src/game/landscape/C4Landscape.cpp
src/game/landscape/C4Landscape.h
src/game/landscape/C4LandscapeRender.cpp
src/game/landscape/C4LandscapeRenderClassic.cpp
src/game/landscape/C4LandscapeRender.cpp
src/game/landscape/C4LandscapeRender.h
src/game/landscape/C4Map.cpp
src/game/landscape/C4MapCreatorS2.cpp
@ -262,9 +262,9 @@ set(OC_CLONK_SOURCES
src/game/object/C4Def.cpp
src/game/object/C4DefGraphics.cpp
src/game/object/C4DefGraphics.h
src/game/object/C4Def.h
src/game/object/C4DefList.cpp
src/game/object/C4DefList.h
src/game/object/C4Def.h
src/game/object/C4GameObjects.cpp
src/game/object/C4GameObjects.h
src/game/object/C4Id.cpp
@ -288,9 +288,9 @@ set(OC_CLONK_SOURCES
src/game/object/C4ObjectList.h
src/game/object/C4ObjectMenu.cpp
src/game/object/C4ObjectMenu.h
src/game/object/C4ObjectScript.cpp
src/game/object/C4ObjectPtr.cpp
src/game/object/C4ObjectPtr.h
src/game/object/C4ObjectScript.cpp
src/game/object/C4Sector.cpp
src/game/object/C4Sector.h
src/game/object/C4Shape.cpp
@ -384,6 +384,8 @@ set(OC_CLONK_SOURCES
src/lib/C4LogBuf.h
src/lib/C4Log.cpp
src/lib/C4Log.h
src/lib/C4Markup.cpp
src/lib/C4Markup.h
src/lib/C4NameList.cpp
src/lib/C4NameList.h
src/lib/C4Random.cpp
@ -408,15 +410,13 @@ set(OC_CLONK_SOURCES
src/lib/StdColors.h
src/lib/StdCompiler.cpp
src/lib/StdCompiler.h
src/lib/C4Markup.cpp
src/lib/C4Markup.h
src/lib/StdMesh.cpp
src/lib/StdMesh.h
src/lib/StdMeshLoader.h
src/lib/StdMeshLoaderBinary.cpp
src/lib/StdMeshLoaderBinaryChunks.cpp
src/lib/StdMeshLoaderBinaryChunks.h
src/lib/StdMeshLoaderBinary.cpp
src/lib/StdMeshLoaderDataStream.h
src/lib/StdMeshLoader.h
src/lib/StdMeshLoaderXml.cpp
src/lib/StdMeshMaterial.cpp
src/lib/StdMeshMaterial.h
@ -469,6 +469,9 @@ set(OC_CLONK_SOURCES
src/network/C4PacketBase.h
src/platform/Bitmap256.cpp
src/platform/Bitmap256.h
src/platform/C4App.cpp
src/platform/C4App.h
src/platform/C4AppT.cpp
src/platform/C4FileMonitor.cpp
src/platform/C4FileMonitor.h
src/platform/C4Fonts.cpp
@ -479,22 +482,22 @@ set(OC_CLONK_SOURCES
src/platform/C4MusicFile.h
src/platform/C4MusicSystem.cpp
src/platform/C4MusicSystem.h
src/platform/C4SoundLoaders.cpp
src/platform/C4SoundLoaders.h
src/platform/C4SoundSystem.cpp
src/platform/C4SoundSystem.h
src/platform/C4SoundLoaders.h
src/platform/C4SoundLoaders.cpp
src/platform/StdTApp.cpp
src/platform/C4Surface.cpp
src/platform/C4Surface.h
src/platform/C4Video.cpp
src/platform/C4Video.h
src/platform/C4VideoPlayback.cpp
src/platform/C4VideoPlayback.h
src/platform/C4ViewportWindow.cpp
src/platform/C4ViewportWindow.h
src/platform/C4Window.h
src/platform/C4windowswrapper.h
src/platform/GetTime.cpp
src/platform/PlatformAbstraction.h
src/platform/StdApp.h
src/platform/StdAppCommon.cpp
src/platform/StdD3D.cpp
src/platform/StdD3D.h
src/platform/StdD3DShader.cpp
@ -514,20 +517,17 @@ set(OC_CLONK_SOURCES
src/platform/StdRegistry.h
src/platform/StdScheduler.cpp
src/platform/StdScheduler.h
src/platform/C4Surface.cpp
src/platform/C4Surface.h
src/platform/StdSurface8.cpp
src/platform/StdSurface8.h
src/platform/StdSync.h
src/platform/StdVideo.cpp
src/platform/StdVideo.h
src/platform/StdWindow.h
src/script/C4Aul.cpp
src/script/C4AulExec.h
src/script/C4AulExec.cpp
src/script/C4AulDebug.h
src/script/C4AulDebug.cpp
src/script/C4AulDebug.h
src/script/C4AulDefFunc.h
src/script/C4AulExec.cpp
src/script/C4AulExec.h
src/script/C4Aul.h
src/script/C4AulLink.cpp
src/script/C4AulParse.cpp
@ -538,21 +538,22 @@ set(OC_CLONK_SOURCES
src/script/C4ScriptHost.h
src/script/C4StringTable.cpp
src/script/C4StringTable.h
src/script/C4Value.cpp
src/script/C4Value.h
src/script/C4ValueArray.cpp
src/script/C4ValueArray.h
src/script/C4Value.cpp
src/script/C4Value.h
src/script/C4ValueMap.cpp
src/script/C4ValueMap.h
src/zlib/gzio.c
src/zlib/zutil.h
)
mark_as_advanced(OC_CLONK_SOURCES)
mark_as_advanced(OC_SYSTEM_SOURCES)
if(WIN32)
list(APPEND OC_SYSTEM_SOURCES
src/platform/StdWindow.cpp
src/platform/C4WindowWin32.cpp
src/platform/StdJoystick.cpp
src/platform/StdJoystick.h
src/platform/C4CrashHandlerWin32.cpp
@ -584,14 +585,14 @@ if(WIN32)
endif(MINGW)
elseif(USE_SDL_MAINLOOP)
list(APPEND OC_SYSTEM_SOURCES
src/platform/StdSDLApp.cpp
src/platform/StdSDLWindow.cpp
src/platform/C4AppSDL.cpp
src/platform/C4WindowSDL.cpp
)
elseif(USE_X11)
list(APPEND OC_SYSTEM_SOURCES
src/platform/StdXApp.cpp
src/platform/StdXWindow.cpp
src/platform/StdXPrivate.h
src/platform/C4AppX.cpp
src/platform/C4WindowX.cpp
src/platform/C4AppXImpl.h
)
endif()
@ -601,9 +602,9 @@ endif()
if(APPLE)
list(APPEND OC_SYSTEM_SOURCES
src/platform/StdMacApp.mm
src/platform/C4AppMac.mm
src/platform/C4FileMonitorMac.mm
src/platform/StdMacWindow.mm
src/platform/C4WindowMac.mm
src/platform/ClonkAppDelegate.h
src/platform/ClonkAppDelegate.mm
)
@ -641,8 +642,8 @@ if(USE_GTK)
)
list(APPEND OC_SYSTEM_SOURCES
src/platform/StdGtkWindow.cpp
src/platform/StdGtkWindow.h
src/platform/C4WindowGTK.cpp
src/platform/C4WindowGTK.h
src/editor/C4ConsoleGTK.cpp
)
endif()

20
Makefile.am
View File

@ -461,8 +461,8 @@ src/platform/C4ViewportWindow.cpp \
src/platform/C4ViewportWindow.h \
src/platform/C4windowswrapper.h \
src/platform/PlatformAbstraction.h \
src/platform/StdApp.h \
src/platform/StdAppCommon.cpp \
src/platform/C4App.h \
src/platform/C4App.cpp \
src/platform/StdD3D.cpp \
src/platform/StdD3D.h \
src/platform/StdD3DShader.cpp \
@ -481,10 +481,10 @@ src/platform/C4Surface.h \
src/platform/StdSurface8.cpp \
src/platform/StdSurface8.h \
src/platform/StdSync.h \
src/platform/StdTApp.cpp \
src/platform/C4AppT.cpp \
src/platform/StdVideo.cpp \
src/platform/StdVideo.h \
src/platform/StdWindow.h \
src/platform/C4Window.h \
src/res/Brush.h \
src/res/Cursor.h \
src/res/Dynamic.h \
@ -540,9 +540,9 @@ src/platform/StdJoystick.h
endif
if MACOSX
clonk_SOURCES += \
src/platform/StdMacApp.mm \
src/platform/C4AppMac.mm \
src/platform/C4FileMonitorMac.mm \
src/platform/StdMacWindow.mm \
src/platform/C4WindowMac.mm \
src/platform/ClonkAppDelegate.h \
src/platform/ClonkAppDelegate.mm \
src/platform/ConsoleWindowController.h \
@ -557,16 +557,16 @@ src/platform/ClonkMainMenuActions.h \
src/platform/ClonkMainMenuActions.mm
endif
if SDL_MAIN_LOOP
clonk_SOURCES += src/platform/StdSDLApp.cpp src/platform/StdSDLWindow.cpp
clonk_SOURCES += src/platform/C4AppSDL.cpp src/platform/C4WindowSDL.cpp
else
if WIN32
clonk_SOURCES += src/platform/StdWindow.cpp
clonk_SOURCES += src/platform/C4WindowWin32.cpp
else
clonk_SOURCES += src/platform/StdXApp.cpp src/platform/StdXWindow.cpp src/platform/StdXPrivate.h
clonk_SOURCES += src/platform/C4AppX.cpp src/platform/C4WindowX.cpp src/platform/C4AppXImpl.h
endif
endif
if DEVELOPER_MODE
clonk_SOURCES += src/platform/StdGtkWindow.cpp src/platform/StdGtkWindow.h src/editor/C4ConsoleGTK.cpp
clonk_SOURCES += src/platform/C4WindowGTK.cpp src/platform/C4WindowGTK.h src/editor/C4ConsoleGTK.cpp
endif
clonk_LDADD = \

2
src/C4Application.h
View File

@ -28,7 +28,7 @@
#include <C4SoundSystem.h>
#include <C4Components.h>
#include <C4InteractiveThread.h>
#include <StdApp.h>
#include <C4App.h>
class C4ApplicationGameTimer;
class C4GamePadControl;

2
src/C4FullScreen.h
View File

@ -24,7 +24,7 @@
#define INC_C4FullScreen
#include "C4MainMenu.h"
#include <StdWindow.h>
#include <C4Window.h>
bool IsKeyDown(int iKey);

3
src/config/C4Config.cpp
View File

@ -36,9 +36,8 @@
#include <utility>
#include <StdFile.h>
#include <StdWindow.h>
#include <C4Window.h>
#include <StdRegistry.h>
#include <StdWindow.h>
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>

4
src/editor/C4Console.h
View File

@ -30,7 +30,7 @@
#include "C4ObjectListDlg.h"
#include "C4EditCursor.h"
#include <StdWindow.h>
#include <C4Window.h>
const int C4CNS_ModePlay = 0,
C4CNS_ModeEdit = 1,
@ -44,7 +44,7 @@ const int C4CNS_ModePlay = 0,
#define IDM_VIEWPORT_NEW2 10500
#ifdef WITH_DEVELOPER_MODE
#include <StdGtkWindow.h>
#include <C4WindowGTK.h>
typedef C4GtkWindow C4ConsoleBase;
#else
typedef C4Window C4ConsoleBase;

2
src/editor/C4ConsoleGUI.h
View File

@ -25,7 +25,7 @@
#include "StdBuf.h"
#ifdef WITH_DEVELOPER_MODE
#include <StdGtkWindow.h>
#include <C4WindowGTK.h>
typedef C4GtkWindow C4ConsoleBase;
#else
typedef C4Window C4ConsoleBase;

2
src/gui/C4Gui.h
View File

@ -47,7 +47,7 @@
#include <C4Id.h>
#include <StdResStr2.h>
#include <StdWindow.h>
#include <C4Window.h>
// consts (load those from a def file some time)

2
src/gui/C4GuiCheckBox.cpp
View File

@ -25,7 +25,7 @@
#include <C4MouseControl.h>
#include <C4GraphicsResource.h>
#include <StdWindow.h>
#include <C4Window.h>
namespace C4GUI
{

2
src/gui/C4GuiComboBox.cpp
View File

@ -27,7 +27,7 @@
#include <C4MouseControl.h>
#include <C4GraphicsResource.h>
#include <StdWindow.h>
#include <C4Window.h>
namespace C4GUI
{

2
src/gui/C4GuiMenu.cpp
View File

@ -27,7 +27,7 @@
#include <C4MouseControl.h>
#include <C4GraphicsResource.h>
#include <StdWindow.h>
#include <C4Window.h>
namespace C4GUI
{

3
src/gui/C4KeyboardInput.cpp
View File

@ -30,7 +30,7 @@
#include <C4Components.h>
#include <C4Game.h>
#include <StdWindow.h>
#include <C4Window.h>
#ifdef USE_X11
#include <X11/Xlib.h>
@ -329,7 +329,6 @@ const C4KeyCodeMapEntry KeyCodeMap [] =
{ KEY_Undefined, NULL, NULL }
};
#elif defined(USE_COCOA)
#include "StdWindow.h"
#include "CocoaKeycodeMap.h"
#endif

2
src/lib/C4Log.cpp
View File

@ -36,7 +36,7 @@
#include <C4GraphicsSystem.h>
#include <C4Config.h>
#include <C4Components.h>
#include <StdWindow.h>
#include <C4Window.h>
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>

4
src/platform/StdAppCommon.cpp → src/platform/C4App.cpp
View File

@ -16,8 +16,8 @@
*/
#include <C4Include.h>
#include "StdApp.h"
#include "StdWindow.h"
#include "C4App.h"
#include "C4Window.h"
void C4AbstractApp::Run()
{

0
src/platform/StdApp.h → src/platform/C4App.h
View File

4
src/platform/StdMacApp.mm → src/platform/C4AppMac.mm
View File

@ -24,10 +24,10 @@
#import "ClonkWindowController.h"
#include <C4Include.h>
#include <StdWindow.h>
#include <C4Window.h>
#include <string>
#include "StdApp.h"
#include "C4App.h"
bool CStdApp::Copy(const StdStrBuf & text, bool fClipboard)
{

4
src/platform/StdSDLApp.cpp → src/platform/C4AppSDL.cpp
View File

@ -23,9 +23,9 @@
/* A wrapper class to OS dependent event and window interfaces, SDL version */
#include <C4Include.h>
#include "StdApp.h"
#include "C4App.h"
#include <StdWindow.h>
#include <C4Window.h>
#include <StdGL.h>
#include <StdDDraw2.h>
#include <StdFile.h>

2
src/platform/StdTApp.cpp → src/platform/C4AppT.cpp
View File

@ -24,7 +24,7 @@
#include <C4Include.h>
#ifdef USE_CONSOLE
#include <StdWindow.h>
#include <C4Window.h>
#include <StdDDraw2.h>
#include <C4Application.h>

4
src/platform/StdXApp.cpp → src/platform/C4AppX.cpp
View File

@ -23,7 +23,7 @@
#include <C4Include.h>
#ifdef USE_X11
#include <StdWindow.h>
#include <C4Window.h>
#include <StdGL.h>
#include <StdDDraw2.h>
#include <StdFile.h>
@ -56,7 +56,7 @@
# include <gtk/gtk.h>
#endif
#include "StdXPrivate.h"
#include "C4AppXImpl.h"
namespace
{

2
src/platform/StdXPrivate.h → src/platform/C4AppXImpl.h
View File

@ -24,7 +24,7 @@
# include <glib.h>
#endif
#include <StdApp.h>
#include <C4App.h>
class C4X11Proc: public StdSchedulerProc
{

2
src/platform/C4MusicSystem.cpp
View File

@ -28,7 +28,7 @@
#include <C4Include.h>
#include <C4MusicSystem.h>
#include <StdWindow.h>
#include <C4Window.h>
#include <C4MusicFile.h>
#include <C4Application.h>
#include <C4Random.h>

4
src/platform/C4Surface.cpp
View File

@ -27,9 +27,9 @@
#include <StdFile.h>
#include <CStdFile.h>
#include "StdApp.h"
#include "C4App.h"
#include <StdGL.h>
#include <StdWindow.h>
#include <C4Window.h>
#include <StdRegistry.h>
#include <StdResStr.h>
#include <StdDDraw2.h>

4
src/platform/C4ViewportWindow.h
View File

@ -24,10 +24,10 @@
#ifndef INC_C4ViewportWindow
#define INC_C4ViewportWindow
#include <StdWindow.h>
#include <C4Window.h>
#ifdef WITH_DEVELOPER_MODE
#include <StdGtkWindow.h>
#include <C4WindowGTK.h>
typedef C4GtkWindow C4ViewportBase;
#else
typedef C4Window C4ViewportBase;

0
src/platform/StdWindow.h → src/platform/C4Window.h
View File

4
src/platform/StdGtkWindow.cpp → src/platform/C4WindowGTK.cpp
View File

@ -21,9 +21,9 @@
/* A wrapper class to OS dependent event and window interfaces, GTK+ version */
#include <C4Include.h>
#include <StdGtkWindow.h>
#include <C4WindowGTK.h>
#include <StdApp.h>
#include <C4App.h>
#include "C4Version.h"
#include "C4Config.h"

2
src/platform/StdGtkWindow.h → src/platform/C4WindowGTK.h
View File

@ -21,7 +21,7 @@
#ifndef INC_STDGTKWINDOW
#define INC_STDGTKWINDOW
#include <StdWindow.h>
#include <C4Window.h>
#include <gtk/gtk.h>

2
src/platform/StdMacWindow.mm → src/platform/C4WindowMac.mm
View File

@ -17,7 +17,7 @@
#include <Standard.h>
#include <StdRegistry.h>
#include <StdGL.h>
#include <StdWindow.h>
#include <C4Window.h>
#include <C4Version.h>
#include <C4Application.h>
#include <C4Rect.h>

2
src/platform/StdSDLWindow.cpp → src/platform/C4WindowSDL.cpp
View File

@ -23,7 +23,7 @@
/* A wrapper class to OS dependent event and window interfaces, SDL version */
#include <C4Include.h>
#include <StdWindow.h>
#include <C4Window.h>
#include <StdGL.h>
#include <StdDDraw2.h>
#include <StdFile.h>

4
src/platform/StdWindow.cpp → src/platform/C4WindowWin32.cpp
View File

@ -25,9 +25,9 @@
/* A wrapper class to OS dependent event and window interfaces, WIN32 version */
#include "C4Include.h"
#include <StdWindow.h>
#include <C4Window.h>
#include <StdApp.h>
#include <C4App.h>
#include <StdRegistry.h>
#include <C4Config.h>
#include <C4Rect.h>

6
src/platform/StdXWindow.cpp → src/platform/C4WindowX.cpp
View File

@ -24,9 +24,9 @@
#include <C4Include.h>
#ifdef USE_X11
#include <StdWindow.h>
#include <C4Window.h>
#include <StdApp.h>
#include <C4App.h>
#include <StdGL.h>
#include <StdDDraw2.h>
#include <StdFile.h>
@ -50,7 +50,7 @@
#include <time.h>
#include <errno.h>
#include "StdXPrivate.h"
#include "C4AppXImpl.h"
// Some helper functions for choosing a proper visual

2
src/platform/ClonkOpenGLView.h
View File

@ -15,7 +15,7 @@
*/
#import <Cocoa/Cocoa.h>
#include <StdWindow.h>
#include <C4Window.h>
#ifdef USE_COCOA

4
src/platform/StdD3D.cpp
View File

@ -27,9 +27,9 @@
#include <StdD3D.h>
#include <StdD3DShader.h>
#include <StdApp.h>
#include <C4App.h>
#include <C4Markup.h>
#include <StdWindow.h>
#include <C4Window.h>
#include <C4Config.h>
#ifdef USE_DIRECTX

4
src/platform/StdDDraw2.cpp
View File

@ -25,8 +25,8 @@
#include "C4Include.h"
#include <StdDDraw2.h>
#include "StdApp.h"
#include <StdWindow.h>
#include "C4App.h"
#include <C4Window.h>
#include <StdDDraw2.h>
#include <StdD3D.h>
#include <StdGL.h>

2
src/platform/StdGL.cpp
View File

@ -28,7 +28,7 @@
#include "C4Include.h"
#include <StdGL.h>
#include <C4Surface.h>
#include <StdWindow.h>
#include <C4Window.h>
#include "C4Rect.h"
#include "StdMesh.h"
#include "C4Config.h"

4
src/platform/StdGLCtx.cpp
View File

@ -25,9 +25,9 @@
#include "C4Include.h"
#include <StdGL.h>
#include <StdApp.h>
#include <C4App.h>
#include <C4Surface.h>
#include <StdWindow.h>
#include <C4Window.h>
#include <C4Config.h>
#ifdef USE_GL

2
src/platform/StdScheduler.cpp
View File

@ -23,7 +23,7 @@
#include "C4Include.h"
#include "StdScheduler.h"
#include <StdWindow.h>
#include <C4Window.h>
#include <stdio.h>
#include <assert.h>