Changeset 159 for trunk/src/configuration.h

Timestamp:

09/26/2008 11:32:18 AM (4 years ago)

Author:

guyru

Message:

• Import settings and highscores to new configuration class.
• Fix segementation fault caused by trying to close an unopened db in DBwrapper destructor.

File:

• trunk/src/configuration.h (modified) (5 diffs)

trunk/src/configuration.h

@@ -22 +22 @@
 #define OPENYAHTZEE_CONFIGURATION_INC
 
+#include "DBwrapper.h" // used in the back-compatibility code
 #include <string>
 #include <fstream>
@@ -33 +34 @@
 typedef std::list<HighscoreItem> HighscoreList;
 
+static const char* DEFAULT_HIGHSCORE_SIZE = "20";
+
 class Configuration {
 public:
@@ -41 +44 @@
         void load(std::string file);
 
+        /**
+         * Saves the configurations (setting and highscores) to the file
+         * specified when the class was constructed
+         */
         void save();
+
+        /**
+         * \return the value associated with the specified key, or empty
+         * string if that key is missing
+         */
+        std::string get(std::string key);
+        /**
+         * Associates the given value with the given key. You must call
+         * save() in order to make the change permanent.
+         * \return pointer to self.
+         */
+        Configuration *set(std::string key, std::string value);
 private:
         /**
@@ -53 +72 @@
         void saveSettings(std::ofstream *file);
         void saveHighscores(std::ofstream *file);
+
+        /**
+         * Loads default settings
+         */
+        void loadDefaultSettings();
         
         std::map<std::string, std::string> m_settings;
@@ -58 +82 @@
 
         std::string m_file;
+
+        /* The following functions and variables are used for legacy SQLite
+         * configuration file, and could be dropped.
+         */
+        DBwrapper old_db;
+        std::string getKeyFromDb(std::string key);
+        void importSettings();
+        void importHighscores();
 };