Changeset 1538 in ntrip for trunk

Timestamp:

Jan 25, 2009, 9:39:53 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (1 diff)
• bncapp.h (modified) (2 diffs)
• bncmain.cpp (modified) (1 diff)
• bncsettings.cpp (modified) (2 diffs)

trunk/BNC/bncapp.cpp ¶

@@ -701 +701 @@
   }
 }
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncApp::setConfFileName(const QString& confFileName) {
+  if (confFileName.isEmpty()) {
+    _confFileName = "/home/mervart/bla.ini";
+  }
+  else {
+    _confFileName = confFileName;
+  }
+}

trunk/BNC/bncapp.h ¶

@@ -43 +43 @@
     void setCaster(bncCaster* caster) {_caster = caster;}
     QDateTime* _currentDateAndTimeGPS;
+    void setConfFileName(const QString& confFileName);
+    QString confFileName() const {return _confFileName;}
+
   public slots:
     void slotMessage(QByteArray msg, bool showOnScreen);
@@ -96 +99 @@
     long                _waitCoTime;
     QMultiMap<long, QString>* _corrs;
+    QString             _confFileName;
 };
 #endif

trunk/BNC/bncmain.cpp ¶

@@ -120 +120 @@
   }
 
-  QCoreApplication::setOrganizationName("BKG");
-  QCoreApplication::setOrganizationDomain("www.bkg.bund.de");
-  if (!confFileName.isEmpty()) {
-    QCoreApplication::setApplicationName(confFileName);
-  } else {
-    QCoreApplication::setApplicationName("BNC");
-  }
+  bncApp app(argc, argv, GUIenabled);
 
-  bncApp app(argc, argv, GUIenabled);
+  app.setApplicationName("BNC");
+  app.setOrganizationName("BKG");
+  app.setOrganizationDomain("www.bkg.bund.de");
+  app.setConfFileName( confFileName );
 
   bncSettings settings;

trunk/BNC/bncsettings.cpp ¶

@@ -19 +19 @@
 
 #include "bncsettings.h"
+#include "bncapp.h"
 
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
 bncSettings::bncSettings() : 
-  QSettings(QCoreApplication::applicationName().append(".ini"),
-            QSettings::IniFormat) {
+  QSettings(((bncApp*) qApp)->confFileName(), QSettings::IniFormat) {
 
   if (allKeys().size() == 0) {
@@ -73 +73 @@
     setValue("startTab",         "0");
     setValue("waitTime",         "5");
+
+    sync();
   }
 }