Return default QSettings to allow clients store additional settings

diff --git a/localmylist/mylist.cpp b/localmylist/mylist.cpp
index b123d2757d9b138775a0304fb4cd9104c3993545..7612d65c1248cb2dd8e2dd4826962a1954af1023 100644 (file)
--- a/localmylist/mylist.cpp
+++ b/localmylist/mylist.cpp
@@ -25,6 +25,7 @@ MyList::MyList()
        m_renameHandler = 0;
        m_directoryWatcher = 0;
        workThread = 0;
+       m_defaultLocalQSettings = new QSettings(QSettings::IniFormat, QSettings::UserScope, organizationName, libraryName, this);
 
        db = new Database("main");
        connect(db, SIGNAL(connected()), this, SLOT(setupHostInfo()));
@@ -60,6 +61,11 @@ int MyList::runningTaskCount()
        return tasks.count();
 }
 
+QSettings *MyList::defaultLocalQSettings() const
+{
+       return m_defaultLocalQSettings;
+}
+
 void MyList::setHostName(QString name)
 {
        hostInfo.name = name;
@@ -157,7 +163,7 @@ void MyList::setupHostInfo()
        {
                qWarning("Unknown host!");
        }
-//     qDebug() << "host id" << hostId();
+       //      qDebug() << "host id" << hostId();
 }
 
 void MyList::loadLocalSettings(QSettings &s)
@@ -178,13 +184,12 @@ void MyList::loadLocalSettings(QSettings &s)
 
 void MyList::loadLocalSettings()
 {
-       QSettings s(QSettings::IniFormat, QSettings::UserScope, organizationName, libraryName);
-       loadLocalSettings(s);
+       loadLocalSettings(*defaultLocalQSettings());
 }
 
 void MyList::saveLocalSettings()
 {
-       QSettings s(QSettings::IniFormat, QSettings::UserScope, organizationName, libraryName);
+       QSettings &s = *defaultLocalQSettings();
        s.beginGroup("host");
                s.setValue("hostName", hostInfo.name);
        s.endGroup();
@@ -278,6 +283,7 @@ void MyList::taskFinished()
                emit allTasksFinished();
 }
 
+
 MyList *MyList::instance()
 {
        if (!m_instance)

diff --git a/localmylist/mylist.h b/localmylist/mylist.h
index b36054cfb077dafed6ad3f16189f9eb5020ea488..0179adc20fa371bc4c2828038aaf128ee6bfdafb 100644 (file)
--- a/localmylist/mylist.h
+++ b/localmylist/mylist.h
@@ -46,6 +46,8 @@ public:
 
        int runningTaskCount();
 
+       QSettings *defaultLocalQSettings() const;
+
 public slots:
        void markWatched(int fid, QDateTime when = QDateTime::currentDateTime());
 
@@ -87,6 +89,8 @@ private:
 
        QSet<AbstractTask *> tasks;
 
+       QSettings *m_defaultLocalQSettings;
+
 public:
        static MyList *instance();
        static void destroy();
@@ -96,6 +100,7 @@ public:
 
        static const char *organizationName;
        static const char *libraryName;
+
 private:
        static void init();
        static MyList *m_instance;