Index: /trunk/BNC/bncapp.h
===================================================================
--- /trunk/BNC/bncapp.h	(revision 1535)
+++ /trunk/BNC/bncapp.h	(revision 1536)
@@ -43,5 +43,4 @@
     void setCaster(bncCaster* caster) {_caster = caster;}
     QDateTime* _currentDateAndTimeGPS;
-    void setWaitCoTime(int waitCoTime) {_waitCoTime = waitCoTime;}
   public slots:
     void slotMessage(QByteArray msg, bool showOnScreen);
Index: /trunk/BNC/bncmain.cpp
===================================================================
--- /trunk/BNC/bncmain.cpp	(revision 1535)
+++ /trunk/BNC/bncmain.cpp	(revision 1536)
@@ -128,78 +128,7 @@
   }
 
-  // Default Settings
-  // ----------------
-  QStringList casterUrlList;
-  casterUrlList << "http://user:pass@www.euref-ip.net:2101" << "http://user:pass@www.igs-ip.net:2101";
+  bncApp app(argc, argv, GUIenabled);
 
   bncSettings settings;
-  if (settings.allKeys().size() == 0) {
-  settings.setValue("adviseFail",       "15");
-  settings.setValue("adviseReco",       "5");
-  settings.setValue("adviseScript",     "");
-  settings.setValue("autoStart",        "0");
-  settings.setValue("binSampl",         "0");
-  settings.setValue("casterUrlList",    casterUrlList);
-  settings.setValue("corrIntr",         "1 day");
-  settings.setValue("corrPath",         "");
-  settings.setValue("corrPort",         "");
-  settings.setValue("corrTime",         "5");
-  settings.setValue("ephIntr",          "1 day");
-  settings.setValue("ephPath",          "");
-  settings.setValue("ephV3",            "0");
-  settings.setValue("logFile",          "");
-  settings.setValue("makePause",        "0");
-  settings.setValue("miscMount",        "");  
-  settings.setValue("mountPoints",      "");
-  settings.setValue("ntripVersion",     "1");
-  settings.setValue("obsRate",          "");
-  settings.setValue("onTheFlyInterval", "1 day");
-  settings.setValue("outEphPort",       "");
-  settings.setValue("outFile",          "");
-  settings.setValue("outPort",          "");
-  settings.setValue("outUPort",         "");
-  settings.setValue("perfIntr",         "");
-  settings.setValue("proxyHost",        "");
-  settings.setValue("proxyPort",        "");
-  settings.setValue("rnxAppend",        "0");
-  settings.setValue("rnxIntr",          "1 day");
-  settings.setValue("rnxPath",          "");
-  settings.setValue("rnxSampl",         "0");
-  settings.setValue("rnxScript",        "");
-  settings.setValue("rnxSkel",          "SKL");
-  settings.setValue("rnxV3",            "0");
-  settings.setValue("scanRTCM",         "0");
-  settings.setValue("serialAutoNMEA",   "0");
-  settings.setValue("serialBaudRate",   "9600");
-  settings.setValue("serialDataBits",   "8");
-  settings.setValue("serialMountPoint", "");
-  settings.setValue("serialParity",     "NONE");
-  settings.setValue("serialPortName",   "");
-  settings.setValue("serialStopBits",   "1");
-  settings.setValue("startTab",         "0");
-  settings.setValue("waitTime",         "5");
-
-  }
-
-  // Truncate list of casters
-  // ------------------------
-  int maxListSize = 5;
-  QStringList casterHostList = settings.value("casterHostList").toStringList();
-  if ( casterHostList.count() > maxListSize ) {
-    QStringList listCopy;
-    for (int ii = 0; ii < maxListSize; ii++) {
-      listCopy.push_back(casterHostList[ii]);
-    }
-    settings.setValue("casterHostList", listCopy);
-  }
-
-
-  bncApp app(argc, argv, GUIenabled);
-
-  int waitCoTime    = settings.value("corrTime").toInt();
-  if (waitCoTime < 1) {
-    waitCoTime = 1;
-  }
-  app.setWaitCoTime(waitCoTime);
 
   // Interactive Mode - open the main window
Index: /trunk/BNC/bncsettings.cpp
===================================================================
--- /trunk/BNC/bncsettings.cpp	(revision 1535)
+++ /trunk/BNC/bncsettings.cpp	(revision 1536)
@@ -15,4 +15,6 @@
  * -----------------------------------------------------------------------*/
 
+#include <QStringList>
+
 #include "bncsettings.h"
 
@@ -20,4 +22,53 @@
 ////////////////////////////////////////////////////////////////////////////
 bncSettings::bncSettings() : QSettings() {
+
+  if (allKeys().size() == 0) {
+    setValue("adviseFail",       "15");
+    setValue("adviseReco",       "5");
+    setValue("adviseScript",     "");
+    setValue("autoStart",        "0");
+    setValue("binSampl",         "0");
+    setValue("casterUrlList", (QStringList() 
+                               << "http://user:pass@www.euref-ip.net:2101" 
+                               << "http://user:pass@www.igs-ip.net:2101"));
+    setValue("corrIntr",         "1 day");
+    setValue("corrPath",         "");
+    setValue("corrPort",         "");
+    setValue("corrTime",         "5");
+    setValue("ephIntr",          "1 day");
+    setValue("ephPath",          "");
+    setValue("ephV3",            "0");
+    setValue("logFile",          "");
+    setValue("makePause",        "0");
+    setValue("miscMount",        "");  
+    setValue("mountPoints",      "");
+    setValue("ntripVersion",     "1");
+    setValue("obsRate",          "");
+    setValue("onTheFlyInterval", "1 day");
+    setValue("outEphPort",       "");
+    setValue("outFile",          "");
+    setValue("outPort",          "");
+    setValue("outUPort",         "");
+    setValue("perfIntr",         "");
+    setValue("proxyHost",        "");
+    setValue("proxyPort",        "");
+    setValue("rnxAppend",        "0");
+    setValue("rnxIntr",          "1 day");
+    setValue("rnxPath",          "");
+    setValue("rnxSampl",         "0");
+    setValue("rnxScript",        "");
+    setValue("rnxSkel",          "SKL");
+    setValue("rnxV3",            "0");
+    setValue("scanRTCM",         "0");
+    setValue("serialAutoNMEA",   "0");
+    setValue("serialBaudRate",   "9600");
+    setValue("serialDataBits",   "8");
+    setValue("serialMountPoint", "");
+    setValue("serialParity",     "NONE");
+    setValue("serialPortName",   "");
+    setValue("serialStopBits",   "1");
+    setValue("startTab",         "0");
+    setValue("waitTime",         "5");
+  }
 }