From b2ac4def24379db588ffa52ca63676710f18b4fc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 19 Mar 2011 00:27:45 +0200
Subject: Fix code style and add small optimisations.

---
 src/gui/updatewindow.cpp                   | 4 ++--
 src/gui/whoisonline.cpp                    | 2 +-
 src/gui/widgets/emoteshortcutcontainer.cpp | 4 ++--
 src/gui/worldselectdialog.cpp              | 6 +++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 542d665d5..9a2b4d75a 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -450,7 +450,7 @@ void UpdaterWindow::loadUpdates()
     if (mUpdateFiles.empty())
     {   // updates not downloaded
         mUpdateFiles = loadXMLFile(mUpdatesDir + "/" + xmlUpdateFile);
-        if (!mUpdateFiles.size())
+        if (mUpdateFiles.empty())
         {
             logger->log("Warning this server does not have a"
                         " %s file falling back to %s", xmlUpdateFile.c_str(),
@@ -579,7 +579,7 @@ void UpdaterWindow::logic()
                     mUpdateFiles = loadXMLFile(
                         mUpdatesDir + "/" + xmlUpdateFile);
 
-                    if (mUpdateFiles.size() == 0)
+                    if (mUpdateFiles.empty())
                     {
                         logger->log("Warning this server does not have a %s"
                                     " file falling back to %s",
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index f64bf383e..c4d9e92a3 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -480,7 +480,7 @@ void WhoIsOnline::logic()
                 mUpdateButton->setEnabled(true);
                 mUpdateTimer = 0;
                 updateSize();
-                if (mOnlinePlayers.size() > 0 && chatWindow)
+                if (!mOnlinePlayers.empty() && chatWindow)
                     chatWindow->updateOnline(mOnlinePlayers);
             }
             break;
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 683b02fe6..6e15d4bf9 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -131,8 +131,8 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
             mEmoteImg[i]->sprite->draw(g, emoteX + 2, emoteY + 10);
     }
 
-    if (mEmoteMoved && mEmoteMoved < static_cast<unsigned>(mEmoteImg.size()) + 1
-        && mEmoteMoved > 0)
+    if (mEmoteMoved && mEmoteMoved < static_cast<unsigned>(
+        mEmoteImg.size()) + 1 && mEmoteMoved > 0)
     {
         // Draw the emote image being dragged by the cursor.
         const EmoteSprite* sprite = mEmoteImg[mEmoteMoved - 1];
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index 2bb76e306..3a35e3396 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -91,12 +91,16 @@ WorldSelectDialog::WorldSelectDialog(Worlds worlds):
 
     reflowLayout(0, 0);
 
-    if (worlds.size() == 0)
+    if (worlds.empty())
+    {
         // Disable Ok button
         mChooseWorld->setEnabled(false);
+    }
     else
+    {
         // Select first server
         mWorldList->setSelected(0);
+    }
 
     addKeyListener(this);
 
-- 
cgit v1.2.3-60-g2f50