From b2b06bf0097b63a0c1e1644deb9dddc631779ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Wed, 4 Jan 2023 10:52:16 +0100 Subject: [PATCH] Preprocessor purge round 3: spaghetti headers --- src/Format.cpp | 2 +- src/PowderToyFontEditor.cpp | 5 +- src/PowderToySDL.cpp | 6 +- src/SDLCompat.h | 7 - src/gui/colourpicker/ColourPickerActivity.cpp | 3 +- src/gui/console/ConsoleView.cpp | 2 +- .../elementsearch/ElementSearchActivity.cpp | 2 +- src/gui/font/FontEditor.cpp | 4 +- src/gui/game/GameController.cpp | 4 +- src/gui/game/GameView.cpp | 2 +- src/gui/game/PropertyTool.cpp | 2 +- src/gui/game/ToolButton.cpp | 3 +- src/gui/interface/AvatarButton.cpp | 4 +- src/gui/interface/Keys.h | 328 ------------------ src/gui/interface/Label.cpp | 4 +- src/gui/interface/Mouse.h | 1 - src/gui/interface/SaveButton.cpp | 4 +- src/gui/interface/Textbox.cpp | 4 +- src/gui/interface/Window.cpp | 3 +- src/gui/localbrowser/LocalBrowserView.cpp | 3 +- src/gui/login/LoginView.cpp | 3 +- src/gui/options/OptionsView.cpp | 2 +- src/gui/preview/PreviewView.cpp | 3 +- src/gui/search/SearchView.cpp | 3 +- src/gui/tags/TagsView.cpp | 3 +- src/lua/LegacyLuaAPI.cpp | 1 - src/lua/LuaSDLKeys.h | 2 +- src/simulation/StorageClasses.h | 6 - 28 files changed, 36 insertions(+), 380 deletions(-) delete mode 100644 src/SDLCompat.h delete mode 100644 src/gui/interface/Keys.h delete mode 100644 src/gui/interface/Mouse.h delete mode 100644 src/simulation/StorageClasses.h diff --git a/src/Format.cpp b/src/Format.cpp index e320cf9c5..efd25f8b9 100644 --- a/src/Format.cpp +++ b/src/Format.cpp @@ -12,7 +12,7 @@ #include "graphics/Graphics.h" #ifndef RENDERER -# include "SDLCompat.h" +# include #endif ByteString format::UnixtimeToDate(time_t unixtime, ByteString dateFormat) diff --git a/src/PowderToyFontEditor.cpp b/src/PowderToyFontEditor.cpp index cb7a53e83..c03cc5162 100644 --- a/src/PowderToyFontEditor.cpp +++ b/src/PowderToyFontEditor.cpp @@ -4,7 +4,6 @@ #ifdef WIN #include #endif -#include "SDLCompat.h" #ifdef X86_SSE #include @@ -25,6 +24,7 @@ #ifdef MACOSX # include "common/macosx.h" #endif +#include #include "Format.h" #include "Misc.h" @@ -40,12 +40,9 @@ #include "gui/font/FontEditor.h" #include "gui/dialogues/ErrorMessage.h" #include "gui/dialogues/ConfirmPrompt.h" -#include "gui/interface/Keys.h" #include "gui/Style.h" #include "gui/interface/Engine.h" -#include "SDLCompat.h" - int desktopWidth = 1280, desktopHeight = 1024; SDL_Window * sdl_window; diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index c6c7e594c..162476781 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -9,7 +9,7 @@ #ifdef WIN #include #endif -#include "SDLCompat.h" +#include #ifdef X86_SSE #include @@ -36,6 +36,7 @@ # include #endif #include +#include #include "Format.h" #include "Misc.h" @@ -53,9 +54,6 @@ #include "gui/dialogues/ConfirmPrompt.h" #include "gui/dialogues/ErrorMessage.h" #include "gui/interface/Engine.h" -#include "gui/interface/Keys.h" - -#include "SDLCompat.h" int desktopWidth = 1280, desktopHeight = 1024; diff --git a/src/SDLCompat.h b/src/SDLCompat.h deleted file mode 100644 index 26b093ab6..000000000 --- a/src/SDLCompat.h +++ /dev/null @@ -1,7 +0,0 @@ -#include "Config.h" -#include -#ifdef INCLUDE_SYSWM -# if defined(WIN) -# include -# endif // WIN -#endif // INCLUDE_SYSWM diff --git a/src/gui/colourpicker/ColourPickerActivity.cpp b/src/gui/colourpicker/ColourPickerActivity.cpp index 19f105159..54c77fb9e 100644 --- a/src/gui/colourpicker/ColourPickerActivity.cpp +++ b/src/gui/colourpicker/ColourPickerActivity.cpp @@ -4,13 +4,14 @@ #include "gui/interface/Slider.h" #include "gui/interface/Button.h" #include "gui/interface/Label.h" -#include "gui/interface/Keys.h" #include "gui/Style.h" #include "graphics/Graphics.h" #include "Misc.h" +#include + ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, OnPicked onPicked_) : WindowActivity(ui::Point(-1, -1), ui::Point(266, 215)), currentHue(0), diff --git a/src/gui/console/ConsoleView.cpp b/src/gui/console/ConsoleView.cpp index 9c2848199..6b670a222 100644 --- a/src/gui/console/ConsoleView.cpp +++ b/src/gui/console/ConsoleView.cpp @@ -4,6 +4,7 @@ #include "ConsoleModel.h" #include +#include #include "graphics/Graphics.h" @@ -11,7 +12,6 @@ #include "ConsoleCommand.h" -#include "gui/interface/Keys.h" #include "gui/interface/Label.h" #include "gui/interface/Textbox.h" diff --git a/src/gui/elementsearch/ElementSearchActivity.cpp b/src/gui/elementsearch/ElementSearchActivity.cpp index 0afc4b6ab..ae049a482 100644 --- a/src/gui/elementsearch/ElementSearchActivity.cpp +++ b/src/gui/elementsearch/ElementSearchActivity.cpp @@ -3,10 +3,10 @@ #include #include #include +#include #include "gui/interface/Textbox.h" #include "gui/interface/Label.h" -#include "gui/interface/Keys.h" #include "gui/game/Tool.h" #include "gui/game/Menu.h" #include "gui/Style.h" diff --git a/src/gui/font/FontEditor.cpp b/src/gui/font/FontEditor.cpp index 034ab5899..29b0916ab 100644 --- a/src/gui/font/FontEditor.cpp +++ b/src/gui/font/FontEditor.cpp @@ -13,11 +13,11 @@ #include "gui/interface/Engine.h" #include "gui/interface/Point.h" #include "gui/interface/Button.h" -#include "gui/interface/Mouse.h" -#include "gui/interface/Keys.h" #include "gui/interface/ScrollPanel.h" #include "graphics/Graphics.h" +#include + extern unsigned char *font_data; extern unsigned int *font_ptrs; extern unsigned int (*font_ranges)[2]; diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index 26615b6c8..f2da43d9d 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -38,8 +38,6 @@ #include "gui/dialogues/ErrorMessage.h" #include "gui/dialogues/InformationMessage.h" #include "gui/dialogues/ConfirmPrompt.h" -#include "gui/interface/Keys.h" -#include "gui/interface/Mouse.h" #include "gui/interface/Engine.h" #include "gui/colourpicker/ColourPickerActivity.h" @@ -67,6 +65,8 @@ #include "gui/tags/TagsController.h" #include "gui/tags/TagsView.h" +#include + #ifdef GetUserName # undef GetUserName // dammit windows #endif diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp index bc8c93b91..69b398f2e 100644 --- a/src/gui/game/GameView.cpp +++ b/src/gui/game/GameView.cpp @@ -32,11 +32,11 @@ #include "gui/dialogues/InformationMessage.h" #include "gui/interface/Button.h" #include "gui/interface/Colour.h" -#include "gui/interface/Keys.h" #include "gui/interface/Engine.h" #include #include +#include #ifdef GetUserName # undef GetUserName // dammit windows diff --git a/src/gui/game/PropertyTool.cpp b/src/gui/game/PropertyTool.cpp index 1e5decdf3..92fafd84c 100644 --- a/src/gui/game/PropertyTool.cpp +++ b/src/gui/game/PropertyTool.cpp @@ -12,7 +12,6 @@ #include "gui/interface/Label.h" #include "gui/interface/Textbox.h" #include "gui/interface/DropDown.h" -#include "gui/interface/Keys.h" #include "gui/dialogues/ErrorMessage.h" #include "simulation/GOLString.h" @@ -23,6 +22,7 @@ #include "graphics/Graphics.h" #include +#include class PropertyWindow: public ui::Window { diff --git a/src/gui/game/ToolButton.cpp b/src/gui/game/ToolButton.cpp index 3432ad212..584d047a2 100644 --- a/src/gui/game/ToolButton.cpp +++ b/src/gui/game/ToolButton.cpp @@ -2,8 +2,7 @@ #include "graphics/Graphics.h" -#include "gui/interface/Keys.h" -#include "gui/interface/Mouse.h" +#include #include "Favorite.h" diff --git a/src/gui/interface/AvatarButton.cpp b/src/gui/interface/AvatarButton.cpp index 6409457f3..5dbb8423a 100644 --- a/src/gui/interface/AvatarButton.cpp +++ b/src/gui/interface/AvatarButton.cpp @@ -1,13 +1,11 @@ #include -#include +#include #include "Button.h" #include "AvatarButton.h" #include "Format.h" #include "graphics/Graphics.h" #include "ContextMenu.h" -#include "Keys.h" -#include "Mouse.h" namespace ui { diff --git a/src/gui/interface/Keys.h b/src/gui/interface/Keys.h deleted file mode 100644 index 781c3bda6..000000000 --- a/src/gui/interface/Keys.h +++ /dev/null @@ -1,328 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#include "SDLCompat.h" -#define _SDL_keysym_h -#ifndef _SDL_keysym_h -#define _SDL_keysym_h - -/** What we really want is a mapping of every raw key on the keyboard. - * To support international keyboards, we use the range 0xA1 - 0xFF - * as international virtual keycodes. We'll follow in the footsteps of X11... - * @brief The names of the keys - */ -typedef enum { - /** @name ASCII mapped keysyms - * The keyboard syms have been cleverly chosen to map to ASCII - */ - /*@{*/ - SDLK_UNKNOWN = 0, - SDLK_FIRST = 0, - SDLK_BACKSPACE = 8, - SDLK_TAB = 9, - SDLK_CLEAR = 12, - SDLK_RETURN = 13, - SDLK_PAUSE = 19, - SDLK_ESCAPE = 27, - SDLK_SPACE = 32, - SDLK_EXCLAIM = 33, - SDLK_QUOTEDBL = 34, - SDLK_HASH = 35, - SDLK_DOLLAR = 36, - SDLK_AMPERSAND = 38, - SDLK_QUOTE = 39, - SDLK_LEFTPAREN = 40, - SDLK_RIGHTPAREN = 41, - SDLK_ASTERISK = 42, - SDLK_PLUS = 43, - SDLK_COMMA = 44, - SDLK_MINUS = 45, - SDLK_PERIOD = 46, - SDLK_SLASH = 47, - SDLK_0 = 48, - SDLK_1 = 49, - SDLK_2 = 50, - SDLK_3 = 51, - SDLK_4 = 52, - SDLK_5 = 53, - SDLK_6 = 54, - SDLK_7 = 55, - SDLK_8 = 56, - SDLK_9 = 57, - SDLK_COLON = 58, - SDLK_SEMICOLON = 59, - SDLK_LESS = 60, - SDLK_EQUALS = 61, - SDLK_GREATER = 62, - SDLK_QUESTION = 63, - SDLK_AT = 64, - /* - Skip uppercase letters - */ - SDLK_LEFTBRACKET = 91, - SDLK_BACKSLASH = 92, - SDLK_RIGHTBRACKET = 93, - SDLK_CARET = 94, - SDLK_UNDERSCORE = 95, - SDLK_BACKQUOTE = 96, - SDLK_a = 97, - SDLK_b = 98, - SDLK_c = 99, - SDLK_d = 100, - SDLK_e = 101, - SDLK_f = 102, - SDLK_g = 103, - SDLK_h = 104, - SDLK_i = 105, - SDLK_j = 106, - SDLK_k = 107, - SDLK_l = 108, - SDLK_m = 109, - SDLK_n = 110, - SDLK_o = 111, - SDLK_p = 112, - SDLK_q = 113, - SDLK_r = 114, - SDLK_s = 115, - SDLK_t = 116, - SDLK_u = 117, - SDLK_v = 118, - SDLK_w = 119, - SDLK_x = 120, - SDLK_y = 121, - SDLK_z = 122, - SDLK_DELETE = 127, - /* End of ASCII mapped keysyms */ - /*@}*/ - - /** @name International keyboard syms */ - /*@{*/ - SDLK_WORLD_0 = 160, /* 0xA0 */ - SDLK_WORLD_1 = 161, - SDLK_WORLD_2 = 162, - SDLK_WORLD_3 = 163, - SDLK_WORLD_4 = 164, - SDLK_WORLD_5 = 165, - SDLK_WORLD_6 = 166, - SDLK_WORLD_7 = 167, - SDLK_WORLD_8 = 168, - SDLK_WORLD_9 = 169, - SDLK_WORLD_10 = 170, - SDLK_WORLD_11 = 171, - SDLK_WORLD_12 = 172, - SDLK_WORLD_13 = 173, - SDLK_WORLD_14 = 174, - SDLK_WORLD_15 = 175, - SDLK_WORLD_16 = 176, - SDLK_WORLD_17 = 177, - SDLK_WORLD_18 = 178, - SDLK_WORLD_19 = 179, - SDLK_WORLD_20 = 180, - SDLK_WORLD_21 = 181, - SDLK_WORLD_22 = 182, - SDLK_WORLD_23 = 183, - SDLK_WORLD_24 = 184, - SDLK_WORLD_25 = 185, - SDLK_WORLD_26 = 186, - SDLK_WORLD_27 = 187, - SDLK_WORLD_28 = 188, - SDLK_WORLD_29 = 189, - SDLK_WORLD_30 = 190, - SDLK_WORLD_31 = 191, - SDLK_WORLD_32 = 192, - SDLK_WORLD_33 = 193, - SDLK_WORLD_34 = 194, - SDLK_WORLD_35 = 195, - SDLK_WORLD_36 = 196, - SDLK_WORLD_37 = 197, - SDLK_WORLD_38 = 198, - SDLK_WORLD_39 = 199, - SDLK_WORLD_40 = 200, - SDLK_WORLD_41 = 201, - SDLK_WORLD_42 = 202, - SDLK_WORLD_43 = 203, - SDLK_WORLD_44 = 204, - SDLK_WORLD_45 = 205, - SDLK_WORLD_46 = 206, - SDLK_WORLD_47 = 207, - SDLK_WORLD_48 = 208, - SDLK_WORLD_49 = 209, - SDLK_WORLD_50 = 210, - SDLK_WORLD_51 = 211, - SDLK_WORLD_52 = 212, - SDLK_WORLD_53 = 213, - SDLK_WORLD_54 = 214, - SDLK_WORLD_55 = 215, - SDLK_WORLD_56 = 216, - SDLK_WORLD_57 = 217, - SDLK_WORLD_58 = 218, - SDLK_WORLD_59 = 219, - SDLK_WORLD_60 = 220, - SDLK_WORLD_61 = 221, - SDLK_WORLD_62 = 222, - SDLK_WORLD_63 = 223, - SDLK_WORLD_64 = 224, - SDLK_WORLD_65 = 225, - SDLK_WORLD_66 = 226, - SDLK_WORLD_67 = 227, - SDLK_WORLD_68 = 228, - SDLK_WORLD_69 = 229, - SDLK_WORLD_70 = 230, - SDLK_WORLD_71 = 231, - SDLK_WORLD_72 = 232, - SDLK_WORLD_73 = 233, - SDLK_WORLD_74 = 234, - SDLK_WORLD_75 = 235, - SDLK_WORLD_76 = 236, - SDLK_WORLD_77 = 237, - SDLK_WORLD_78 = 238, - SDLK_WORLD_79 = 239, - SDLK_WORLD_80 = 240, - SDLK_WORLD_81 = 241, - SDLK_WORLD_82 = 242, - SDLK_WORLD_83 = 243, - SDLK_WORLD_84 = 244, - SDLK_WORLD_85 = 245, - SDLK_WORLD_86 = 246, - SDLK_WORLD_87 = 247, - SDLK_WORLD_88 = 248, - SDLK_WORLD_89 = 249, - SDLK_WORLD_90 = 250, - SDLK_WORLD_91 = 251, - SDLK_WORLD_92 = 252, - SDLK_WORLD_93 = 253, - SDLK_WORLD_94 = 254, - SDLK_WORLD_95 = 255, /* 0xFF */ - /*@}*/ - - /** @name Numeric keypad */ - /*@{*/ - SDLK_KP0 = 256, - SDLK_KP1 = 257, - SDLK_KP2 = 258, - SDLK_KP3 = 259, - SDLK_KP4 = 260, - SDLK_KP5 = 261, - SDLK_KP6 = 262, - SDLK_KP7 = 263, - SDLK_KP8 = 264, - SDLK_KP9 = 265, - SDLK_KP_PERIOD = 266, - SDLK_KP_DIVIDE = 267, - SDLK_KP_MULTIPLY = 268, - SDLK_KP_MINUS = 269, - SDLK_KP_PLUS = 270, - SDLK_KP_ENTER = 271, - SDLK_KP_EQUALS = 272, - /*@}*/ - - /** @name Arrows + Home/End pad */ - /*@{*/ - SDLK_UP = 273, - SDLK_DOWN = 274, - SDLK_RIGHT = 275, - SDLK_LEFT = 276, - SDLK_INSERT = 277, - SDLK_HOME = 278, - SDLK_END = 279, - SDLK_PAGEUP = 280, - SDLK_PAGEDOWN = 281, - /*@}*/ - - /** @name Function keys */ - /*@{*/ - SDLK_F1 = 282, - SDLK_F2 = 283, - SDLK_F3 = 284, - SDLK_F4 = 285, - SDLK_F5 = 286, - SDLK_F6 = 287, - SDLK_F7 = 288, - SDLK_F8 = 289, - SDLK_F9 = 290, - SDLK_F10 = 291, - SDLK_F11 = 292, - SDLK_F12 = 293, - SDLK_F13 = 294, - SDLK_F14 = 295, - SDLK_F15 = 296, - /*@}*/ - - /** @name Key state modifier keys */ - /*@{*/ - SDLK_NUMLOCK = 300, - SDLK_CAPSLOCK = 301, - SDLK_SCROLLOCK = 302, - SDLK_RSHIFT = 303, - SDLK_LSHIFT = 304, - SDLK_RCTRL = 305, - SDLK_LCTRL = 306, - SDLK_RALT = 307, - SDLK_LALT = 308, - SDLK_RMETA = 309, - SDLK_LMETA = 310, - SDLK_LSUPER = 311, /**< Left "Windows" key */ - SDLK_RSUPER = 312, /**< Right "Windows" key */ - SDLK_MODE = 313, /**< "Alt Gr" key */ - SDLK_COMPOSE = 314, /**< Multi-key compose key */ - /*@}*/ - - /** @name Miscellaneous function keys */ - /*@{*/ - SDLK_HELP = 315, - SDLK_PRINT = 316, - SDLK_SYSREQ = 317, - SDLK_BREAK = 318, - SDLK_MENU = 319, - SDLK_POWER = 320, /**< Power Macintosh power key */ - SDLK_EURO = 321, /**< Some european keyboards */ - SDLK_UNDO = 322, /**< Atari keyboard has Undo */ - /*@}*/ - - /* Add any other keys here */ - - SDLK_LAST -} SDLKey; - -/** Enumeration of valid key mods (possibly OR'd together) */ -typedef enum { - KMOD_NONE = 0x0000, - KMOD_LSHIFT= 0x0001, - KMOD_RSHIFT= 0x0002, - KMOD_LCTRL = 0x0040, - KMOD_RCTRL = 0x0080, - KMOD_LALT = 0x0100, - KMOD_RALT = 0x0200, - KMOD_LMETA = 0x0400, - KMOD_RMETA = 0x0800, - KMOD_NUM = 0x1000, - KMOD_CAPS = 0x2000, - KMOD_MODE = 0x4000, - KMOD_RESERVED = 0x8000 -} SDLMod; - -#define KMOD_CTRL (KMOD_LCTRL|KMOD_RCTRL) -#define KMOD_SHIFT (KMOD_LSHIFT|KMOD_RSHIFT) -#define KMOD_ALT (KMOD_LALT|KMOD_RALT) -#define KMOD_META (KMOD_LMETA|KMOD_RMETA) - -#endif /* _SDL_keysym_h */ diff --git a/src/gui/interface/Label.cpp b/src/gui/interface/Label.cpp index 310eb77e1..b491c17f2 100644 --- a/src/gui/interface/Label.cpp +++ b/src/gui/interface/Label.cpp @@ -2,14 +2,14 @@ #include "Format.h" #include "Point.h" -#include "Keys.h" -#include "Mouse.h" #include "PowderToy.h" #include "ContextMenu.h" #include "graphics/Graphics.h" #include "graphics/FontReader.h" +#include + using namespace ui; Label::Label(Point position, Point size, String labelText): diff --git a/src/gui/interface/Mouse.h b/src/gui/interface/Mouse.h deleted file mode 100644 index 5095ce15a..000000000 --- a/src/gui/interface/Mouse.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/src/gui/interface/SaveButton.cpp b/src/gui/interface/SaveButton.cpp index 1b82b8ce2..b489650e9 100644 --- a/src/gui/interface/SaveButton.cpp +++ b/src/gui/interface/SaveButton.cpp @@ -2,8 +2,6 @@ #include "ContextMenu.h" #include "Format.h" -#include "Keys.h" -#include "Mouse.h" #include "client/Client.h" #include "client/ThumbnailRendererTask.h" @@ -13,6 +11,8 @@ #include "gui/dialogues/ErrorMessage.h" #include "graphics/Graphics.h" +#include + namespace ui { SaveButton::SaveButton(Point position, Point size) : diff --git a/src/gui/interface/Textbox.cpp b/src/gui/interface/Textbox.cpp index 25a6825ea..b0caa1c93 100644 --- a/src/gui/interface/Textbox.cpp +++ b/src/gui/interface/Textbox.cpp @@ -9,12 +9,12 @@ #include "graphics/Graphics.h" #include "gui/interface/Engine.h" -#include "gui/interface/Keys.h" -#include "gui/interface/Mouse.h" #include "gui/interface/Point.h" #include "ContextMenu.h" +#include + using namespace ui; Textbox::Textbox(Point position, Point size, String textboxText, String textboxPlaceholder): diff --git a/src/gui/interface/Window.cpp b/src/gui/interface/Window.cpp index 4a1b7a983..49475db7d 100644 --- a/src/gui/interface/Window.cpp +++ b/src/gui/interface/Window.cpp @@ -1,12 +1,13 @@ #include "Window.h" #include "Engine.h" -#include "Keys.h" #include "Component.h" #include "gui/interface/Button.h" #include "graphics/Graphics.h" +#include + using namespace ui; Window::Window(Point _position, Point _size): diff --git a/src/gui/localbrowser/LocalBrowserView.cpp b/src/gui/localbrowser/LocalBrowserView.cpp index 04a560569..0eabc4448 100644 --- a/src/gui/localbrowser/LocalBrowserView.cpp +++ b/src/gui/localbrowser/LocalBrowserView.cpp @@ -7,7 +7,6 @@ #include "gui/interface/Textbox.h" #include "gui/interface/Label.h" #include "gui/interface/SaveButton.h" -#include "gui/interface/Keys.h" #include "PowderToy.h" #include "Config.h" @@ -16,6 +15,8 @@ #include "graphics/Graphics.h" +#include + LocalBrowserView::LocalBrowserView(): ui::Window(ui::Point(0, 0), ui::Point(WINDOWW, WINDOWH)), changed(false), diff --git a/src/gui/login/LoginView.cpp b/src/gui/login/LoginView.cpp index faba2b8f9..be91522a8 100644 --- a/src/gui/login/LoginView.cpp +++ b/src/gui/login/LoginView.cpp @@ -7,13 +7,14 @@ #include "gui/interface/Button.h" #include "gui/interface/Label.h" #include "gui/interface/Textbox.h" -#include "gui/interface/Keys.h" #include "gui/Style.h" #include "client/Client.h" #include "Misc.h" +#include + LoginView::LoginView(): ui::Window(ui::Point(-1, -1), ui::Point(200, 87)), loginButton(new ui::Button(ui::Point(200-100, 87-17), ui::Point(100, 17), "Sign in")), diff --git a/src/gui/options/OptionsView.cpp b/src/gui/options/OptionsView.cpp index 6de3fe2d2..805a4fa0f 100644 --- a/src/gui/options/OptionsView.cpp +++ b/src/gui/options/OptionsView.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "SDLCompat.h" +#include #include "Format.h" #include "OptionsController.h" diff --git a/src/gui/preview/PreviewView.cpp b/src/gui/preview/PreviewView.cpp index 195923495..153eb9fe4 100644 --- a/src/gui/preview/PreviewView.cpp +++ b/src/gui/preview/PreviewView.cpp @@ -12,7 +12,6 @@ #include "gui/preview/PreviewController.h" #include "gui/preview/PreviewModel.h" #include "gui/interface/Button.h" -#include "gui/interface/Keys.h" #include "gui/interface/CopyTextButton.h" #include "gui/interface/Label.h" #include "gui/interface/Textbox.h" @@ -27,6 +26,8 @@ #include "Format.h" #include "Misc.h" +#include + #ifdef GetUserName # undef GetUserName // dammit windows #endif diff --git a/src/gui/search/SearchView.cpp b/src/gui/search/SearchView.cpp index 85ec4c341..b2c9ea2f8 100644 --- a/src/gui/search/SearchView.cpp +++ b/src/gui/search/SearchView.cpp @@ -6,7 +6,6 @@ #include "client/Client.h" #include "client/SaveInfo.h" -#include "gui/interface/Keys.h" #include "gui/interface/SaveButton.h" #include "gui/interface/Button.h" #include "gui/interface/Label.h" @@ -19,6 +18,8 @@ #include "graphics/Graphics.h" +#include + #ifdef GetUserName # undef GetUserName // dammit windows #endif diff --git a/src/gui/tags/TagsView.cpp b/src/gui/tags/TagsView.cpp index ca57cbf31..ae26ec4b2 100644 --- a/src/gui/tags/TagsView.cpp +++ b/src/gui/tags/TagsView.cpp @@ -13,7 +13,8 @@ #include "gui/interface/Button.h" #include "gui/interface/Textbox.h" #include "gui/interface/Label.h" -#include "gui/interface/Keys.h" + +#include TagsView::TagsView(): ui::Window(ui::Point(-1, -1), ui::Point(195, 250)) diff --git a/src/lua/LegacyLuaAPI.cpp b/src/lua/LegacyLuaAPI.cpp index 308df3897..f6bdbf7c7 100644 --- a/src/lua/LegacyLuaAPI.cpp +++ b/src/lua/LegacyLuaAPI.cpp @@ -30,7 +30,6 @@ #include "gui/game/GameController.h" #include "gui/game/GameModel.h" #include "gui/interface/Engine.h" -#include "gui/interface/Keys.h" std::map legacyPropNames; std::map legacyTransitionNames; diff --git a/src/lua/LuaSDLKeys.h b/src/lua/LuaSDLKeys.h index a80aadc9e..8846d023d 100644 --- a/src/lua/LuaSDLKeys.h +++ b/src/lua/LuaSDLKeys.h @@ -2,7 +2,7 @@ #include "Config.h" #include "LuaCompat.h" -#include "SDLCompat.h" +#include #define SETCONST(L, NAME)\ lua_pushinteger(L, NAME);\ diff --git a/src/simulation/StorageClasses.h b/src/simulation/StorageClasses.h deleted file mode 100644 index e41146e32..000000000 --- a/src/simulation/StorageClasses.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once -#include "ElementDefs.h" -#include "ElementClasses.h" - -class Renderer; -class Simulation;