Some cleanup and compile fix

Reviewed-by: Thorbjørn Lindeijer

3 files changed, 17 insertions, 20 deletions

diff --git a/mana.files b/mana.files
index 8cba046c..ff28a90d 100644
--- a/mana.files
+++ b/mana.files
@@ -1,6 +1,5 @@
 ./CMakeLists.txt
 ./config.h
-./data/branding.xml
 ./data/CMakeLists.txt
 ./data/fonts/CMakeLists.txt
 ./data/fonts/Makefile.am
@@ -51,6 +50,8 @@
 ./src/channel.h
 ./src/channelmanager.cpp
 ./src/channelmanager.h
+./src/client.cpp
+./src/client.h
 ./src/CMakeLists.txt
 ./src/commandhandler.cpp
 ./src/commandhandler.h
@@ -101,8 +102,6 @@
 ./src/gui/focushandler.h
 ./src/gui/gui.cpp
 ./src/gui/gui.h
-./src/gui/guildwindow.cpp
-./src/gui/guildwindow.h
 ./src/gui/help.cpp
 ./src/gui/help.h
 ./src/gui/inventorywindow.cpp
@@ -207,8 +206,6 @@
 ./src/gui/widgets/emoteshortcutcontainer.h
 ./src/gui/widgets/flowcontainer.cpp
 ./src/gui/widgets/flowcontainer.h
-./src/gui/widgets/guildlistbox.cpp
-./src/gui/widgets/guildlistbox.h
 ./src/gui/widgets/icon.cpp
 ./src/gui/widgets/icon.h
 ./src/gui/widgets/inttextfield.cpp
@@ -284,8 +281,6 @@
 ./src/imageparticle.h
 ./src/inventory.cpp
 ./src/inventory.h
-./src/client.cpp
-./src/client.h
 ./src/item.cpp
 ./src/item.h
 ./src/itemshortcut.cpp
@@ -325,10 +320,10 @@
 ./src/net/ea/gamehandler.h
 ./src/net/ea/generalhandler.cpp
 ./src/net/ea/generalhandler.h
-./src/net/ea/guildhandler.cpp
-./src/net/ea/guildhandler.h
 ./src/net/ea/gui/guildtab.cpp
 ./src/net/ea/gui/guildtab.h
+./src/net/ea/guildhandler.cpp
+./src/net/ea/guildhandler.h
 ./src/net/ea/gui/partytab.cpp
 ./src/net/ea/gui/partytab.h
 ./src/net/ea/inventoryhandler.cpp
@@ -524,6 +519,8 @@
 ./src/utils/mutex.h
 ./src/utils/sha256.cpp
 ./src/utils/sha256.h
+./src/utils/specialfolder.cpp
+./src/utils/specialfolder.h
 ./src/utils/stringutils.cpp
 ./src/utils/stringutils.h
 ./src/utils/xml.cpp
diff --git a/src/client.cpp b/src/client.cpp
index c4a4dd63..8005a3ff 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -214,7 +214,7 @@ Client::Client(const Options &options):
         branding.init(options.brandingPath);
     }
 
-    initHomeDir(options);
+    initHomeDir();
 
     // Configure logger
     logger->setLogFile(mLocalDataDir + std::string("/mana.log"));
@@ -222,8 +222,8 @@ Client::Client(const Options &options):
     // Log the mana version
     logger->log("Mana %s", FULL_VERSION);
 
-    initConfiguration(options);
-    initScreenshotDir(options.screenshotDir);
+    initConfiguration();
+    initScreenshotDir();
 
     logger->setLogToStandardOut(config.getValue("logToStandardOut", 0));
 
@@ -959,9 +959,9 @@ void Client::action(const gcn::ActionEvent &event)
  * Initializes the home directory. On UNIX and FreeBSD, ~/.mana is used. On
  * Windows and other systems we use the current working directory.
  */
-void Client::initHomeDir(const Options &options)
+void Client::initHomeDir()
 {
-    mLocalDataDir = options.localDataDir;
+    mLocalDataDir = mOptions.localDataDir;
 
     if (mLocalDataDir.empty())
     {
@@ -987,7 +987,7 @@ void Client::initHomeDir(const Options &options)
                                   "Exiting."), mLocalDataDir.c_str()));
     }
 
-    mConfigDir = options.configDir;
+    mConfigDir = mOptions.configDir;
 
     if (mConfigDir.empty()){
 #ifdef __APPLE__
@@ -1147,10 +1147,10 @@ void Client::initUpdatesDir()
     }
 }
 
-void Client::initScreenshotDir(const std::string &dir)
+void Client::initScreenshotDir()
 {
-    if (!dir.empty())
-        mScreenshotDir = dir;
+    if (!mOptions.screenshotDir.empty())
+        mScreenshotDir = mOptions.screenshotDir;
     else
     {
         std::string configScreenshotDir =
diff --git a/src/client.h b/src/client.h
index db9ed3a9..934ba9d2 100644
--- a/src/client.h
+++ b/src/client.h
@@ -178,10 +178,10 @@ public:
     void action(const gcn::ActionEvent &event);
 
 private:
-    void initHomeDir(const Options &options);
+    void initHomeDir();
     void initConfiguration();
     void initUpdatesDir();
-    void initScreenshotDir(const std::string &dir);
+    void initScreenshotDir();
 
     void accountLogin(LoginData *loginData);