Changeset 8203 in ntrip for trunk/BNC/src/bncnetqueryrtp.cpp

Timestamp:

Dec 11, 2017, 2:42:03 PM (6 years ago)

Author:

stoecker

Message:

see #105 - some changes for Qt5

File:

• trunk/BNC/src/bncnetqueryrtp.cpp (modified) (6 diffs)

trunk/BNC/src/bncnetqueryrtp.cpp

@@ -48 +48 @@
   if (_socket) {
     QByteArray reqStr = "TEARDOWN " + _url.toEncoded() + " RTSP/1.0\r\n"
-                      + "CSeq: " + QString("%1").arg(++_CSeq).toAscii() + "\r\n"
+                      + "CSeq: " + QString("%1").arg(++_CSeq).toLatin1() + "\r\n"
                       + "Session: " + _session + "\r\n"
                       + "\r\n";
@@ -60 +60 @@
   if (_socket) {
     QByteArray reqStr = "GET_PARAMETER " + _url.toEncoded() + " RTSP/1.0\r\n"
-                      + "CSeq: " + QString("%1").arg(++_CSeq).toAscii() + "\r\n"
+                      + "CSeq: " + QString("%1").arg(++_CSeq).toLatin1() + "\r\n"
                       + "Session: " + _session + "\r\n"
                       + "\r\n";
@@ -126 +126 @@
   // --------------
   if (_socket->waitForConnected(timeOut)) {
-    QString uName = QUrl::fromPercentEncoding(_url.userName().toAscii());
-    QString passW = QUrl::fromPercentEncoding(_url.password().toAscii());
+    QString uName = QUrl::fromPercentEncoding(_url.userName().toLatin1());
+    QString passW = QUrl::fromPercentEncoding(_url.password().toLatin1());
     QByteArray userAndPwd;
     
     if(!uName.isEmpty() || !passW.isEmpty()) {
-      userAndPwd = "Authorization: Basic " + (uName.toAscii() + ":" +
-      passW.toAscii()).toBase64() + "\r\n";
+      userAndPwd = "Authorization: Basic " + (uName.toLatin1() + ":" +
+      passW.toLatin1()).toBase64() + "\r\n";
     }
 
@@ -141 +141 @@
     _udpSocket->bind(0);
     connect(_udpSocket, SIGNAL(readyRead()), _eventLoop, SLOT(quit()));
-    QByteArray clientPort = QString("%1").arg(_udpSocket->localPort()).toAscii();
+    QByteArray clientPort = QString("%1").arg(_udpSocket->localPort()).toLatin1();
 
     QByteArray reqStr;
     reqStr = "SETUP " + _url.toEncoded() + " RTSP/1.0\r\n"
-           + "CSeq: " + QString("%1").arg(++_CSeq).toAscii() + "\r\n"
+           + "CSeq: " + QString("%1").arg(++_CSeq).toLatin1() + "\r\n"
            + "Ntrip-Version: Ntrip/2.0\r\n"
            + "Ntrip-Component: Ntripclient\r\n"
@@ -167 +167 @@
         while (!line.isEmpty()) {
           if (line.indexOf("Session:") == 0) {
-            _session = line.mid(9).toAscii();
+            _session = line.mid(9).toLatin1();
           }
           int iSrv = line.indexOf("server_port=");
           if (iSrv != -1) {
-            serverPort = line.mid(iSrv+12).toAscii();
+            serverPort = line.mid(iSrv+12).toLatin1();
           }
           line = in.readLine();
@@ -203 +203 @@
 
           reqStr = "PLAY " + _url.toEncoded() + " RTSP/1.0\r\n"
-                 + "CSeq: " + QString("%1").arg(++_CSeq).toAscii() + "\r\n"
+                 + "CSeq: " + QString("%1").arg(++_CSeq).toLatin1() + "\r\n"
                  + "Session: " + _session + "\r\n"
                  + "\r\n";