From de5b0753bd94e014f0e81fc676b21c251aabd326 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 15 Jun 2015 23:21:52 +0300 Subject: Fix code style. --- src/gui/models/playerrelationlistmodel.h | 1 + src/gui/models/playertablemodel.h | 2 ++ src/gui/popups/popupmenu.cpp | 1 + src/gui/widgets/button.cpp | 15 ++++++++++----- src/gui/widgets/tabs/tab.h | 2 +- src/gui/widgets/window.h | 2 +- src/gui/windows/skilldialog.cpp | 1 - src/gui/windows/socialwindow.cpp | 1 - 8 files changed, 16 insertions(+), 9 deletions(-) (limited to 'src/gui') diff --git a/src/gui/models/playerrelationlistmodel.h b/src/gui/models/playerrelationlistmodel.h index 32c29f0d3..f969b8e20 100644 --- a/src/gui/models/playerrelationlistmodel.h +++ b/src/gui/models/playerrelationlistmodel.h @@ -23,6 +23,7 @@ #ifndef GUI_MODELS_PLAYERRELATIONLISTMODEL_H #define GUI_MODELS_PLAYERRELATIONLISTMODEL_H +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/models/listmodel.h" diff --git a/src/gui/models/playertablemodel.h b/src/gui/models/playertablemodel.h index 6525a38b3..de21224b8 100644 --- a/src/gui/models/playertablemodel.h +++ b/src/gui/models/playertablemodel.h @@ -27,6 +27,8 @@ #include "gui/models/tablemodel.h" +#include "being/playerrelation.h" + #include "localconsts.h" class PlayerRelationListModel; diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 3686b29cd..f136e5bd5 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -31,6 +31,7 @@ #include "being/localplayer.h" #include "being/playerinfo.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "input/inputmanager.h" diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 98140e71c..634e47ce2 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -111,7 +111,8 @@ Button::Button(const Widget2 *const widget) : mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -154,7 +155,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -203,7 +205,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -252,7 +255,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -301,7 +305,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h index 69cb7cf95..65ebc57b7 100644 --- a/src/gui/widgets/tabs/tab.h +++ b/src/gui/widgets/tabs/tab.h @@ -122,7 +122,7 @@ class Tab notfinal : public BasicContainer, mTabColor = color1; mTabOutlineColor = color2; mRedraw = true; - } + } /** * Set the highlighted color for the tab's text. diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 84931b88d..e062de671 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -289,7 +289,7 @@ class Window notfinal : public BasicContainer2, void setSaveVisible(const bool save) { mSaveVisible = save; } - virtual void postInit() override + void postInit() override { mInit = true; } /** diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 8b635b869..7f2d81740 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -34,7 +34,6 @@ #include "gui/windows/shortcutwindow.h" #include "gui/widgets/button.h" -#include "gui/widgets/createwidget.h" #include "gui/widgets/label.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/tabbedarea.h" diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 24fd1434c..f9827c35a 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -25,7 +25,6 @@ #include "gui/windows/setupwindow.h" #include "gui/widgets/button.h" -#include "gui/widgets/createwidget.h" #include "gui/widgets/label.h" #include "gui/widgets/tabbedarea.h" -- cgit v1.2.3-70-g09d2