summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-05 21:49:04 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-06 12:12:22 +0300
commit2bd59adc7c456ce6f377feac8bc838e8011ebfc8 (patch)
treef2f25428e42e59b9a6d55d7c0be9a99c42e96e40 /src/gui/widgets
parentac1ef6b19f5c1405cfaa239ab367a93b17043723 (diff)
downloadmv-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.gz
mv-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.bz2
mv-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.xz
mv-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.zip
Fix code style.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/avatarlistbox.cpp10
-rw-r--r--src/gui/widgets/basiccontainer.cpp2
-rw-r--r--src/gui/widgets/button.cpp2
-rw-r--r--src/gui/widgets/characterdisplay.cpp2
-rw-r--r--src/gui/widgets/chatinput.h2
-rw-r--r--src/gui/widgets/checkbox.cpp2
-rw-r--r--src/gui/widgets/dropdown.cpp2
-rw-r--r--src/gui/widgets/emotepage.cpp2
-rw-r--r--src/gui/widgets/guitable.cpp2
-rw-r--r--src/gui/widgets/inttextfield.cpp5
-rw-r--r--src/gui/widgets/listbox.cpp5
-rw-r--r--src/gui/widgets/popup.cpp2
-rw-r--r--src/gui/widgets/progressbar.cpp2
-rw-r--r--src/gui/widgets/progressbar.h2
-rw-r--r--src/gui/widgets/radiobutton.cpp2
-rw-r--r--src/gui/widgets/scrollarea.cpp2
-rw-r--r--src/gui/widgets/selldialog.h2
-rw-r--r--src/gui/widgets/shortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/skilldata.h2
-rw-r--r--src/gui/widgets/skillinfo.cpp2
-rw-r--r--src/gui/widgets/skillinfo.h3
-rw-r--r--src/gui/widgets/slider.cpp6
-rw-r--r--src/gui/widgets/tabbedarea.cpp2
-rw-r--r--src/gui/widgets/tabs/chat/chattab.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_colors.cpp7
-rw-r--r--src/gui/widgets/tabs/setup_input.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_theme.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp8
-rw-r--r--src/gui/widgets/tabs/socialguildtab.h3
-rw-r--r--src/gui/widgets/tabs/socialguildtab2.h6
-rw-r--r--src/gui/widgets/tabs/socialpartytab.h3
-rw-r--r--src/gui/widgets/tabs/tab.cpp8
-rw-r--r--src/gui/widgets/textbox.cpp2
-rw-r--r--src/gui/widgets/window.h1
34 files changed, 33 insertions, 76 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index d5b6cbaf8..47debb1e7 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -25,8 +25,6 @@
#include "configuration.h"
#include "graphicsvertexes.h"
-#include "enums/gui/progresscolorid.h"
-
#include "being/localplayer.h"
#include "gui/gui.h"
@@ -42,8 +40,6 @@
#include "gui/windows/chatwindow.h"
-#include "render/renderers.h"
-
#include "resources/image.h"
#include "resources/mapitemtype.h"
@@ -180,7 +176,8 @@ void AvatarListBox::draw(Graphics *graphics)
if (a->getMaxHp())
{
const ProgressColorIdT themeColor = (isPoison
- ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP);
+ ? ProgressColorId::PROG_HP_POISON
+ : ProgressColorId::PROG_HP);
Color color = Theme::getProgressColor(
themeColor, static_cast<float>(a->getHp())
/ static_cast<float>(a->getMaxHp()));
@@ -417,7 +414,8 @@ void AvatarListBox::safeDraw(Graphics *graphics)
if (a->getMaxHp())
{
const ProgressColorIdT themeColor = (isPoison
- ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP);
+ ? ProgressColorId::PROG_HP_POISON
+ : ProgressColorId::PROG_HP);
Color color = Theme::getProgressColor(
themeColor, static_cast<float>(a->getHp())
/ static_cast<float>(a->getMaxHp()));
diff --git a/src/gui/widgets/basiccontainer.cpp b/src/gui/widgets/basiccontainer.cpp
index bcf30a27f..1be1d4bc0 100644
--- a/src/gui/widgets/basiccontainer.cpp
+++ b/src/gui/widgets/basiccontainer.cpp
@@ -63,8 +63,6 @@
#include "gui/widgets/basiccontainer.h"
-#include "render/renderers.h"
-
#include <algorithm>
#include "debug.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 842286ecb..98140e71c 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -68,8 +68,6 @@
#include "graphicsvertexes.h"
#include "settings.h"
-#include "enums/input/inputaction.h"
-
#include "resources/image.h"
#include "resources/imageset.h"
#include "resources/imagerect.h"
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index df0032990..b7af55018 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -24,8 +24,6 @@
#include "units.h"
-#include "enums/being/attributes.h"
-
#include "gui/gui.h"
#include "gui/windows/charselectdialog.h"
diff --git a/src/gui/widgets/chatinput.h b/src/gui/widgets/chatinput.h
index 592299312..1d2b6b426 100644
--- a/src/gui/widgets/chatinput.h
+++ b/src/gui/widgets/chatinput.h
@@ -23,8 +23,6 @@
#ifndef GUI_WIDGETS_CHATINPUT_H
#define GUI_WIDGETS_CHATINPUT_H
-#include "enums/simpletypes/visible.h"
-
#include "gui/windows/chatwindow.h"
#include "configuration.h"
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index f7dbf3526..b5818308b 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -67,8 +67,6 @@
#include "settings.h"
-#include "enums/input/inputaction.h"
-
#include "resources/image.h"
#include "resources/imagerect.h"
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 890a2af1f..d637b7194 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -24,8 +24,6 @@
#include "settings.h"
-#include "enums/input/inputaction.h"
-
#include "gui/gui.h"
#include "gui/skin.h"
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index 7d9506546..f40a855ec 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -25,8 +25,6 @@
#include "resources/imageset.h"
#include "resources/resourcemanager.h"
-#include "render/renderers.h"
-
#include "utils/delete2.h"
#include "debug.h"
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index d5242520f..6fa605c8b 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -24,8 +24,6 @@
#include "settings.h"
-#include "enums/input/inputaction.h"
-
#include "gui/gui.h"
#include "gui/models/tablemodel.h"
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index b0e902223..fa525f87d 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -26,9 +26,10 @@
#include "gui/sdlinput.h"
#endif
-#include "enums/input/inputaction.h"
-
#include "utils/stringutils.h"
+
+#include <sstream>
+
#include "debug.h"
IntTextField::IntTextField(const Widget2 *const widget,
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 8e0bd2921..85e1a5b8f 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -67,8 +67,6 @@
#include "settings.h"
-#include "enums/input/inputaction.h"
-
#include "listeners/selectionlistener.h"
#include "gui/focushandler.h"
@@ -95,7 +93,8 @@ ListBox::ListBox(const Widget2 *const widget,
mSelectionListeners(),
mHighlightColor(getThemeColor(ThemeColorId::HIGHLIGHT)),
mForegroundSelectedColor(getThemeColor(ThemeColorId::LISTBOX_SELECTED)),
- mForegroundSelectedColor2(getThemeColor(ThemeColorId::LISTBOX_SELECTED_OUTLINE)),
+ mForegroundSelectedColor2(getThemeColor(
+ ThemeColorId::LISTBOX_SELECTED_OUTLINE)),
mOldSelected(-1),
mPadding(0),
mPressedIndex(-2),
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 181d6a46b..f2fe431f1 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -30,8 +30,6 @@
#include "gui/widgets/windowcontainer.h"
-#include "render/renderers.h"
-
#include "utils/delete2.h"
#include "debug.h"
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 2965fc410..59951c960 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -30,8 +30,6 @@
#include "gui/fonts/font.h"
-#include "render/renderers.h"
-
#include "utils/delete2.h"
#include "debug.h"
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 571568e6c..89ee13e85 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -23,8 +23,6 @@
#ifndef GUI_WIDGETS_PROGRESSBAR_H
#define GUI_WIDGETS_PROGRESSBAR_H
-#include "enums/gui/progresscolorid.h"
-
#include "gui/widgets/widget.h"
#include "listeners/widgetlistener.h"
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index 781a52421..a95286fca 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -67,8 +67,6 @@
#include "settings.h"
-#include "enums/input/inputaction.h"
-
#include "resources/image.h"
#include "resources/imagerect.h"
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 23b681907..1e43b31b5 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -74,8 +74,6 @@
#include "resources/image.h"
#include "resources/imagerect.h"
-#include "render/renderers.h"
-
#include "utils/delete2.h"
#include "utils/stringutils.h"
diff --git a/src/gui/widgets/selldialog.h b/src/gui/widgets/selldialog.h
index 439042a10..a9cb24870 100644
--- a/src/gui/widgets/selldialog.h
+++ b/src/gui/widgets/selldialog.h
@@ -23,8 +23,6 @@
#ifndef GUI_WIDGETS_SELLDIALOG_H
#define GUI_WIDGETS_SELLDIALOG_H
-#include "enums/simpletypes/visible.h"
-
#include "gui/widgets/window.h"
#include "listeners/actionlistener.h"
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index c90d2261c..fa56098d8 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -27,8 +27,6 @@
#include "gui/gui.h"
-#include "render/renderers.h"
-
#include "resources/image.h"
#include "utils/delete2.h"
diff --git a/src/gui/widgets/skilldata.h b/src/gui/widgets/skilldata.h
index 0317eccff..6408e8086 100644
--- a/src/gui/widgets/skilldata.h
+++ b/src/gui/widgets/skilldata.h
@@ -25,8 +25,6 @@
#include "resources/soundinfo.h"
-#include <string>
-
class Image;
struct SkillData final
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index 0778b6c12..92d753c4d 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -24,8 +24,6 @@
#include "being/playerinfo.h"
-#include "gui/theme.h"
-
#include "gui/widgets/skilldata.h"
#include "gui/models/skillmodel.h"
diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h
index 038fc2a01..9324091bf 100644
--- a/src/gui/widgets/skillinfo.h
+++ b/src/gui/widgets/skillinfo.h
@@ -26,12 +26,11 @@
#include "enums/simpletypes/modifiable.h"
#include "enums/simpletypes/visible.h"
-#include "gui/color.h"
-
#include "resources/skillowner.h"
#include "resources/skilltype.h"
#include <string>
+
#include <vector>
#include <map>
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 4adc3003f..ae08eaaef 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -68,12 +68,8 @@
#include "graphicsvertexes.h"
#include "settings.h"
-#include "enums/input/inputaction.h"
-
#include "gui/gui.h"
-#include "render/renderers.h"
-
#include "resources/image.h"
#include "resources/imagerect.h"
@@ -201,7 +197,6 @@ void Slider::draw(Graphics *graphics)
int w = getWidth();
const int h = getHeight();
- int x = 0;
const int y = mHasMouse ? (h - buttons[1].grid[HSTART]->getHeight()) / 2 :
(h - buttons[0].grid[HSTART]->getHeight()) / 2;
@@ -209,6 +204,7 @@ void Slider::draw(Graphics *graphics)
if (mRedraw || graphics->getRedraw())
{
+ int x = 0;
mRedraw = false;
mVertexes->clear();
if (!mHasMouse)
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 4acc9ffd2..f96201e42 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -65,8 +65,6 @@
#include "gui/widgets/tabbedarea.h"
-#include "enums/input/inputaction.h"
-
#include "gui/gui.h"
#include "gui/widgets/button.h"
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp
index a795e8ea1..0eb4200ad 100644
--- a/src/gui/widgets/tabs/chat/chattab.cpp
+++ b/src/gui/widgets/tabs/chat/chattab.cpp
@@ -57,6 +57,8 @@
#include <sys/time.h>
#endif
+#include <sstream>
+
#include "debug.h"
ChatTab *localChatTab = nullptr;
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index f7a2dcfd6..d5486c538 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -21,8 +21,6 @@
#include "gui/widgets/tabs/setup_colors.h"
-#include "enums/gui/usercolorid.h"
-
#include "gui/gui.h"
#include "gui/userpalette.h"
@@ -266,6 +264,8 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED)
mTextPreview->setOutline(true);
mTextPreview->useTextAlpha(false);
+// probably need combite both switches and add all mssing color ids.
+
switch (type)
{
case UserColorId::AIR_COLLISION_HIGHLIGHT:
@@ -411,7 +411,8 @@ void Setup_Colors::updateGradType()
// TRANSLATORS: color type
(grad == GradientType::RAINBOW) ? _("Rainbow") : _("Spectrum"));
- const bool enable = (grad == GradientType::STATIC || grad == GradientType::PULSE);
+ const bool enable = (grad == GradientType::STATIC ||
+ grad == GradientType::PULSE);
const bool delayEnable = true;
mGradDelayText->setEnabled(delayEnable);
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 24a385c0f..cc3b15498 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -25,8 +25,6 @@
#include "configuration.h"
-#include "enums/gui/dialogtype.h"
-
#include "input/inputactionoperators.h"
#include "input/inputmanager.h"
#include "input/keyboardconfig.h"
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 54015d788..a7a473593 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -22,8 +22,6 @@
#include "gui/widgets/tabs/setup_theme.h"
-#include "enums/gui/dialogtype.h"
-
#include "gui/gui.h"
#include "gui/themeinfo.h"
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 9acd36f86..ae587fe0e 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -24,8 +24,6 @@
#include "configuration.h"
-#include "enums/gui/dialogtype.h"
-
#include "gui/windowmanager.h"
#include "gui/windows/okdialog.h"
@@ -41,8 +39,6 @@
#include "gui/widgets/slider.h"
#include "gui/widgets/dropdown.h"
-#include "render/renderers.h"
-
#include "utils/delete2.h"
#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__APPLE__)
@@ -54,6 +50,10 @@
#include "gui/models/modelistmodel.h"
#include "gui/models/opengllistmodel.h"
+#include "render/renderers.h"
+
+#include <sstream>
+
#include "debug.h"
extern Graphics *mainGraphics;
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index b51f8bc38..5490af1a0 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -55,7 +55,8 @@ class SocialGuildTab final : public SocialTab,
ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE));
setSelectedTabColor(&getThemeColor(
ThemeColorId::GUILD_SOCIAL_TAB_SELECTED),
- &getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE));
+ &getThemeColor(
+ ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE));
createControls(guild, showBackground);
}
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index fb3857214..ef858447d 100644
--- a/src/gui/widgets/tabs/socialguildtab2.h
+++ b/src/gui/widgets/tabs/socialguildtab2.h
@@ -50,11 +50,13 @@ class SocialGuildTab2 final : public SocialTab,
setTabColor(&getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB),
&getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_OUTLINE));
setHighlightedTabColor(&getThemeColor(
- ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor(
+ ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED),
+ &getThemeColor(
ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE));
setSelectedTabColor(&getThemeColor(
ThemeColorId::GUILD_SOCIAL_TAB_SELECTED),
- &getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE));
+ &getThemeColor(
+ ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE));
createControls(guild, showBackground);
}
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index ff634bf3c..dd1acf5e1 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -57,7 +57,8 @@ class SocialPartyTab final : public SocialTab,
ThemeColorId::PARTY_SOCIAL_TAB_HIGHLIGHTED_OUTLINE));
setSelectedTabColor(&getThemeColor(
ThemeColorId::PARTY_SOCIAL_TAB_SELECTED),
- &getThemeColor(ThemeColorId::PARTY_SOCIAL_TAB_SELECTED_OUTLINE));
+ &getThemeColor(
+ ThemeColorId::PARTY_SOCIAL_TAB_SELECTED_OUTLINE));
createControls(party, showBackground);
}
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index d8f58bf8d..5a4b4f5dc 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -74,8 +74,6 @@
#include "gui/widgets/label.h"
#include "gui/widgets/tabbedarea.h"
-#include "render/renderers.h"
-
#include "resources/image.h"
#include "resources/imagerect.h"
@@ -111,11 +109,13 @@ Tab::Tab(const Widget2 *const widget) :
mTabHighlightedOutlineColor(&getThemeColor(
ThemeColorId::TAB_HIGHLIGHTED_OUTLINE)),
mTabSelectedColor(&getThemeColor(ThemeColorId::TAB_SELECTED)),
- mTabSelectedOutlineColor(&getThemeColor(ThemeColorId::TAB_SELECTED_OUTLINE)),
+ mTabSelectedOutlineColor(&getThemeColor(
+ ThemeColorId::TAB_SELECTED_OUTLINE)),
mFlashColor(&getThemeColor(ThemeColorId::TAB_FLASH)),
mFlashOutlineColor(&getThemeColor(ThemeColorId::TAB_FLASH_OUTLINE)),
mPlayerFlashColor(&getThemeColor(ThemeColorId::TAB_PLAYER_FLASH)),
- mPlayerFlashOutlineColor(&getThemeColor(ThemeColorId::TAB_PLAYER_FLASH_OUTLINE)),
+ mPlayerFlashOutlineColor(&getThemeColor(
+ ThemeColorId::TAB_PLAYER_FLASH_OUTLINE)),
mFlash(0),
mVertexes(new ImageCollection),
mImage(nullptr),
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index 248fbcb9e..c0aacd2c6 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -65,8 +65,6 @@
#include "gui/widgets/textbox.h"
-#include "enums/input/inputaction.h"
-
#include "gui/gui.h"
#include "gui/fonts/font.h"
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index f6e777e03..1ef0b3793 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -67,7 +67,6 @@
#define GUI_WIDGETS_WINDOW_H
#include "enums/simpletypes/modal.h"
-#include "enums/simpletypes/visible.h"
#include "listeners/mouselistener.h"
#include "listeners/widgetlistener.h"