Index: trunk/BNC/src/bnccore.cpp
===================================================================
--- trunk/BNC/src/bnccore.cpp	(revision 7288)
+++ trunk/BNC/src/bnccore.cpp	(revision 7291)
@@ -35,5 +35,5 @@
  * Created:    29-Aug-2006
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -44,21 +44,21 @@
 #include <cmath>
 
-#include "bnccore.h" 
-#include "bncutils.h" 
-#include "bncrinex.h" 
-#include "bncsettings.h" 
-#include "bncversion.h" 
-#include "ephemeris.h" 
-#include "rinex/rnxobsfile.h" 
-#include "rinex/rnxnavfile.h" 
+#include "bnccore.h"
+#include "bncutils.h"
+#include "bncrinex.h"
+#include "bncsettings.h"
+#include "bncversion.h"
+#include "ephemeris.h"
+#include "rinex/rnxobsfile.h"
+#include "rinex/rnxnavfile.h"
 #include "pppMain.h"
 
 #ifdef USE_COMBINATION
-#  include "combination/bnccomb.h" 
+#  include "combination/bnccomb.h"
 #endif
 
 using namespace std;
 
-// Singleton 
+// Singleton
 ////////////////////////////////////////////////////////////////////////////
 t_bncCore* t_bncCore::instance() {
@@ -176,5 +176,5 @@
     if ( !logFileName.isEmpty() ) {
       expandEnvVar(logFileName);
-      _logFile = new QFile(logFileName + "_" + 
+      _logFile = new QFile(logFileName + "_" +
                           currDate.toString("yyMMdd").toAscii().data());
       _fileDate = currDate;
@@ -203,5 +203,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 t_irc t_bncCore::checkPrintEph(t_eph* eph) {
@@ -221,5 +221,5 @@
 }
 
-// New GPS Ephemeris 
+// New GPS Ephemeris
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewGPSEph(t_ephGPS eph) {
@@ -228,5 +228,5 @@
   }
 }
-    
+
 // New Glonass Ephemeris
 ////////////////////////////////////////////////////////////////////////////
@@ -272,5 +272,5 @@
 
     if ( Qt::CheckState(settings.value("ephV3").toInt()) == Qt::Checked) {
-      _rinexVers = 3;    
+      _rinexVers = 3;
     }
     else {
@@ -298,5 +298,5 @@
     bool ephV3filenames = settings.value("ephV3filenames").toBool();
 
-    QString hlpStr = bncRinex::nextEpochStr(datTim, 
+    QString hlpStr = bncRinex::nextEpochStr(datTim,
                          settings.value("ephIntr").toString(), ephV3filenames);
 
@@ -381,17 +381,17 @@
         QString line;
         line.sprintf(
-          "%9.2f%11sN: GNSS NAV DATA    M: Mixed%12sRINEX VERSION / TYPE\n", 
-          3.0, "", "");
+          "%9.2f%11sN: GNSS NAV DATA    M: Mixed%12sRINEX VERSION / TYPE\n",
+          t_rnxNavFile::defaultRnxNavVersion3, "", "");
         *_ephStreamGPS << line;
-        
+
         QString hlp = currentDateAndTimeGPS().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
-        *_ephStreamGPS << _pgmName.toAscii().data() 
-                       << _userName.toAscii().data() 
-                       << hlp.toAscii().data() 
+        *_ephStreamGPS << _pgmName.toAscii().data()
+                       << _userName.toAscii().data()
+                       << hlp.toAscii().data()
                        << "PGM / RUN BY / DATE" << endl;
 
         line.sprintf("%60sEND OF HEADER\n", "");
         *_ephStreamGPS << line;
-        
+
         _ephStreamGPS->flush();
       }
@@ -406,9 +406,9 @@
                      t_rnxNavFile::defaultRnxNavVersion2, "", "");
         *_ephStreamGPS << line;
-         
+
         QString hlp = currentDateAndTimeGPS().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
-        *_ephStreamGPS << _pgmName.toAscii().data() 
-                       << _userName.toAscii().data() 
-                       << hlp.toAscii().data() 
+        *_ephStreamGPS << _pgmName.toAscii().data()
+                       << _userName.toAscii().data()
+                       << hlp.toAscii().data()
                        << "PGM / RUN BY / DATE" << endl;
 
@@ -423,9 +423,9 @@
                      t_rnxNavFile::defaultRnxNavVersion2, "", "");
         *_ephStreamGlonass << line;
-        
+
         QString hlp = currentDateAndTimeGPS().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
-        *_ephStreamGlonass << _pgmName.toAscii().data() 
-                           << _userName.toAscii().data() 
-                           << hlp.toAscii().data() 
+        *_ephStreamGlonass << _pgmName.toAscii().data()
+                           << _userName.toAscii().data()
+                           << hlp.toAscii().data()
                            << "PGM / RUN BY / DATE" << endl;
 
@@ -538,5 +538,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotQuit() {
@@ -545,5 +545,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewOrbCorrections(QList<t_orbCorr> orbCorrections) {
@@ -552,5 +552,5 @@
   if (_socketsCorr) {
     ostringstream out;
-    t_orbCorr::writeEpoch(&out, orbCorrections);   
+    t_orbCorr::writeEpoch(&out, orbCorrections);
     QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
     while (is.hasNext()) {
@@ -570,5 +570,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewClkCorrections(QList<t_clkCorr> clkCorrections) {
@@ -577,5 +577,5 @@
   if (_socketsCorr) {
     ostringstream out;
-    t_clkCorr::writeEpoch(&out, clkCorrections);   
+    t_clkCorr::writeEpoch(&out, clkCorrections);
     QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
     while (is.hasNext()) {
@@ -595,5 +595,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewCodeBiases(QList<t_satCodeBias> codeBiases) {
@@ -602,5 +602,5 @@
   if (_socketsCorr) {
     ostringstream out;
-    t_satCodeBias::writeEpoch(&out, codeBiases);   
+    t_satCodeBias::writeEpoch(&out, codeBiases);
     QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
     while (is.hasNext()) {
@@ -620,5 +620,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewPhaseBiases(QList<t_satPhaseBias> phaseBiases) {
@@ -627,5 +627,5 @@
   if (_socketsCorr) {
     ostringstream out;
-    t_satPhaseBias::writeEpoch(&out, phaseBiases);   
+    t_satPhaseBias::writeEpoch(&out, phaseBiases);
     QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
     while (is.hasNext()) {
@@ -645,5 +645,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewTec(t_vTec vTec) {
@@ -652,5 +652,5 @@
   if (_socketsCorr) {
     ostringstream out;
-    t_vTec::write(&out, vTec);   
+    t_vTec::write(&out, vTec);
     QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
     while (is.hasNext()) {
@@ -670,9 +670,9 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::setConfFileName(const QString& confFileName) {
   if (confFileName.isEmpty()) {
-    _confFileName = QDir::homePath() + QDir::separator() 
+    _confFileName = QDir::homePath() + QDir::separator()
                   + ".config" + QDir::separator()
                   + qApp->organizationName() + QDir::separator()
@@ -704,5 +704,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::initCombination() {
@@ -716,5 +716,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::stopCombination() {