From f24ddad3fa0f843eb29a281426151cf1a5f31f4b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 4 Sep 2012 23:47:11 +0300
Subject: add const to more classes, fix other small style issues.

---
 src/gui/quitdialog.cpp    | 2 +-
 src/gui/sdlfont.cpp       | 4 ++--
 src/gui/shopwindow.cpp    | 1 -
 src/gui/theme.cpp         | 2 +-
 src/gui/updaterwindow.cpp | 8 ++++----
 src/gui/updaterwindow.h   | 4 ++--
 6 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index c84ddc122..d5a4d8504 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -126,7 +126,7 @@ void QuitDialog::action(const gcn::ActionEvent &event)
     {
         if (viewport)
         {
-            Map *const map = viewport->getCurrentMap();
+            const Map *const map = viewport->getCurrentMap();
             if (map)
                 map->saveExtraLayer();
         }
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index ed3a6b295..2dbf880a5 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -100,7 +100,7 @@ SDLFont::SDLFont(std::string filename, const int size, const int style) :
     mCreateCounter(0),
     mDeleteCounter(0)
 {
-    ResourceManager *const resman = ResourceManager::getInstance();
+    const ResourceManager *const resman = ResourceManager::getInstance();
 
     if (fontCounter == 0 && TTF_Init() == -1)
     {
@@ -151,7 +151,7 @@ SDLFont::~SDLFont()
 
 void SDLFont::loadFont(std::string filename, const int size, const int style)
 {
-    ResourceManager *const resman = ResourceManager::getInstance();
+    const ResourceManager *const resman = ResourceManager::getInstance();
 
     if (fontCounter == 0 && TTF_Init() == -1)
     {
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index a75b8d810..9ebe7a2a5 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -400,7 +400,6 @@ void ShopWindow::saveList()
     std::ofstream shopFile;
     std::string shopListName = Client::getServerConfigDirectory()
         + "/shoplist.txt";
-    std::list<int> procesList;
     std::map<int, ShopItem*> mapItems;
 
     shopFile.open(shopListName.c_str(), std::ios::binary);
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 91a6720e0..679b975e0 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -50,7 +50,7 @@ Theme *Theme::mInstance = nullptr;
 // Set the theme path...
 static void initDefaultThemePath()
 {
-    ResourceManager *const resman = ResourceManager::getInstance();
+    const ResourceManager *const resman = ResourceManager::getInstance();
     defaultThemePath = branding.getStringValue("guiThemePath");
 
     logger->log("defaultThemePath: " + defaultThemePath);
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index 71e2a1022..496e651b3 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -514,7 +514,7 @@ void UpdaterWindow::download()
 
 void UpdaterWindow::loadUpdates()
 {
-    ResourceManager *const resman = ResourceManager::getInstance();
+    const ResourceManager *const resman = ResourceManager::getInstance();
 
     if (mUpdateFiles.empty())
     {   // updates not downloaded
@@ -540,7 +540,7 @@ void UpdaterWindow::loadUpdates()
 
 void UpdaterWindow::loadLocalUpdates(const std::string &dir)
 {
-    ResourceManager *const resman = ResourceManager::getInstance();
+    const ResourceManager *const resman = ResourceManager::getInstance();
 
     std::vector<updateFile> updateFiles
         = loadXMLFile(dir + "/" + xmlUpdateFile);
@@ -564,7 +564,7 @@ void UpdaterWindow::loadLocalUpdates(const std::string &dir)
 }
 
 void UpdaterWindow::loadManaPlusUpdates(const std::string &dir,
-                                        ResourceManager *const resman)
+                                        const ResourceManager *const resman)
 {
     std::string fixPath = dir + "/fix";
     std::vector<updateFile> updateFiles
@@ -584,7 +584,7 @@ void UpdaterWindow::loadManaPlusUpdates(const std::string &dir,
     }
 }
 
-void UpdaterWindow::addUpdateFile(ResourceManager *const resman,
+void UpdaterWindow::addUpdateFile(const ResourceManager *const resman,
                                   const std::string &path,
                                   const std::string &fixPath,
                                   const std::string &file,
diff --git a/src/gui/updaterwindow.h b/src/gui/updaterwindow.h
index 616b0d824..c7534dece 100644
--- a/src/gui/updaterwindow.h
+++ b/src/gui/updaterwindow.h
@@ -119,14 +119,14 @@ class UpdaterWindow : public Window,
 
     static void loadLocalUpdates(const std::string &dir);
 
-    static void addUpdateFile(ResourceManager *const resman,
+    static void addUpdateFile(const ResourceManager *const resman,
                               const std::string &path,
                               const std::string &fixPath,
                               const std::string &file,
                               const bool append);
 
     static void loadManaPlusUpdates(const std::string &dir,
-                                    ResourceManager *const resman);
+                                    const ResourceManager *const resman);
 
     int updateState;
 
-- 
cgit v1.2.3-70-g09d2