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

Timestamp:

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

Author:

wiese

Message:

CHANGE: #105 toAscii deprecated

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (4 diffs)
• RTCM3coDecoder.cpp (modified) (2 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -824 +824 @@
   else if ((type % 10) < 3) {
     emit(newMessage(QString("%1: Block %2 contain partial data! Ignored!")
-        .arg(_staID).arg(type).toAscii(), true));
+        .arg(_staID).arg(type).toLatin1(), true));
   }
   if (!syncf) {
@@ -1482 +1482 @@
        * else. */
       if ((id >= 1057 && id <= 1068) || (id >= 1240 && id <= 1270)) {
-        if (!_coDecoders.contains(_staID.toAscii()))
-          _coDecoders[_staID.toAscii()] = new RTCM3coDecoder(_staID);
-        RTCM3coDecoder* coDecoder = _coDecoders[_staID.toAscii()];
+        if (!_coDecoders.contains(_staID.toLatin1()))
+          _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID);
+        RTCM3coDecoder* coDecoder = _coDecoders[_staID.toLatin1()];
         if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize,
             errmsg) == success) {
@@ -1500 +1500 @@
             emit(newMessage(
                 QString("%1: Block %2 contain partial data! Ignored!")
-                    .arg(_staID).arg(id).toAscii(), true));
+                    .arg(_staID).arg(id).toLatin1(), true));
             break; /* no use decoding partial data ATM, remove break when data can be used */
           case 1002:
@@ -1511 +1511 @@
             emit(newMessage(
                 QString("%1: Block %2 contain partial data! Ignored!")
-                    .arg(_staID).arg(id).toAscii(), true));
+                    .arg(_staID).arg(id).toLatin1(), true));
             break; /* no use decoding partial data ATM, remove break when data can be used */
           case 1010:

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -146 +146 @@
     delete _out;
     if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked) {
-      _out = new ofstream( _fileName.toAscii().data(), ios_base::out | ios_base::app );
+      _out = new ofstream( _fileName.toLatin1().data(), ios_base::out | ios_base::app );
     }
     else {
-      _out = new ofstream( _fileName.toAscii().data() );
+      _out = new ofstream( _fileName.toLatin1().data() );
     }
   }
@@ -560 +560 @@
 
   if (alreadySet && different) {
-    emit newMessage("RTCM3coDecoder: Provider Changed: " + _staID.toAscii(), true);
+    emit newMessage("RTCM3coDecoder: Provider Changed: " + _staID.toLatin1(), true);
     emit providerIDChanged(_staID);
   }