Changeset 10525 in ntrip for trunk/BNC/src/rinex/reqcedit.cpp

Timestamp:

Aug 19, 2024, 4:15:53 PM (5 weeks ago)

Author:

stuerze

Message:

replacement of obsolete qt-class members

File:

• trunk/BNC/src/rinex/reqcedit.cpp (modified) (10 diffs)

trunk/BNC/src/rinex/reqcedit.cpp

@@ -58 +58 @@
   _logFile        = 0;
   _log            = 0;
-  _obsFileNames   = settings.value("reqcObsFile").toString().split(",", QString::SkipEmptyParts);
+  _obsFileNames   = settings.value("reqcObsFile").toString().split(",", Qt::SkipEmptyParts);
   _outObsFileName = settings.value("reqcOutObsFile").toString();
-  _navFileNames   = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
+  _navFileNames   = settings.value("reqcNavFile").toString().split(",", Qt::SkipEmptyParts);
   _outNavFileName = settings.value("reqcOutNavFile").toString();
   int version     = settings.value("reqcRnxVersion").toInt();
@@ -108 +108 @@
   // ---------------
   if (_log) {
-    *_log << QByteArray(78, '-') << endl;
+    *_log << QByteArray(78, '-') << '\n';
     *_log << "RINEX File Editing\n";
-    *_log << QByteArray(78, '-') << endl;
+    *_log << QByteArray(78, '-') << '\n';
 
     *_log << QByteArray("Program").leftJustified(15) << ": "
-          << BNC_CORE->pgmName() << endl;
+          << BNC_CORE->pgmName() << '\n';
     *_log << QByteArray("Run by").leftJustified(15) << ": "
-          << BNC_CORE->userName() << endl;
+          << BNC_CORE->userName() << '\n';
     *_log << QByteArray("Date").leftJustified(15) << ": "
-          << QDateTime::currentDateTime().toUTC().toString("yyyy-MM-dd hh:mm:ss") << endl;
+          << QDateTime::currentDateTime().toUTC().toString("yyyy-MM-dd hh:mm:ss") << '\n';
     *_log << QByteArray("RINEX Version").leftJustified(15) << ": "
-          << _rnxVersion << endl;
+          << _rnxVersion << '\n';
     *_log << QByteArray("Sampling").leftJustified(15) << ": "
-          << _samplingRate << " sec" << endl;
+          << _samplingRate << " sec" << '\n';
     *_log << QByteArray("Start time").leftJustified(15) << ": "
           << _begTime.datestr().c_str() << ' '
-          << _begTime.timestr(0).c_str() << endl;
+          << _begTime.timestr(0).c_str() << '\n';
     *_log << QByteArray("End time").leftJustified(15) << ": "
           << _endTime.datestr().c_str() << ' '
-          << _endTime.timestr(0).c_str() << endl;
+          << _endTime.timestr(0).c_str() << '\n';
     *_log << QByteArray("Input Obs Files").leftJustified(15) << ": "
-          << _obsFileNames.join(",") << endl;
+          << _obsFileNames.join(",") << '\n';
     *_log << QByteArray("Input Nav Files").leftJustified(15) << ": "
-          << _navFileNames.join(",") << endl;
+          << _navFileNames.join(",") << '\n';
     *_log << QByteArray("Output Obs File").leftJustified(15) << ": "
-          << _outObsFileName << endl;
+          << _outObsFileName << '\n';
     *_log << QByteArray("Output Nav File").leftJustified(15) << ": "
-          << _outNavFileName << endl;
-
-    *_log << QByteArray(78, '-') << endl;
+          << _outNavFileName << '\n';
+
+    *_log << QByteArray(78, '-') << '\n';
     _log->flush();
   }
@@ -186 +186 @@
           delete rnxObsFile;
           if (log) {
-            *log << "Error in rnxObsFile " << filePath.toLatin1().data() << endl;
+            *log << "Error in rnxObsFile " << filePath.toLatin1().data() << '\n';
           }
         }
@@ -199 +199 @@
       catch (...) {
         if (log) {
-          *log << "Error in rnxObsFile " << fileName.toLatin1().data() << endl;
-        }
-      }
-    }
-  }
-  qStableSort(rnxObsFiles.begin(), rnxObsFiles.end(),
+          *log << "Error in rnxObsFile " << fileName.toLatin1().data() << '\n';
+        }
+      }
+    }
+  }
+  std::stable_sort(rnxObsFiles.begin(), rnxObsFiles.end(),
               t_rnxObsFile::earlierStartTime);
 }
@@ -242 +242 @@
   // ------------------------
   bncSettings settings;
-  QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", QString::SkipEmptyParts);
+  QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", Qt::SkipEmptyParts);
 
   // Put together all observation types
@@ -318 +318 @@
       *_log << "Processing File: " << obsFile->fileName() << "  start: "
             << obsFile->startTime().datestr().c_str() << ' '
-            << obsFile->startTime().timestr(0).c_str() << endl;
+            << obsFile->startTime().timestr(0).c_str() << '\n';
     }
     if (ii == 0) {
@@ -367 +367 @@
     catch (QString str) {
       if (_log) {
-        *_log << "Exception " << str << endl;
+        *_log << "Exception " << str << '\n';
       }
       else {
@@ -376 +376 @@
     catch (...) {
       if (_log) {
-        *_log << "Exception unknown" << endl;
+        *_log << "Exception unknown" << '\n';
       }
       else {
@@ -540 +540 @@
   }
   // TODO: enable user decision
-  qStableSort(ephs.begin(), ephs.end(), t_eph::earlierTime);
-  //qStableSort(ephs.begin(), ephs.end(), t_eph::prnSort);
+  std::stable_sort(ephs.begin(), ephs.end(), t_eph::earlierTime);
+  //std::stable_sort(ephs.begin(), ephs.end(), t_eph::prnSort);
 }
 
@@ -785 +785 @@
         QString preferredAttrib;
         if (preferredAttribListSys[ii].indexOf("&") != -1) {
-          QStringList hlp = preferredAttribListSys[ii].split("&", QString::SkipEmptyParts);
+          QStringList hlp = preferredAttribListSys[ii].split("&", Qt::SkipEmptyParts);
           if (hlp.size() == 2 && hlp[0].contains(band)) {
             preferredAttrib = hlp[1];