summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-01-15 01:07:47 +0200
committerAndrei Karas <akaras@inbox.ru>2011-01-15 02:05:50 +0200
commite2150d04662a4ba8b5304dabcc74be0bacded5b7 (patch)
treecbeb05c2f056a7d5ac4a08e7b80799b5cfd4785b /src/gui
parentedda37acb9d66f2751ef712c83dced62428fa685 (diff)
downloadmv-e2150d04662a4ba8b5304dabcc74be0bacded5b7.tar.gz
mv-e2150d04662a4ba8b5304dabcc74be0bacded5b7.tar.bz2
mv-e2150d04662a4ba8b5304dabcc74be0bacded5b7.tar.xz
mv-e2150d04662a4ba8b5304dabcc74be0bacded5b7.zip
Fix code style, apply some fixes after checking with cppcheck from git.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/botcheckerwindow.cpp6
-rw-r--r--src/gui/buy.cpp2
-rw-r--r--src/gui/buysell.cpp2
-rw-r--r--src/gui/chat.cpp4
-rw-r--r--src/gui/gui.cpp8
-rw-r--r--src/gui/minimap.cpp2
-rw-r--r--src/gui/npcdialog.cpp6
-rw-r--r--src/gui/npcpostdialog.cpp2
-rw-r--r--src/gui/palette.cpp2
-rw-r--r--src/gui/popupmenu.cpp2
-rw-r--r--src/gui/quitdialog.cpp2
-rw-r--r--src/gui/sell.cpp2
-rw-r--r--src/gui/serverdialog.cpp3
-rw-r--r--src/gui/setup.cpp4
-rw-r--r--src/gui/setup_chat.cpp3
-rw-r--r--src/gui/setup_other.cpp6
-rw-r--r--src/gui/setup_other.h9
-rw-r--r--src/gui/shopwindow.cpp12
-rw-r--r--src/gui/skilldialog.cpp4
-rw-r--r--src/gui/socialwindow.cpp2
-rw-r--r--src/gui/specialswindow.cpp4
-rw-r--r--src/gui/statuswindow.cpp4
-rw-r--r--src/gui/truetypefont.cpp4
-rw-r--r--src/gui/viewport.cpp2
-rw-r--r--src/gui/widgets/browserbox.cpp6
-rw-r--r--src/gui/widgets/flowcontainer.cpp2
-rw-r--r--src/gui/widgets/itemcontainer.cpp5
-rw-r--r--src/gui/widgets/shortcutcontainer.cpp8
-rw-r--r--src/gui/widgets/shortcutcontainer.h1
-rw-r--r--src/gui/widgets/tabbedarea.cpp4
-rw-r--r--src/gui/widgets/tablemodel.cpp4
-rw-r--r--src/gui/widgets/textfield.cpp4
-rw-r--r--src/gui/widgets/textpreview.cpp4
33 files changed, 69 insertions, 66 deletions
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index f7bd7d060..bd721e8aa 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -106,7 +106,7 @@ public:
std::set<ActorSprite*> beings = actorSpriteManager->getAll();
ActorSprites::iterator i = beings.begin();
for (ActorSprites::const_iterator i = beings.begin();
- i != beings.end(); i++)
+ i != beings.end(); ++i)
{
Being *being = dynamic_cast<Being*>(*i);
@@ -246,7 +246,7 @@ public:
virtual void freeWidgets()
{
for (std::vector<gcn::Widget *>::const_iterator it = mWidgets.begin();
- it != mWidgets.end(); it++)
+ it != mWidgets.end(); ++it)
{
delete *it;
}
@@ -393,7 +393,7 @@ void BotCheckerWindow::reset()
std::set<ActorSprite*> beings = actorSpriteManager->getAll();
ActorSprites::iterator i = beings.begin();
for (ActorSprites::const_iterator i = beings.begin();
- i != beings.end(); i++)
+ i != beings.end(); ++i)
{
Being *being = dynamic_cast<Being*>(*i);
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 2be6c65a4..85f1b727c 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -315,7 +315,7 @@ void BuyDialog::closeAll()
DialogList::iterator it = instances.begin();
DialogList::iterator it_end = instances.end();
- for (; it != it_end; it++)
+ for (; it != it_end; ++it)
{
if (*it)
(*it)->close();
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index f6a1fc193..083a976c2 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -129,7 +129,7 @@ void BuySellDialog::closeAll()
DialogList::iterator it = instances.begin();
DialogList::iterator it_end = instances.end();
- for (; it != it_end; it++)
+ for (; it != it_end; ++it)
{
if (*it)
(*it)->close();
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index ca0f11551..0422570d7 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -540,7 +540,7 @@ void ChatWindow::doPresent()
int playercount = 0;
for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end();
- it != it_end; it++)
+ it != it_end; ++it)
{
if ((*it)->getType() == ActorSprite::PLAYER)
{
@@ -654,7 +654,7 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
mCurHist != mHistory.begin() && !mHistory.empty())
{
// Move backward through the history
- mCurHist--;
+ --mCurHist;
mChatInput->setText(*mCurHist);
mChatInput->setCaretPosition(static_cast<unsigned>(
mChatInput->getText().length()));
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 57a94b3d1..054e17584 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -113,7 +113,7 @@ Gui::Gui(Graphics *graphics):
{
mGuiFont = new TrueTypeFont(fontFile, fontSize);
}
- catch (gcn::Exception e)
+ catch (const gcn::Exception &e)
{
logger->error(std::string("Unable to load '") + fontFile +
std::string("': ") + e.getMessage());
@@ -129,7 +129,7 @@ Gui::Gui(Graphics *graphics):
mInfoParticleFont = new TrueTypeFont(
fontFile, fontSize, TTF_STYLE_BOLD);
}
- catch (gcn::Exception e)
+ catch (const gcn::Exception &e)
{
logger->error(std::string("Unable to load '") + fontFile +
std::string("': ") + e.getMessage());
@@ -144,7 +144,7 @@ Gui::Gui(Graphics *graphics):
{
boldFont = new TrueTypeFont(fontFile, fontSize);
}
- catch (gcn::Exception e)
+ catch (const gcn::Exception &e)
{
logger->error(std::string("Unable to load '") + fontFile +
std::string("': ") + e.getMessage());
@@ -159,7 +159,7 @@ Gui::Gui(Graphics *graphics):
{
mHelpFont = new TrueTypeFont(fontFile, fontSize);
}
- catch (gcn::Exception e)
+ catch (const gcn::Exception &e)
{
logger->error(std::string("Unable to load '") + fontFile +
std::string("': ") + e.getMessage());
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 6edefcfdd..798318c99 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -198,7 +198,7 @@ void Minimap::draw(gcn::Graphics *graphics)
const ActorSprites &actors = actorSpriteManager->getAll();
for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end();
- it != it_end; it++)
+ it != it_end; ++it)
{
if (!(*it) || (*it)->getType() == ActorSprite::FLOOR_ITEM)
continue;
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 6414da6ed..3af0594f6 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -335,7 +335,7 @@ bool NpcDialog::isAnyInputFocused()
DialogList::iterator it = instances.begin();
DialogList::iterator it_end = instances.end();
- for (; it != it_end; it++)
+ for (; it != it_end; ++it)
{
if ((*it)->isInputFocused())
return true;
@@ -403,7 +403,7 @@ NpcDialog *NpcDialog::getActive()
DialogList::iterator it = instances.begin();
DialogList::iterator it_end = instances.end();
- for (; it != it_end; it++)
+ for (; it != it_end; ++it)
{
if ((*it)->isFocused())
return (*it);
@@ -417,7 +417,7 @@ void NpcDialog::closeAll()
DialogList::iterator it = instances.begin();
DialogList::iterator it_end = instances.end();
- for (; it != it_end; it++)
+ for (; it != it_end; ++it)
(*it)->close();
}
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index 00bf55028..682a287a4 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.cpp
@@ -123,6 +123,6 @@ void NpcPostDialog::closeAll()
DialogList::iterator it = instances.begin();
DialogList::iterator it_end = instances.end();
- for (; it != it_end; it++)
+ for (; it != it_end; ++it)
(*it)->close();
} \ No newline at end of file
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 72c490912..d80bea11f 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -80,7 +80,7 @@ void Palette::advanceGradients()
Palettes::iterator it = mInstances.begin();
Palettes::iterator it_end = mInstances.end();
- for (; it != it_end; it++)
+ for (; it != it_end; ++it)
(*it)->advanceGradient();
}
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 662b184b9..1a164687c 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -260,7 +260,7 @@ void PopupMenu::showPopup(int x, int y, std::list<Being*> &beings)
mBrowserBox->clearRows();
mBrowserBox->addRow("Players");
std::list<Being*>::iterator it, it_end;
- for (it = beings.begin(), it_end = beings.end(); it != it_end; it++)
+ for (it = beings.begin(), it_end = beings.end(); it != it_end; ++it)
{
Being *being = *it;
if (!being->getName().empty())
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 7b587dccc..2166902f6 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -179,7 +179,7 @@ void QuitDialog::keyPressed(gcn::KeyEvent &keyEvent)
{
std::vector<gcn::RadioButton*>::iterator it = mOptions.begin();
- for (; it < mOptions.end(); it++)
+ for (; it < mOptions.end(); ++it)
{
if ((*it)->isSelected())
break;
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 85577b245..1b149cd48 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -328,6 +328,6 @@ void SellDialog::closeAll()
DialogList::iterator it = instances.begin();
DialogList::iterator it_end = instances.end();
- for (; it != it_end; it++)
+ for (; it != it_end; ++it)
(*it)->close();
}
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 3556efc35..b31bc7ba8 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -395,7 +395,8 @@ void ServerDialog::action(const gcn::ActionEvent &event)
LoginDialog::savedPassword = "";
}
- config.setValue("usePersistentIP", mPersistentIPCheckBox->isSelected());
+ config.setValue("usePersistentIP",
+ mPersistentIPCheckBox->isSelected());
Client::setState(STATE_CONNECT_SERVER);
}
}
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 8206b0e7e..f2eff51b0 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -149,7 +149,7 @@ void Setup::action(const gcn::ActionEvent &event)
return;
for (std::list<Window*>::iterator it = mWindowsToReset.begin();
- it != mWindowsToReset.end(); it++)
+ it != mWindowsToReset.end(); ++it)
{
(*it)->resetToDefaultSize();
}
@@ -164,7 +164,7 @@ void Setup::setInGame(bool inGame)
void Setup::externalUpdate()
{
for (std::list<SetupTab*>::iterator it = mTabs.begin();
- it != mTabs.end(); it++)
+ it != mTabs.end(); ++it)
{
(*it)->externalUpdated();
}
diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp
index 1dba2ed85..08c76685a 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/setup_chat.cpp
@@ -55,7 +55,8 @@
#define ACTION_ENABLE_BATTLE_TAB "show battle tab"
#define ACTION_SHOW_BATTLE_EVENTS "show battle events"
-Setup_Chat::Setup_Chat()
+Setup_Chat::Setup_Chat() :
+ mEditDialog(0)
{
setName(_("Chat"));
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index 5a2b77a81..41a6c41ab 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -36,7 +36,6 @@
#include "utils/gettext.h"
#define ACTION_SHOW_TAKEDDAMAGE "taked damage"
-#define ACTION_NO_RAIN "no rain"
#define ACTION_ONLY_REACHABLE "only reachable"
#define ACTION_ERRORS_IN_DEBUG "errors in debug"
#define ACTION_HIGHLIGHT_PORTALS "highlight portals"
@@ -68,7 +67,6 @@
Setup_Other::Setup_Other():
mShowMonstersTakedDamage(config.getBoolValue("showMonstersTakedDamage")),
mTargetOnlyReachable(config.getBoolValue("targetOnlyReachable")),
- mErrorsInDebug(config.getBoolValue("errorsInDebug")),
mHighlightPortals(config.getBoolValue("highlightMapPortals")),
mHighlightAttackRange(config.getBoolValue("highlightAttackRange")),
mHighlightMonsterAttackRange(
@@ -89,7 +87,8 @@ Setup_Other::Setup_Other():
mWarpParticle(config.getBoolValue("warpParticle")),
mAutoShop(config.getBoolValue("autoShop")),
mShowMobHP(config.getBoolValue("showMobHP")),
- mShowOwnHP(config.getBoolValue("showOwnHP"))
+ mShowOwnHP(config.getBoolValue("showOwnHP")),
+ mEditDialog(0)
{
setName(_("Misc"));
@@ -409,7 +408,6 @@ void Setup_Other::apply()
{
config.setValue("showMonstersTakedDamage", mShowMonstersTakedDamage);
config.setValue("targetOnlyReachable", mTargetOnlyReachable);
- config.setValue("errorsInDebug", mErrorsInDebug);
config.setValue("highlightMapPortals", mHighlightPortals);
config.setValue("highlightAttackRange", mHighlightAttackRange);
config.setValue("highlightMonsterAttackRange",
diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h
index 6a092e93f..4f2930fd3 100644
--- a/src/gui/setup_other.h
+++ b/src/gui/setup_other.h
@@ -47,18 +47,9 @@ class Setup_Other : public SetupTab, public gcn::ActionListener
gcn::CheckBox *mShowMonstersTakedDamageCheckBox;
bool mShowMonstersTakedDamage;
- gcn::CheckBox *mNoRainCheckBox;
- bool mNoRain;
-
gcn::CheckBox *mTargetOnlyReachableCheckBox;
bool mTargetOnlyReachable;
- int mOverlayDetail;
- gcn::DropDown *mFontSizeDropDown;
-
- gcn::CheckBox *mErrorsInDebugCheckBox;
- bool mErrorsInDebug;
-
gcn::CheckBox *mHighlightPortalsCheckBox;
bool mHighlightPortals;
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 410e79dbb..e670e9d15 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -359,7 +359,7 @@ void ShopWindow::saveList()
std::vector<ShopItem*> items = mBuyShopItems->items();
std::vector<ShopItem*>::iterator it;
- for (it = items.begin(); it != items.end(); it++)
+ for (it = items.begin(); it != items.end(); ++it)
{
ShopItem *item = *(it);
if (item)
@@ -367,7 +367,7 @@ void ShopWindow::saveList()
}
items = mSellShopItems->items();
- for (it = items.begin(); it != items.end(); it++)
+ for (it = items.begin(); it != items.end(); ++it)
{
ShopItem *sellItem = *(it);
ShopItem *buyItem = mapItems[sellItem->getId()];
@@ -392,7 +392,7 @@ void ShopWindow::saveList()
}
std::map<int, ShopItem*>::iterator mapIt;
- for (mapIt = mapItems.begin(); mapIt != mapItems.end(); mapIt++)
+ for (mapIt = mapItems.begin(); mapIt != mapItems.end(); ++mapIt)
{
ShopItem *buyItem = (*mapIt).second;
if (buyItem)
@@ -433,7 +433,7 @@ void ShopWindow::announce(ShopItems *list, int mode)
std::vector<ShopItem*> items = list->items();
std::vector<ShopItem*>::iterator it;
- for (it = items.begin(); it != items.end(); it++)
+ for (it = items.begin(); it != items.end(); ++it)
{
ShopItem *item = *(it);
if (item->getQuantity() > 1)
@@ -499,7 +499,7 @@ void ShopWindow::giveList(const std::string &nick, int mode)
std::vector<ShopItem*> items = list->items();
std::vector<ShopItem*>::iterator it;
- for (it = items.begin(); it != items.end(); it++)
+ for (it = items.begin(); it != items.end(); ++it)
{
ShopItem *item = *(it);
if (!item)
@@ -752,7 +752,7 @@ bool ShopWindow::findShopItem(ShopItem *shopItem, int mode)
items = mBuyShopItems->items();
}
- for (it = items.begin(); it != items.end(); it++)
+ for (it = items.begin(); it != items.end(); ++it)
{
ShopItem *item = *(it);
if (!item)
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 04222d6f5..fa4d5bdb2 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -291,7 +291,7 @@ void SkillDialog::update()
PlayerInfo::getAttribute(SKILL_POINTS)));
mPointsLabel->adjustSize();
- for (SkillMap::iterator it = mSkills.begin(); it != mSkills.end(); it++)
+ for (SkillMap::iterator it = mSkills.begin(); it != mSkills.end(); ++it)
{
if ((*it).second && (*it).second->modifiable)
(*it).second->update();
@@ -435,7 +435,7 @@ void SkillModel::updateVisibilities()
{
mVisibleSkills.clear();
- for (SkillList::iterator it = mSkills.begin(); it != mSkills.end(); it++)
+ for (SkillList::iterator it = mSkills.begin(); it != mSkills.end(); ++it)
{
if ((*it)->visible)
mVisibleSkills.push_back((*it));
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 7e86e4d9c..97ebcd3b4 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -597,7 +597,7 @@ public:
}
}
- i++;
+ ++i;
idx ++;
}
if (socialWindow)
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index bd968191d..baa84a147 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -134,7 +134,7 @@ void SpecialsWindow::draw(gcn::Graphics *graphics)
// which match mEntries
for (std::map<int, Special>::iterator i = specialData.begin();
- i != specialData.end(); i++)
+ i != specialData.end(); ++i)
{
std::map<int, SpecialEntry *>::iterator e = mEntries.find(i->first);
if (e == mEntries.end())
@@ -167,7 +167,7 @@ void SpecialsWindow::rebuild(const std::map<int, Special> &specialData)
for (std::map<int, Special>::const_iterator i = specialData.begin();
i != specialData.end();
- i++)
+ ++i)
{
logger->log("Updating special GUI for %d", i->first);
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 349893bfa..02436c179 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -287,7 +287,7 @@ void StatusWindow::event(Channels channel _UNUSED_,
mCharacterPointsLabel->adjustSize();
// Update all attributes
for (Attrs::iterator it = mAttrs.begin();
- it != mAttrs.end(); it++)
+ it != mAttrs.end(); ++it)
{
if (it->second)
it->second->update();
@@ -300,7 +300,7 @@ void StatusWindow::event(Channels channel _UNUSED_,
mCorrectionPointsLabel->adjustSize();
// Update all attributes
for (Attrs::iterator it = mAttrs.begin();
- it != mAttrs.end(); it++)
+ it != mAttrs.end(); ++it)
{
if (it->second)
it->second->update();
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 8e77c1ded..f3ee600d5 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -107,7 +107,7 @@ TrueTypeFont::TrueTypeFont(const std::string &filename, int size, int style) :
if (!fontCounter)
{
strBuf = new char[65535];
- memset(strBuf, 65535, 0);
+ memset(strBuf, 0, 65535);
}
++fontCounter;
@@ -280,7 +280,7 @@ int TrueTypeFont::getWidth(const std::string &text) const
int cnt = 0;
#endif
- for (CacheIterator i = cache->begin(); i != cache->end(); i++)
+ for (CacheIterator i = cache->begin(); i != cache->end(); ++i)
{
if (i->text == text)
{
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index e2bab0621..9458ea911 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -230,7 +230,7 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
// Draw player names, speech, and emotion sprite as needed
const ActorSprites &actors = actorSpriteManager->getAll();
for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end();
- it != it_end; it++)
+ it != it_end; ++it)
{
if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
continue;
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index acb182c3c..3e3b9f07f 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -178,7 +178,7 @@ void BrowserBox::addRow(const std::string &row, bool atTop)
int hyphenWidth = font->getWidth(hyphen);
int x = 0;
- for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); i++)
+ for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); ++i)
{
std::string row = *i;
for (unsigned int j = 0; j < row.size(); j++)
@@ -316,7 +316,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
for (LinePartIterator i = mLineParts.begin();
i != mLineParts.end();
- i ++)
+ ++i)
{
const LinePart &part = *i;
if (part.mY + 50 < mYStart)
@@ -347,7 +347,7 @@ int BrowserBox::calcHeight()
mLineParts.clear();
- for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); i++)
+ for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); ++i)
{
const std::string row = *(i);
bool wrapped = false;
diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp
index a93818abc..2154c0958 100644
--- a/src/gui/widgets/flowcontainer.cpp
+++ b/src/gui/widgets/flowcontainer.cpp
@@ -65,7 +65,7 @@ void FlowContainer::widgetResized(const gcn::Event &event _UNUSED_)
int i = 0;
height = 0;
for (WidgetList::iterator it = mWidgets.begin();
- it != mWidgets.end(); it++)
+ it != mWidgets.end(); ++it)
{
int x = i % mGridWidth * mBoxWidth;
(*it)->setPosition(x, height);
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index f4e2792ef..d85f57542 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -484,8 +484,11 @@ void ItemContainer::updateMatrix()
}
}
- for (int idx = j * mGridColumns + i; idx < mGridRows * mGridColumns; idx ++)
+ for (int idx = j * mGridColumns + i;
+ idx < mGridRows * mGridColumns; idx ++)
+ {
mShowMatrix[idx] = -1;
+ }
for (unsigned idx = 0; idx < sortedItems.size(); idx ++)
delete sortedItems[idx];
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 167296410..8ce252150 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -31,7 +31,13 @@ float ShortcutContainer::mAlpha = 1.0;
ShortcutContainer::ShortcutContainer():
mGridWidth(1),
- mGridHeight(1)
+ mGridHeight(1),
+ mBackgroundImg(0),
+ mMaxItems(0),
+ mBoxWidth(1),
+ mBoxHeight(1),
+ mCursorPosX(0),
+ mCursorPosY(0)
{
}
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 85d08d0b4..11008b4ce 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -102,7 +102,6 @@ class ShortcutContainer : public gcn::Widget,
int getIndexFromGrid(int pointX, int pointY) const;
Image *mBackgroundImg;
-
static float mAlpha;
unsigned mMaxItems;
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 232664860..7061f54d6 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -121,7 +121,7 @@ void TabbedArea::removeTab(Tab *tab)
}
TabContainer::iterator iter;
- for (iter = mTabs.begin(); iter != mTabs.end(); iter++)
+ for (iter = mTabs.begin(); iter != mTabs.end(); ++iter)
{
if (iter->first == tab)
{
@@ -132,7 +132,7 @@ void TabbedArea::removeTab(Tab *tab)
}
std::vector<gcn::Tab*>::iterator iter2;
- for (iter2 = mTabsToDelete.begin(); iter2 != mTabsToDelete.end(); iter2++)
+ for (iter2 = mTabsToDelete.begin(); iter2 != mTabsToDelete.end(); ++iter2)
{
if (*iter2 == tab)
{
diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp
index f1d583ef6..1b5ec5923 100644
--- a/src/gui/widgets/tablemodel.cpp
+++ b/src/gui/widgets/tablemodel.cpp
@@ -40,7 +40,7 @@ void TableModel::removeListener(TableModelListener *listener)
void TableModel::signalBeforeUpdate()
{
for (std::set<TableModelListener *>::const_iterator it = listeners.begin();
- it != listeners.end(); it++)
+ it != listeners.end(); ++it)
{
(*it)->modelUpdated(false);
}
@@ -49,7 +49,7 @@ void TableModel::signalBeforeUpdate()
void TableModel::signalAfterUpdate()
{
for (std::set<TableModelListener *>::const_iterator it = listeners.begin();
- it != listeners.end(); it++)
+ it != listeners.end(); ++it)
{
if (*it)
(*it)->modelUpdated(true);
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 9a5b2de33..e7c181de2 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -46,7 +46,9 @@ ImageRect TextField::skin;
TextField::TextField(const std::string &text, bool loseFocusOnTab,
gcn::ActionListener* listener, std::string eventId):
gcn::TextField(text),
- mNumeric(false)
+ mNumeric(false),
+ mMinimum(0),
+ mMaximum(0)
{
setFrameSize(2);
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index bd38d8a80..cf52c30ec 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -34,7 +34,9 @@
float TextPreview::mAlpha = 1.0;
TextPreview::TextPreview(const std::string &text):
- mText(text)
+ mText(text),
+ mShadow(false),
+ mOutline(false)
{
mTextAlpha = false;
mFont = gui->getFont();