diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-01 21:21:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-01 22:13:44 +0300 |
| commit | 41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6 (patch) | |
| tree | 75a934dd456f4079898b77f17fc2e5da631ba761 /src/gui/windows | |
| parent | 33ef923235aeabd07308816bb07ef790cc6c1024 (diff) | |
| download | manaplus-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.tar.gz manaplus-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.tar.bz2 manaplus-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.tar.xz manaplus-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.zip | |
Fix code style.
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/buydialog.cpp | 1 | ||||
| -rw-r--r-- | src/gui/windows/outfitwindow.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/outfitwindow.h | 1 | ||||
| -rw-r--r-- | src/gui/windows/statuswindow.cpp | 3 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index 02c9b5f2e..ce22252a0 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -51,7 +51,6 @@ #include "resources/iteminfo.h" #include "utils/delete2.h" -#include "utils/gettext.h" #include <algorithm> diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 82ce553f7..09cf1a95c 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -75,7 +75,6 @@ OutfitWindow::OutfitWindow() : mKeyLabel(new Label(this, strprintf(_("Key: %s"), keyName(0).c_str()))), mBorderColor(getThemeColor(Theme::BORDER, 64)), - mBackgroundColor(getThemeColor(Theme::BACKGROUND, 32)), mCurrentOutfit(0), mBoxWidth(33), mBoxHeight(33), @@ -92,6 +91,8 @@ OutfitWindow::OutfitWindow() : setCloseButton(true); setStickyButtonLock(true); + mBackgroundColor = getThemeColor(Theme::BACKGROUND, 32); + setDefaultSize(250, 400, 150, 290); setMinWidth(145); setMinHeight(220); diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h index cf60c32ad..4bfaa3e84 100644 --- a/src/gui/windows/outfitwindow.h +++ b/src/gui/windows/outfitwindow.h @@ -107,7 +107,6 @@ class OutfitWindow final : public Window, Label *mKeyLabel; Color mBorderColor; - Color mBackgroundColor; int mCurrentOutfit; int mBoxWidth; diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 6fa51c568..a49545df3 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -36,8 +36,6 @@ #include "being/localplayer.h" #include "being/playerinfo.h" -#include "gui/viewport.h" - #include "gui/windows/equipmentwindow.h" #include "gui/windows/setupwindow.h" @@ -50,6 +48,7 @@ #include "gui/widgets/scrollarea.h" #include "gui/widgets/statuswindowattrs.h" #include "gui/widgets/vertcontainer.h" +#include "gui/widgets/windowcontainer.h" #include "net/net.h" #include "net/playerhandler.h" |