From 79114bbfe4bddf95345c33505a750f3aa80f1c56 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 16 Dec 2013 20:24:01 +0300
Subject: fix compilation warnings.

---
 src/being/being.cpp               | 1 -
 src/gui/popups/speechbubble.cpp   | 8 ++------
 src/gui/windows/updaterwindow.cpp | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/being/being.cpp b/src/being/being.cpp
index 98b83bcf7..34f6b64ce 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2843,7 +2843,6 @@ std::string Being::loadComment(const std::string &name, const int type)
 
     str.append(stringToHexPath(name)).append("/comment.txt");
     logger->log("load from: %s", str.c_str());
-    StringVect lines;
 
     const ResourceManager *const resman = ResourceManager::getInstance();
     if (resman->existsLocal(str))
diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp
index 7febfdf4c..0c40676f6 100644
--- a/src/gui/popups/speechbubble.cpp
+++ b/src/gui/popups/speechbubble.cpp
@@ -74,22 +74,18 @@ void SpeechBubble::setText(const std::string &text, const bool showName)
     mSpeechBox->setForegroundColorAll(getThemeColor(Theme::BUBBLE_TEXT),
         getThemeColor(Theme::BUBBLE_TEXT_OUTLINE));
 
-    const int pad = mPadding;
     int width = mCaption->getWidth();
     mSpeechBox->clearRows();
     mSpeechBox->addRow(text);
     mSpeechBox->setWidth(mSpeechBox->getDataWidth());
-    const int speechWidth = mSpeechBox->getWidth();
 
-    const int fontHeight = getFont()->getHeight();
+    const int speechWidth = mSpeechBox->getWidth();
     const int nameHeight = showName ? mCaption->getHeight() + mSpacing : 0;
-    int height = fontHeight + nameHeight;
 
     if (width < speechWidth)
         width = speechWidth;
 
-    setContentSize(width, height);
-
+    setContentSize(width, getFont()->getHeight() + nameHeight);
     mCaption->setPosition(0, 0);
     mSpeechBox->setPosition(0, nameHeight);
 }
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 36cdba6dd..f185c1ed5 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -970,8 +970,8 @@ void UpdaterWindow::loadFile(std::string file)
     trim(file);
 
     StringVect lines;
-    ResourceManager::getInstance()->loadTextFileLocal(
-        mUpdatesDir + "/local/help/news.txt", lines);
+    const ResourceManager *const resman = ResourceManager::getInstance();
+    resman->loadTextFileLocal(mUpdatesDir + "/local/help/news.txt", lines);
 
     for (size_t i = 0, sz = lines.size(); i < sz; ++i)
         mBrowserBox->addRow(lines[i]);
-- 
cgit v1.2.3-70-g09d2