Changeset 5066 in ntrip for trunk/BNC/src/bncsettings.cpp

Timestamp:

Mar 30, 2013, 11:31:00 AM (11 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bncsettings.cpp (modified) (7 diffs)

trunk/BNC/src/bncsettings.cpp

@@ -27 +27 @@
   QMutexLocker locker(&_mutex);
 
-#ifdef GNSSCENTER_PLUGIN
-  _bncApp = 0;
-  return;
-#else
-  _bncApp = static_cast<bncApp*>(qApp);
-#endif
-
   // First fill the options
   // ---------------------- 
-  if (_bncApp->_settings.size() == 0) {
+  if (PGM_CORE->_settings.size() == 0) {
     reRead();
   }
@@ -50 +43 @@
 void bncSettings::reRead() {
 
-  _bncApp->_settings.clear();
-
-  QSettings settings(_bncApp->confFileName(), QSettings::IniFormat);
+  PGM_CORE->_settings.clear();
+
+  QSettings settings(PGM_CORE->confFileName(), QSettings::IniFormat);
 
   // Read from File
@@ -60 +53 @@
     while (it.hasNext()) {
       QString key = it.next();
-      _bncApp->_settings[key] = settings.value(key);
+      PGM_CORE->_settings[key] = settings.value(key);
     }
   }
@@ -225 +218 @@
   QMutexLocker locker(&_mutex);
 
-  if (_bncApp && _bncApp->_settings.contains(key)) {
-    return _bncApp->_settings[key];
+  if (PGM_CORE->_settings.contains(key)) {
+    return PGM_CORE->_settings[key];
   }
   else {
@@ -243 +236 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncSettings::setValue_p(const QString &key, const QVariant& value) {
-  _bncApp->_settings[key] = value;
+  PGM_CORE->_settings[key] = value;
 }
 
@@ -250 +243 @@
 void bncSettings::remove(const QString& key ) {
   QMutexLocker locker(&_mutex);
-  _bncApp->_settings.remove(key);
+  PGM_CORE->_settings.remove(key);
 }
 
@@ -257 +250 @@
 void bncSettings::sync() {
   QMutexLocker locker(&_mutex);
-  QSettings settings(_bncApp->confFileName(), QSettings::IniFormat);
+  QSettings settings(PGM_CORE->confFileName(), QSettings::IniFormat);
   settings.clear();
-  QMapIterator<QString, QVariant> it(_bncApp->_settings);
+  QMapIterator<QString, QVariant> it(PGM_CORE->_settings);
   while (it.hasNext()) {
     it.next();