diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-07-08 02:19:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-07-08 02:19:52 +0300 |
| commit | 27c3646d10e0c5d25905d7afc7a43289159f711b (patch) | |
| tree | 90257515af3615f169252161fc62b8d571076936 /src/gui | |
| parent | 5e14ab971129eb95ca02e373fc21adb46c0eaca1 (diff) | |
| download | manaplus-27c3646d10e0c5d25905d7afc7a43289159f711b.tar.gz manaplus-27c3646d10e0c5d25905d7afc7a43289159f711b.tar.bz2 manaplus-27c3646d10e0c5d25905d7afc7a43289159f711b.tar.xz manaplus-27c3646d10e0c5d25905d7afc7a43289159f711b.zip | |
Fix some issues after automatic checking.
Change compilation flags in make scripts.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/setup_video.cpp | 3 | ||||
| -rw-r--r-- | src/gui/shopwindow.h | 2 | ||||
| -rw-r--r-- | src/gui/tradewindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/updatewindow.cpp | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 8afb0ae69..d3ee64f3a 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -302,7 +302,8 @@ Setup_Video::Setup_Video(): mPickupParticleCheckBox(new CheckBox(_("as particle"), mPickupParticleEnabled)), mAlphaCacheCheckBox(new CheckBox(_("Enable opacity cache"), mAlphaCache)), - mEnableMapReduceCheckBox(new CheckBox(_("Enable map reduce"), mEnableMapReduce)), + mEnableMapReduceCheckBox(new CheckBox(_("Enable map reduce"), + mEnableMapReduce)), mShowBackgroundCheckBox(new CheckBox(_("Show background"), mShowBackground)), mSpeechSlider(new Slider(0, 3)), diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h index bad4a0a4e..e07803225 100644 --- a/src/gui/shopwindow.h +++ b/src/gui/shopwindow.h @@ -95,7 +95,7 @@ class ShopWindow : public Window, public gcn::ActionListener, * Returns true if any instances exist. */ static bool isActive() - { return instances.size() > 0; } + { return !instances.empty(); } void setItemSelected(int id) { mSelectedItem = id; updateButtonsAndLabels(); } diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index e3fb323e6..c607636d9 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -85,10 +85,6 @@ TradeWindow::TradeWindow(): if (setupWindow) setupWindow->registerWindowForReset(this); - std::string longestName = getFont()->getWidth(_("OK")) > - getFont()->getWidth(_("Trade")) ? - _("OK") : _("Trade"); - mAddButton = new Button(_("Add"), "add", this); mOkButton = new Button("", "", this); // Will be filled in later diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 42ed1c289..d17defb45 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -537,8 +537,6 @@ void UpdaterWindow::logic() } } - std::string filename = mUpdatesDir + "/" + mCurrentFile; - switch (mDownloadStatus) { case UPDATE_ERROR: |