Changeset 5452 in ntrip for trunk/GnssCenter/main

Timestamp:

Sep 14, 2013, 3:28:51 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/main

Files:

• main.cpp (modified) (1 diff)
• settings.cpp (modified) (4 diffs)
• settings.h (modified) (1 diff)

trunk/GnssCenter/main/main.cpp

@@ -27 +27 @@
   app.setOrganizationName("BKG");
   app.setOrganizationDomain("www.bkg.bund.de");
+  app.setConfFileName("");
 
   t_mainWin* mainWin = new t_mainWin();

trunk/GnssCenter/main/settings.cpp

@@ -73 +73 @@
                             const QVariant& defaultValue) const {
   QMutexLocker locker(&_mutex);
-
-  if (_app->_settings.contains(key)) {
-    return _app->_settings[key];
+  QString fullKey = _groupName.isEmpty() ? key : _groupName + '/' + key;
+  if (_app->_settings.contains(fullKey)) {
+    return _app->_settings[fullKey];
   }
   else {
@@ -86 +86 @@
 void t_settings::setValue(const QString &key, const QVariant& value) {
   QMutexLocker locker(&_mutex);
-  setValue_p(key, value);
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void t_settings::setValue_p(const QString &key, const QVariant& value) {
-  _app->_settings[key] = value;
+  QString fullKey = _groupName.isEmpty() ? key : _groupName + '/' + key;
+  _app->_settings[fullKey] = value;
 }
 
@@ -99 +94 @@
 void t_settings::remove(const QString& key ) {
   QMutexLocker locker(&_mutex);
-  _app->_settings.remove(key);
+  QString fullKey = _groupName.isEmpty() ? key : _groupName + '/' + key;
+  _app->_settings.remove(fullKey);
 }
 
@@ -115 +111 @@
   settings.sync();
 }
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void t_settings::beginGroup(const QString& groupName) {
+  QMutexLocker locker(&_mutex);
+  _groupName = groupName;
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void t_settings::endGroup() {
+  QMutexLocker locker(&_mutex);
+  _groupName.clear();
+}

trunk/GnssCenter/main/settings.h

@@ -16 +16 @@
   void setValue(const QString &key, const QVariant& value);
   void remove(const QString& key );
+  void sync();
+  void beginGroup(const QString& groupName);
+  void endGroup();
+ private:
   void reRead();
-  void sync();
- private:
-  void          setValue_p(const QString &key, const QVariant& value);
   t_app*        _app;
+  QString       _groupName;
   static QMutex _mutex;
 };