Changeset 5453 in ntrip for trunk/GnssCenter

Timestamp:

Sep 14, 2013, 3:33:22 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter

Files:

• main/settings.cpp (modified) (2 diffs)
• main/settings.h (modified) (2 diffs)
• monitor/monitor.cpp (modified) (2 diffs)

trunk/GnssCenter/main/settings.cpp

@@ -26 +26 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_settings::t_settings() {
+t_settings::t_settings(const QString& groupName) {
   QMutexLocker locker(&_mutex);
 
-  _app = static_cast<t_app*>(qApp);
+  _groupName = groupName;
+  _app       = static_cast<t_app*>(qApp);
 
   // First fill the options
@@ -111 +112 @@
   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

@@ -10 +10 @@
 class t_settings {
  public:
-  t_settings();
+  t_settings(const QString& groupName = QString());
   ~t_settings();
   QVariant value(const QString& key, 
@@ -17 +17 @@
   void remove(const QString& key );
   void sync();
-  void beginGroup(const QString& groupName);
-  void endGroup();
  private:
   void reRead();

trunk/GnssCenter/monitor/monitor.cpp

@@ -66 +66 @@
   // Host and Port
   // -------------
-  t_settings settings;
-  settings.beginGroup(pluginName);
+  t_settings settings(pluginName);
   settings.setValue("host", "rtnet.rtcm-ntrip.org");
   settings.setValue("port", 7777);
-  settings.endGroup();
   settings.sync();
 
@@ -96 +94 @@
 void t_monitor::slotStartThrift() {
   if (!_thriftClient) {
-    t_settings settings;
-    settings.beginGroup(pluginName);
+    t_settings settings(pluginName);
     QString host = settings.value("host").toString();
     int     port = settings.value("port").toInt();
-    settings.endGroup();
     _thriftClient = new t_thriftClient(this, host, port);
     connect(_thriftClient, SIGNAL(finished()), this, SLOT(slotThriftFinished()));