Changeset 8127 in ntrip for trunk/BNC/src/bnccaster.cpp

Timestamp:

May 10, 2017, 3:20:54 PM (7 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/src/bnccaster.cpp (modified) (7 diffs)

trunk/BNC/src/bnccaster.cpp

@@ -208 +208 @@
           emit( newMessage(QString("%1: Old epoch %2 thrown away")
                  .arg(staID.data()).arg(string(obs._time).c_str())
-               .toAscii(), true) );
+               .toLatin1(), true) );
         }
       }
@@ -232 +232 @@
   _sockets->push_back( _server->nextPendingConnection() );
   emit( newMessage(QString("New client connection on sync port: # %1")
-                   .arg(_sockets->size()).toAscii(), true) );
+                   .arg(_sockets->size()).toLatin1(), true) );
 }
 
@@ -238 +238 @@
   _uSockets->push_back( _uServer->nextPendingConnection() );
   emit( newMessage(QString("New client connection on usync port: # %1")
-                   .arg(_uSockets->size()).toAscii(), true) );
+                   .arg(_uSockets->size()).toLatin1(), true) );
 }
 
@@ -286 +286 @@
   _staIDs.removeAll(staID);
   emit( newMessage(
-           QString("Decoding %1 stream(s)").arg(_staIDs.size()).toAscii(), true) );
+           QString("Decoding %1 stream(s)").arg(_staIDs.size()).toLatin1(), true) );
   if (_staIDs.size() == 0) {
     emit(newMessage("bncCaster: Last get thread terminated", true));
@@ -406 +406 @@
     // ----------------
     if (!existFlg) {
-      QByteArray format    = hlp[1].toAscii();
-      QByteArray latitude  = hlp[3].toAscii();
-      QByteArray longitude = hlp[4].toAscii();
-      QByteArray nmea      = hlp[5].toAscii();
-      QByteArray ntripVersion = hlp[6].toAscii();
+      QByteArray format    = hlp[1].toLatin1();
+      QByteArray latitude  = hlp[3].toLatin1();
+      QByteArray longitude = hlp[4].toLatin1();
+      QByteArray nmea      = hlp[5].toLatin1();
+      QByteArray ntripVersion = hlp[6].toLatin1();
 
       bncGetThread* getThread = new bncGetThread(url, format, latitude,
@@ -450 +450 @@
                            + BNC_CORE->confFileName()
                            + ", %1 stream(s)")
-                            .arg(_threads.count()).toAscii(), true) );
+                            .arg(_threads.count()).toLatin1(), true) );
 
   // (Re-) Start the configuration timer
@@ -555 +555 @@
   _miscSockets->push_back( _miscServer->nextPendingConnection() );
   emit( newMessage(QString("New client connection on Miscellaneous Output Port: # %1")
-                   .arg(_miscSockets->size()).toAscii(), true) );
-}
+                   .arg(_miscSockets->size()).toLatin1(), true) );
+}