Changeset 8204 in ntrip for trunk/BNC/src/combination

Timestamp:

Dec 11, 2017, 3:00:40 PM (7 years ago)

Author:

wiese

Message:

CHANGE: #105 toAscii deprecated

File:

• trunk/BNC/src/combination/bnccomb.cpp (modified) (11 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -366 +366 @@
     // --------------------
     if (_resTime.valid() && clkCorr._time <= _resTime) {
-      emit newMessage("bncComb: old correction: " + acName.toAscii() + " " + prn.mid(0,3).toAscii(), true);
+      emit newMessage("bncComb: old correction: " + acName.toLatin1() + " " + prn.mid(0,3).toLatin1(), true);
       continue;
     }
@@ -401 +401 @@
     t_eph* ephPrev = _ephUser.ephPrev(prn);
     if (ephLast == 0) {
-      emit newMessage("bncComb: eph not found "  + prn.mid(0,3).toAscii(), true);
+      emit newMessage("bncComb: eph not found "  + prn.mid(0,3).toLatin1(), true);
       delete newCorr;
       continue;
@@ -414 +414 @@
       }
       else {
-        emit newMessage("bncComb: eph not found "  + prn.mid(0,3).toAscii() +
-                        QString(" %1").arg(newCorr->_iod).toAscii(), true);
+        emit newMessage("bncComb: eph not found "  + prn.mid(0,3).toLatin1() +
+                        QString(" %1").arg(newCorr->_iod).toLatin1(), true);
         delete newCorr;
         continue;
@@ -469 +469 @@
     + QString(" %1 -> %2 %3").arg(corr->_iod,3).arg(lastEph->IOD(),3).arg(dC*t_CST::c, 8, 'f', 4);
 
-  emit newMessage(msg.toAscii(), false);
+  emit newMessage(msg.toLatin1(), false);
 
   corr->_iod = lastEph->IOD();
@@ -507 +507 @@
       }
     }
-    out << AC->name.toAscii().data() << ": " << AC->numObs << endl;
+    out << AC->name.toLatin1().data() << ": " << AC->numObs << endl;
   }
 
@@ -531 +531 @@
         if (AC->numObs > 0) {
           out << "Switching Master AC "
-              << _masterOrbitAC.toAscii().data() << " --> "
-              << AC->name.toAscii().data()   << " "
+              << _masterOrbitAC.toLatin1().data() << " --> "
+              << AC->name.toLatin1().data()   << " "
               << _resTime.datestr().c_str()    << " "
               << _resTime.timestr().c_str()    << endl;
@@ -752 +752 @@
       if (_antex->satCoMcorrection(corr->_prn, Mjd, xc.Rows(1,3), dx) != success) {
         dx = 0;
-        _log += "antenna not found " + corr->_prn.mid(0,3).toAscii() + '\n';
+        _log += "antenna not found " + corr->_prn.mid(0,3).toLatin1() + '\n';
       }
     }
@@ -777 +777 @@
                  "   %10.5f INTERNAL",
                  messageType, updateInt, _resTime.gpsw(), _resTime.gpssec(),
-                 corr->_prn.mid(0,3).toAscii().data(),
+                 corr->_prn.mid(0,3).toLatin1().data(),
                  corr->_iod,
                  corr->_dClkResult * t_CST::c,
@@ -800 +800 @@
 
   vector<string> errmsg;
-  _rtnetDecoder->Decode(outLines.toAscii().data(), outLines.length(), errmsg);
+  _rtnetDecoder->Decode(outLines.toLatin1().data(), outLines.length(), errmsg);
 
   // Send new Corrections to PPP etc.
@@ -1169 +1169 @@
               << _resTime.timestr().c_str()    << " "
               << "Orbit Outlier: "
-              << corr->_acName.toAscii().data() << " "
-              << prn.mid(0,3).toAscii().data()           << " "
+              << corr->_acName.toLatin1().data() << " "
+              << prn.mid(0,3).toLatin1().data()           << " "
               << corr->_iod                     << " "
               << norm                           << endl;
@@ -1203 +1203 @@
     if (AC->mountPoint == mountPoint) {
       acName = AC->name;
-      out << "Provider ID changed: AC " << AC->name.toAscii().data()   << " "
+      out << "Provider ID changed: AC " << AC->name.toLatin1().data()   << " "
           << _resTime.datestr().c_str()    << " "
           << _resTime.timestr().c_str()    << endl;