Changeset 10546 in ntrip

Timestamp:

Sep 25, 2024, 5:08:35 PM (3 weeks ago)

Author:

stuerze

Message:

replacement of obsolete qt-class members

Location:

trunk/BNC/src

Files:

• PPP/pppSatObs.cpp (modified) (2 diffs)
• RTCM3/bits.h (modified) (2 diffs)
• bncmain.cpp (modified) (1 diff)
• bncsinextro.cpp (modified) (2 diffs)
• combination/bnccomb.cpp (modified) (1 diff)
• pppMain.cpp (modified) (2 diffs)
• rinex/reqcanalyze.cpp (modified) (2 diffs)
• rinex/reqcedit.cpp (modified) (3 diffs)
• rinex/rnxnavfile.cpp (modified) (2 diffs)
• rinex/rnxobsfile.cpp (modified) (9 diffs)
• upload/bncrtnetuploadcaster.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -76 +76 @@
   // Select pseudo-ranges and phase observations
   // -------------------------------------------
-  QStringList priorList = _signalPriorities.split(" ", Qt::SkipEmptyParts);
+  QStringList priorList = _signalPriorities.split(" ", QString::SkipEmptyParts);
   string preferredAttrib;
   for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) {
@@ -92 +92 @@
     for (int ii = 0; ii < priorList.size(); ii++) {
       if (priorList[ii].indexOf(":") != -1) {
-        hlp = priorList[ii].split(":", Qt::SkipEmptyParts);
+        hlp = priorList[ii].split(":", QString::SkipEmptyParts);
         if (hlp.size() == 2 && hlp[0].length() == 1 && hlp[0][0] == frqSys) {
-          hlp = hlp[1].split("&", Qt::SkipEmptyParts);
+          hlp = hlp[1].split("&", QString::SkipEmptyParts);
         }
         if (hlp.size() == 2 && hlp[0].indexOf(frqNum) != -1) {

trunk/BNC/src/RTCM3/bits.h

@@ -220 +220 @@
 //////////////////////////////////////////////////////////
 #define SBASTOINT(type, value) static_cast<type>(round(value))
+
 #define SBASADDBITS(a, b) {bitbuffer = (bitbuffer<<(a)) \
                        |(SBASTOINT(long long,b)&((1ULL<<a)-1)); \
@@ -225 +226 @@
                        while(numbits >= 8) { \
                        buffer[size++] = bitbuffer>>(numbits-8);numbits -= 8;}}
+
 #define SBASADDBITSFLOAT(a,b,c) {long long i = SBASTOINT(long long,(b)/(c)); \
                              SBASADDBITS(a,i)};

trunk/BNC/src/bncmain.cpp

@@ -458 +458 @@
       QString val(argv[ii+2]);
       if (val.indexOf(";") != -1) {
-        settings.setValue(key, val.split(";", Qt::SkipEmptyParts));
+        settings.setValue(key, val.split(";", QString::SkipEmptyParts));
       }
       else {

trunk/BNC/src/bncsinextro.cpp

@@ -93 +93 @@
     signalPriorities = "G:12&CWPSLX R:12&CP E:1&CBX E:5&QIX C:26&IQX";
   }
-  QStringList priorList = signalPriorities.split(" ", Qt::SkipEmptyParts);
+  QStringList priorList = signalPriorities.split(" ", QString::SkipEmptyParts);
   QStringList frqStrList;
   for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) {
@@ -102 +102 @@
     for (int ii = 0; ii < priorList.size(); ii++) {
       if (priorList[ii].indexOf(":") != -1) {
-        hlp = priorList[ii].split(":", Qt::SkipEmptyParts);
+        hlp = priorList[ii].split(":", QString::SkipEmptyParts);
         if (hlp.size() == 2 && hlp[0].length() == 1 && hlp[0][0] == frqSys) {
-          hlp = hlp[1].split("&", Qt::SkipEmptyParts);
+          hlp = hlp[1].split("&", QString::SkipEmptyParts);
         }
         if (hlp.size() == 2 && hlp[0].indexOf(frqNum) != -1) {

trunk/BNC/src/combination/bnccomb.cpp

@@ -176 +176 @@
       newAC->name         = hlp[1];
       newAC->weightFactor = hlp[2].toDouble();
-      newAC->excludeSats  = hlp[3].split(QRegExp("[ ,]"), Qt::SkipEmptyParts);
+      newAC->excludeSats  = hlp[3].split(QRegExp("[ ,]"), QString::SkipEmptyParts);
       newAC->isAPC        = bool(newAC->mountPoint.mid(0,4) == "SSRA");
       QMapIterator<char, unsigned> itSys(_cmbSysPrn);

trunk/BNC/src/pppMain.cpp

@@ -407 +407 @@
 
     QString     priorStr  = QString::fromStdString(opt->_signalPriorities);
-    QStringList priorList = priorStr.split(" ", Qt::SkipEmptyParts);
+    QStringList priorList = priorStr.split(" ", QString::SkipEmptyParts);
     QStringList hlpList;
     vector<char> systems = opt->systems();
@@ -414 +414 @@
       for (int ii = 0; ii < priorList.size(); ii++) {
         if (priorList[ii].indexOf(":") != -1) {
-          hlpList = priorList[ii].split(":", Qt::SkipEmptyParts);
+          hlpList = priorList[ii].split(":", QString::SkipEmptyParts);
           if (hlpList.size() == 2 && hlpList[0].length() == 1 && hlpList[0][0] == sys) {
-            hlpList = hlpList[1].split("&", Qt::SkipEmptyParts);
+            hlpList = hlpList[1].split("&", QString::SkipEmptyParts);
             if (hlpList.size() == 2) {
               for (int jj = 0; jj < hlpList[0].size(); jj++) {

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -66 +66 @@
   _log             = 0;
   _currEpo         = 0;
-  _obsFileNames    = settings.value("reqcObsFile").toString().split(",", Qt::SkipEmptyParts);
-  _navFileNames    = settings.value("reqcNavFile").toString().split(",", Qt::SkipEmptyParts);
+  _obsFileNames    = settings.value("reqcObsFile").toString().split(",", QString::SkipEmptyParts);
+  _navFileNames    = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
   _reqcPlotSignals = settings.value("reqcSkyPlotSignals").toString();
   _defaultSignalTypes << "G:1&2&5" << "R:1&2&3" << "J:1&2" << "E:1&5" << "S:1&5" << "C:2&6" << "I:5&9";
@@ -149 +149 @@
 void t_reqcAnalyze::analyzePlotSignals() {
 
-  QStringList signalsOpt = _reqcPlotSignals.split(" ", Qt::SkipEmptyParts);
+  QStringList signalsOpt = _reqcPlotSignals.split(" ", QString::SkipEmptyParts);
 
   for (int ii = 0; ii < signalsOpt.size(); ii++) {
-    QStringList input = signalsOpt.at(ii).split(QRegExp("[:&]"), Qt::SkipEmptyParts);
+    QStringList input = signalsOpt.at(ii).split(QRegExp("[:&]"), QString::SkipEmptyParts);
     if (input.size() > 1 && input[0].length() == 1) {
       char        system   = input[0].toLatin1().constData()[0];

trunk/BNC/src/rinex/reqcedit.cpp

@@ -58 +58 @@
   _logFile        = 0;
   _log            = 0;
-  _obsFileNames   = settings.value("reqcObsFile").toString().split(",", Qt::SkipEmptyParts);
+  _obsFileNames   = settings.value("reqcObsFile").toString().split(",", QString::SkipEmptyParts);
   _outObsFileName = settings.value("reqcOutObsFile").toString();
-  _navFileNames   = settings.value("reqcNavFile").toString().split(",", Qt::SkipEmptyParts);
+  _navFileNames   = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
   _outNavFileName = settings.value("reqcOutNavFile").toString();
   int version     = settings.value("reqcRnxVersion").toInt();
@@ -242 +242 @@
   // ------------------------
   bncSettings settings;
-  QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", Qt::SkipEmptyParts);
+  QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", QString::SkipEmptyParts);
 
   // Put together all observation types
@@ -785 +785 @@
         QString preferredAttrib;
         if (preferredAttribListSys[ii].indexOf("&") != -1) {
-          QStringList hlp = preferredAttribListSys[ii].split("&", Qt::SkipEmptyParts);
+          QStringList hlp = preferredAttribListSys[ii].split("&", QString::SkipEmptyParts);
           if (hlp.size() == 2 && hlp[0].contains(band)) {
             preferredAttrib = hlp[1];

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -158 +158 @@
     }
 
-    QStringList hlp = line.split(QRegExp("\\s+"), Qt::SkipEmptyParts);
+    QStringList hlp = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
     QString firstStr = hlp.at(0);
     QString prn;
@@ -317 +317 @@
       }
       else if (it.key() == "RUN BY DATE") {
-          runByDate = it.value().split("\\n", Qt::SkipEmptyParts);
+          runByDate = it.value().split("\\n", QString::SkipEmptyParts);
       }
       else if (it.key() == "COMMENT") {
-        comments = it.value().split("\\n", Qt::SkipEmptyParts);
+        comments = it.value().split("\\n", QString::SkipEmptyParts);
       }
     }

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -505 +505 @@
     for (int iType = 0; iType < useObsTypes->size(); iType++) {
       if (useObsTypes->at(iType).indexOf(":") != -1) {
-        QStringList hlp = useObsTypes->at(iType).split(":", Qt::SkipEmptyParts);
+        QStringList hlp = useObsTypes->at(iType).split(":", QString::SkipEmptyParts);
         if (hlp.size() == 2 && hlp[0].length() == 1) {
           if (_version >= 3.0) {
@@ -551 +551 @@
     else {
       foreach (const QString &str, *phaseShifts) {
-        QStringList hlp  = str.split("_", Qt::SkipEmptyParts);
-        QStringList hlp1 = hlp.last().split(":", Qt::SkipEmptyParts);
+        QStringList hlp  = str.split("_", QString::SkipEmptyParts);
+        QStringList hlp1 = hlp.last().split(":", QString::SkipEmptyParts);
         QString type = hlp.first();
         double shift = hlp1.first().toDouble();
@@ -577 +577 @@
     else {
       foreach (const QString &str, *gloBiases) {
-        QStringList hlp = str.split(":", Qt::SkipEmptyParts);
+        QStringList hlp = str.split(":", QString::SkipEmptyParts);
         QString type = hlp.first();;
         double  value = hlp.last().toDouble();
@@ -590 +590 @@
     else {
       foreach (const QString &str, *gloSlots) {
-        QStringList hlp = str.split(":", Qt::SkipEmptyParts);
+        QStringList hlp = str.split(":", QString::SkipEmptyParts);
         QString sat = hlp.first();
         int    slot = hlp.last().toInt();
@@ -631 +631 @@
       }
       else if (it.key() == "RUN BY DATE") {
-          runByDate = it.value().split("\\n", Qt::SkipEmptyParts);
+          runByDate = it.value().split("\\n", QString::SkipEmptyParts);
       }
       else if ((it.key().indexOf("COMMENT")) != -1) {
-        newComments += it.value().split("\\n", Qt::SkipEmptyParts);
+        newComments += it.value().split("\\n", QString::SkipEmptyParts);
       }
     }
@@ -1428 +1428 @@
       for (int ii = 0; ii < preferredAttribList.size(); ii++) {
         if (preferredAttribList[ii].indexOf("&") != -1) {
-          QStringList hlp = preferredAttribList[ii].split("&", Qt::SkipEmptyParts);
+          QStringList hlp = preferredAttribList[ii].split("&", QString::SkipEmptyParts);
           if (hlp.size() == 2 && hlp[0].contains(typeV2[1])) {
             preferredAttrib = hlp[1];
@@ -1677 +1677 @@
   // ---------------------------------------------------
   if (reqcAction == "Edit/Concatenate") {
-    priorList = settings.value("reqcV2Priority").toString().split(" ", Qt::SkipEmptyParts);
+    priorList = settings.value("reqcV2Priority").toString().split(" ", QString::SkipEmptyParts);
   }
 
@@ -1683 +1683 @@
   // ----------------------------
   else {
-    priorList = settings.value("rnxV2Priority").toString().split(" ", Qt::SkipEmptyParts);
+    priorList = settings.value("rnxV2Priority").toString().split(" ", QString::SkipEmptyParts);
   }
 
@@ -1689 +1689 @@
   for (int ii = 0; ii < priorList.size(); ii++) {
     if (priorList[ii].indexOf(":") != -1) {
-      QStringList hlp = priorList[ii].split(":", Qt::SkipEmptyParts);
+      QStringList hlp = priorList[ii].split(":", QString::SkipEmptyParts);
       if (hlp.size() == 2 && hlp[0].length() == 1 && hlp[0][0] == sys) {
         result.append(hlp[1]);

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -331 +331 @@
     if      (nextEpoch != -1 && nextEpoch < iEpoEnd) {
       rtnetStreamBuffer = rtnetStreamBuffer.mid(nextEpoch, nextEpochEnd);
-      lines = rtnetStreamBuffer.split('\n', Qt::SkipEmptyParts);
+      lines = rtnetStreamBuffer.split('\n', QString::SkipEmptyParts);
       if (lines.size() > 2) {
         decodeRtnetEpoch(lines);
@@ -343 +343 @@
   }
 
-  lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', Qt::SkipEmptyParts);
+  lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', QString::SkipEmptyParts);
 
   _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3);