Changeset 9587 in ntrip for trunk/BNC

Timestamp:

Jan 7, 2022, 12:49:21 PM (3 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• bncantex.h (modified) (1 diff)
• bnccore.cpp (modified) (9 diffs)
• orbComp/sp3Comp.cpp (modified) (2 diffs)
• pppOptions.h (modified) (1 diff)

trunk/BNC/src/bncantex.h

@@ -27 +27 @@
 
 #include <QtCore>
+#include <QString>
 #include <string>
 #include <newmat.h>

trunk/BNC/src/bnccore.cpp

@@ -42 +42 @@
 #include <sstream>
 #include <QMessageBox>
+//#include <QString>
 #include <cmath>
 
@@ -186 +187 @@
     QByteArray msgLocal = msg;
     if (msg.indexOf('\n') == 0) {
-      *_logStream << endl;
+      *_logStream << Qt::endl;
       msgLocal = msg.mid(1);
     }
     *_logStream << currentDateAndTimeGPS().toString("yy-MM-dd hh:mm:ss ").toLatin1().data();
-    *_logStream << msgLocal.data() << endl;
+    *_logStream << msgLocal.data() << Qt::endl;
     _logStream->flush();
     _logFile->flush();
@@ -391 +392 @@
       if ( ! (appendFlagGPS & QIODevice::Append)) {
         QString line;
-        line.sprintf(
+        line.asprintf(
           "%9.2f%11sN: GNSS NAV DATA    M: Mixed%12sRINEX VERSION / TYPE\n",
           defaultRnxNavVersion3, "", "");
@@ -400 +401 @@
                        << _userName.toLatin1().data()
                        << hlp.toLatin1().data()
-                       << "PGM / RUN BY / DATE" << endl;
+                       << "PGM / RUN BY / DATE" << Qt::endl;
 
         QStringListIterator it(comments);
@@ -407 +408 @@
         }
 
-        line.sprintf("%60sEND OF HEADER\n", "");
+        line.asprintf("%60sEND OF HEADER\n", "");
         *_ephStreamGPS << line;
 
@@ -419 +420 @@
       if (! (appendFlagGPS & QIODevice::Append)) {
         QString line;
-        line.sprintf("%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n",
+        line.asprintf("%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n",
                      defaultRnxNavVersion2, "", "");
         *_ephStreamGPS << line;
@@ -427 +428 @@
                        << _userName.toLatin1().data()
                        << hlp.toLatin1().data()
-                       << "PGM / RUN BY / DATE" << endl;
+                       << "PGM / RUN BY / DATE" << Qt::endl;
 
         QStringListIterator it(comments);
@@ -434 +435 @@
         }
 
-        line.sprintf("%60sEND OF HEADER\n", "");
+        line.asprintf("%60sEND OF HEADER\n", "");
         *_ephStreamGPS << line;
 
@@ -449 +450 @@
                            << _userName.toLatin1().data()
                            << hlp.toLatin1().data()
-                           << "PGM / RUN BY / DATE" << endl;
+                           << "PGM / RUN BY / DATE" << Qt::endl;
 
         QStringListIterator it(comments);

trunk/BNC/src/orbComp/sp3Comp.cpp

@@ -84 +84 @@
   }
   if (!_log) {
-    *_log  << "ERROR: SP3Comp requires logfile specification" << endl;
+    *_log  << "ERROR: SP3Comp requires logfile specification" << Qt::endl;
     goto exit;
   }
 
   for (int ii = 0; ii < _sp3FileNames.size(); ii++) {
-    *_log << "! SP3 File " << ii+1 << ": " << _sp3FileNames[ii] << endl;
+    *_log << "! SP3 File " << ii+1 << ": " << _sp3FileNames[ii] << Qt::endl;
   }
   if (_sp3FileNames.size() != 2) {
-    *_log << "ERROR: sp3Comp requires two input SP3 files" << endl;
+    *_log << "ERROR: sp3Comp requires two input SP3 files" << Qt::endl;
     goto end;
   }
@@ -102 +102 @@
   }
   catch (const string& error) {
-    *_log << "ERROR: " << error.c_str() << endl;
+    *_log << "ERROR: " << error.c_str() << Qt::endl;
   }
   catch (const char* error) {
-    *_log << "ERROR: " << error << endl;
+    *_log << "ERROR: " << error << Qt::endl;
   }
   catch (Exception& exc) {
-    *_log << "ERROR: " << exc.what() << endl;
+    *_log << "ERROR: " << exc.what() << Qt::endl;
   }
   catch (std::exception& exc) {
-    *_log << "ERROR: " << exc.what() << endl;
+    *_log << "ERROR: " << exc.what() << Qt::endl;
   }
   catch (QString error) {
-    *_log << "ERROR: " << error << endl;
+    *_log << "ERROR: " << error << Qt::endl;
   }
   catch (...) {
-    *_log << "ERROR: " << "unknown exception" << endl;
+    *_log << "ERROR: " << "unknown exception" << Qt::endl;
   }
 

trunk/BNC/src/pppOptions.h

@@ -31 +31 @@
       << "IF PPP"
       << "Uncombined PPP"
-      << "PPP-RTK"
       << "DCM with Code Biases"
       << "DCM with Phase Biases";