- spaces are now stripped when options are being read (relaxed syntax in tmw.ini)

- sorry for the "blah" in login.cpp
-

2 files changed, 30 insertions, 3 deletions

diff --git a/src/configuration.cpp b/src/configuration.cpp
index 06296bf1..599cc3f5 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -25,20 +25,34 @@
 /**
     \brief read INI file and parse all options into memory
     \param filename full path to INI file (~/.manaworld/tmw.ini)
+
+    NOTE:
+        first a line is checked wether it is a comment or not by
+        looking for INI_COMMENTER. after this another check is
+        done for INI_DELIMITER if the previous check failed.
+        if this line is a valid option all spaces in it get
+        stripped away (including the value) and it is added to
+        the list iniOptions.
 */
 void Configuration::init(std::string filename) {
     std::ifstream inFile(filename.c_str(), std::ifstream::in);
     std::string inBuffer;
-    int position;
+    unsigned int position;
     INI_OPTION optionTmp;
 
+    iniOptions.clear();
+
     while (inFile.good()) {
         getline(inFile, inBuffer, '\n');
 
         if(inBuffer.substr(0,1) != INI_COMMENTER) {
             position = inBuffer.find(INI_DELIMITER, 0);
 
-            if(position > 0 && position >= -1) {
+            if(position != std::string::npos) {
+                // replace spaces with void :)
+                while(inBuffer.find(" ", 0) != std::string::npos) {
+                    inBuffer.replace(inBuffer.find(" ", 0), 1, "");
+                }
                 optionTmp.key = inBuffer.substr(0, position);
                 optionTmp.stringValue  = inBuffer.substr(position+1, inBuffer.length());
                 inBuffer = inBuffer.substr(position+1, inBuffer.length());
@@ -59,6 +73,10 @@ void Configuration::init(std::string filename) {
     #endif
 }
 
+/**
+    \brief write the current settings back to an ini-file
+    \param filename full path to INI file (~/.manaworld/tmw.ini)
+*/
 bool Configuration::write(std::string filename) {
     std::ofstream out(filename.c_str(), std::ofstream::out | std::ofstream::trunc);
     char tmp[20];
@@ -84,6 +102,11 @@ bool Configuration::write(std::string filename) {
     return true;
 }
 
+/**
+    \brief set an option using a string value
+    \param key option identifier
+    \param value value
+*/
 void Configuration::setValue(std::string key, std::string value) {
     INI_OPTION optionTmp;
     if(getValue(key, "") == "") {
@@ -108,6 +131,11 @@ void Configuration::setValue(std::string key, std::string value) {
     }
 }
 
+/**
+    \brief set an option using a numeric value
+    \param key option identifier
+    \param value value
+*/
 void Configuration::setValue(std::string key, float value) {
     INI_OPTION optionTmp;
     if(getValue(key, 0) == 0) {
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 1645a329..ddcb73cf 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -103,7 +103,6 @@ void LoginDialog::action(const std::string& eventId)
         // Store config settings
         config.setValue("remember", keepCheck->isMarked());
         if (keepCheck->isMarked()) {
-            std::cout << "blah\n";
             config.setValue("username", user);
         } else {
             config.setValue("username", "");