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

Timestamp:

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

Author:

wiese

Message:

CHANGE: #105 toAscii deprecated

Location:

trunk/BNC/src/upload

Files:

• bncrtnetuploadcaster.cpp (modified) (4 diffs)
• bncuploadcaster.cpp (modified) (3 diffs)

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -280 +280 @@
   // Read first line (with epoch time)
   // ---------------------------------
-  QTextStream in(lines[0].toAscii());
+  QTextStream in(lines[0].toLatin1());
   QString hlp;
   int year, month, day, hour, min;
@@ -291 +291 @@
       "bncRtnetUploadCaster: decode " + QByteArray(epoTime.datestr().c_str())
           + " " + QByteArray(epoTime.timestr().c_str()) + " "
-          + _casterID.toAscii(), false));
+          + _casterID.toLatin1(), false));
 
   struct ClockOrbit co;
@@ -369 +369 @@
     t_prn prn;
 
-    QTextStream in(lines[ii].toAscii());
+    QTextStream in(lines[ii].toLatin1());
 
     in >> key;
@@ -401 +401 @@
     }
     // satellite specific parameters
-    char sys = key.mid(0, 1).at(0).toAscii();
+    char sys = key.mid(0, 1).at(0).toLatin1();
     int number = key.mid(1, 2).toInt();
     int flags = 0;

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -90 +90 @@
         _outSocket->write(_outBuffer);
         _outSocket->flush();
-        emit newBytes(_mountpoint.toAscii(), _outBuffer.size());
+        emit newBytes(_mountpoint.toLatin1(), _outBuffer.size());
       }
     }
@@ -140 +140 @@
     delete _outSocket;
     _outSocket = 0;
-    emit(newMessage("Broadcaster: Connect timeout for " + _mountpoint.toAscii(), true));
+    emit(newMessage("Broadcaster: Connect timeout for " + _mountpoint.toLatin1(), true));
     return;
   }
 
-  QByteArray msg = "SOURCE " + _password.toAscii() + " /" +
-                   _mountpoint.toAscii() + "\r\n" +
+  QByteArray msg = "SOURCE " + _password.toLatin1() + " /" +
+                   _mountpoint.toLatin1() + "\r\n" +
                    "Source-Agent: NTRIP BNC/" BNCVERSION "\r\n\r\n";
 
@@ -157 +157 @@
     delete _outSocket;
     _outSocket = 0;
-    emit(newMessage("Broadcaster: Connection broken for " + _mountpoint.toAscii(), true));
+    emit(newMessage("Broadcaster: Connection broken for " + _mountpoint.toLatin1(), true));
   }
   else {
-    emit(newMessage("Broadcaster: Connection opened for " + _mountpoint.toAscii(), true));
+    emit(newMessage("Broadcaster: Connection opened for " + _mountpoint.toLatin1(), true));
     _sOpenTrial = 0;
   }