From 798a2d57cc46ff7a70e9404275445d086ce6ef1e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 24 May 2014 21:39:02 +0300 Subject: Fix localconsts.h and debug.h includes. --- src/gui/fonts/textchunksmall.cpp | 2 +- src/gui/models/keylistmodel.h | 2 +- src/gui/popups/createpartypopup.h | 2 +- src/gui/sdlinput.cpp | 2 ++ src/gui/windows/editserverdialog.cpp | 2 ++ src/listeners/errorlistener.cpp | 2 ++ src/navigationmanager.cpp | 2 ++ src/notifymanager.cpp | 2 ++ src/render/mgl.cpp | 2 +- src/render/renderers.cpp | 2 ++ src/resources/cursor.cpp | 2 ++ src/utils/files.cpp | 2 +- src/utils/physfstools.cpp | 2 +- 13 files changed, 20 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/gui/fonts/textchunksmall.cpp b/src/gui/fonts/textchunksmall.cpp index aa5661dee..634b10866 100644 --- a/src/gui/fonts/textchunksmall.cpp +++ b/src/gui/fonts/textchunksmall.cpp @@ -22,7 +22,7 @@ #include "gui/fonts/font.h" -#include "localconsts.h" +#include "debug.h" TextChunkSmall::TextChunkSmall(const std::string &text0, const Color &color0, diff --git a/src/gui/models/keylistmodel.h b/src/gui/models/keylistmodel.h index 17d17acd4..be5083e3e 100644 --- a/src/gui/models/keylistmodel.h +++ b/src/gui/models/keylistmodel.h @@ -28,7 +28,7 @@ #include "gui/models/listmodel.h" -#include "debug.h" +#include "localconsts.h" /** * The list model for key function list. diff --git a/src/gui/popups/createpartypopup.h b/src/gui/popups/createpartypopup.h index c3de37259..74438a98f 100644 --- a/src/gui/popups/createpartypopup.h +++ b/src/gui/popups/createpartypopup.h @@ -31,7 +31,7 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -#include "debug.h" +#include "localconsts.h" class CreatePartyPopup final : public Popup, public LinkHandler diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index 847e2a060..6d3121451 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -91,6 +91,8 @@ #include #include +#include "debug.h" + SDLInput::SDLInput() : mKeyInputQueue(), mMouseInputQueue(), diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index 9cc6d863f..ae0ae3ad8 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -39,6 +39,8 @@ #include "utils/gettext.h" +#include "debug.h" + EditServerDialog::EditServerDialog(ServerDialog *const parent, ServerInfo server, const int index) : diff --git a/src/listeners/errorlistener.cpp b/src/listeners/errorlistener.cpp index e38433872..f14ea7821 100644 --- a/src/listeners/errorlistener.cpp +++ b/src/listeners/errorlistener.cpp @@ -26,6 +26,8 @@ #include "utils/process.h" +#include "debug.h" + ErrorListener errorListener; void ErrorListener::action(const ActionEvent &event) diff --git a/src/navigationmanager.cpp b/src/navigationmanager.cpp index 2b6bf3703..cd28b048d 100644 --- a/src/navigationmanager.cpp +++ b/src/navigationmanager.cpp @@ -24,6 +24,8 @@ #include "resources/map/metatile.h" #include "resources/map/walklayer.h" +#include "debug.h" + static const int walkMask = (BlockMask::WALL | BlockMask::AIR | BlockMask::WATER); diff --git a/src/notifymanager.cpp b/src/notifymanager.cpp index a5962006c..6d6a2b3a7 100644 --- a/src/notifymanager.cpp +++ b/src/notifymanager.cpp @@ -34,6 +34,8 @@ #include "resources/db/sounddb.h" +#include "debug.h" + namespace NotifyManager { static ChatTab *getGuildTab() diff --git a/src/render/mgl.cpp b/src/render/mgl.cpp index bf8483a67..429afe9eb 100644 --- a/src/render/mgl.cpp +++ b/src/render/mgl.cpp @@ -22,7 +22,7 @@ #ifdef USE_OPENGL -#include "localconsts.h" +#include "debug.h" #define defName(name) name##_t m##name = nullptr diff --git a/src/render/renderers.cpp b/src/render/renderers.cpp index cb6d655e9..a26cb8b96 100644 --- a/src/render/renderers.cpp +++ b/src/render/renderers.cpp @@ -20,6 +20,8 @@ #include "render/renderers.h" +#include "debug.h" + static RenderType getDefault() { #ifdef USE_OPENGL diff --git a/src/resources/cursor.cpp b/src/resources/cursor.cpp index a67aebf4a..6a1d61548 100644 --- a/src/resources/cursor.cpp +++ b/src/resources/cursor.cpp @@ -20,6 +20,8 @@ #include "resources/cursor.h" +#include "debug.h" + namespace Cursor { static const StrToCursor hoverCursors[] = diff --git a/src/utils/files.cpp b/src/utils/files.cpp index d671cb0db..5cf97ddba 100644 --- a/src/utils/files.cpp +++ b/src/utils/files.cpp @@ -28,7 +28,7 @@ #include "utils/physfstools.h" -#include "localconsts.h" +#include "debug.h" #ifdef ANDROID void Files::extractLocale() diff --git a/src/utils/physfstools.cpp b/src/utils/physfstools.cpp index 8e04aa608..58be77f0e 100644 --- a/src/utils/physfstools.cpp +++ b/src/utils/physfstools.cpp @@ -27,7 +27,7 @@ #include "utils/paths.h" #endif -#include "localconsts.h" +#include "debug.h" const char *dirSeparator = nullptr; -- cgit v1.2.3-60-g2f50