[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kphotoalbum/category_l10n_removal] /: Added functions to get and set settings values.
From:       Tobias Leupold <tobias.leupold () web ! de>
Date:       2015-12-01 21:51:44
Message-ID: E1a3sps-0001s8-6y () scm ! kde ! org
[Download RAW message or body]

Git commit 403f156e4e1176856a314c5088d06cae4d0c8e35 by Tobias Leupold.
Committed on 01/12/2015 at 21:50.
Pushed by tleupold into branch 'category_l10n_removal'.

Added functions to get and set settings values.

M  +4    -0    DB/ImageDB.h
M  +14   -0    XMLDB/Database.cpp
M  +4    -0    XMLDB/Database.h
M  +1    -7    XMLDB/FileWriter.cpp

http://commits.kde.org/kphotoalbum/403f156e4e1176856a314c5088d06cae4d0c8e35

diff --git a/DB/ImageDB.h b/DB/ImageDB.h
index fc167b1..41def4d 100644
--- a/DB/ImageDB.h
+++ b/DB/ImageDB.h
@@ -143,6 +143,10 @@ public: // Methods that must be overridden
     virtual DB::FileNameList getStackFor(const DB::FileName& referenceId) const = 0;
 
     virtual void copyData( const DB::FileName& from, const DB::FileName& to) = 0;
+
+    virtual QString getSetting(QString key) const = 0;
+    virtual void setSetting(QString key, QString value) = 0;
+
 protected slots:
     virtual void lockDB( bool lock, bool exclude ) = 0;
     void markDirty();
diff --git a/XMLDB/Database.cpp b/XMLDB/Database.cpp
index 18fa61e..b2b586f 100644
--- a/XMLDB/Database.cpp
+++ b/XMLDB/Database.cpp
@@ -710,4 +710,18 @@ void XMLDB::Database::possibleLoadCompressedCategories( ReaderPtr reader, DB::Im
     }
 }
 
+QString XMLDB::Database::getSetting(QString key) const
+{
+    if (m_settings.contains(key)) {
+        return m_settings[key];
+    } else {
+        return QString();
+    }
+}
+
+void XMLDB::Database::setSetting(QString key, QString value)
+{
+    m_settings[key] = value;
+}
+
 // vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/XMLDB/Database.h b/XMLDB/Database.h
index 0ed0bcc..1607679 100644
--- a/XMLDB/Database.h
+++ b/XMLDB/Database.h
@@ -77,6 +77,10 @@ namespace XMLDB {
         void copyData( const DB::FileName& from, const DB::FileName& to) override;
 
         static int fileVersion();
+
+        QString getSetting(QString key) const;
+        void setSetting(QString key, QString value);
+
     protected:
         DB::FileNameList searchPrivate(
             const DB::ImageSearchInfo&,
diff --git a/XMLDB/FileWriter.cpp b/XMLDB/FileWriter.cpp
index 01e08cf..25ba8a8 100644
--- a/XMLDB/FileWriter.cpp
+++ b/XMLDB/FileWriter.cpp
@@ -253,13 +253,7 @@ void XMLDB::FileWriter::saveSettings(QXmlStreamWriter& writer)
 
     ElementWriter dummy(writer, settingsString);
 
-    QMap<QString, QString> settings;
-    // For testing
-    settings.insert(QString::fromUtf8("tokensCategory"), QString::fromUtf8("Tokens"));
-    settings.insert(QString::fromUtf8("untaggedCategory"), QString::fromUtf8("Events"));
-    settings.insert(QString::fromUtf8("untaggedTag"), QString::fromUtf8("untagged"));
-
-    QMapIterator<QString, QString> settingsIterator(settings);
+    QMapIterator<QString, QString> settingsIterator(m_db->m_settings);
     while (settingsIterator.hasNext()) {
         ElementWriter dummy(writer, settingString);
         settingsIterator.next();
[prev in list] [next in list] [prev in thread] [next in thread]