fix compilation warnings.

2 files changed, 4 insertions, 8 deletions

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]);