Changeset 8203 in ntrip for trunk/BNC/src/bncnetqueryv1.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/bncnetqueryv1.cpp (modified) (7 diffs)

trunk/BNC/src/bncnetqueryv1.cpp

@@ -91 +91 @@
         _socket = 0;
         _status = error;
-        emit newMessage(_url.path().toAscii().replace(0,1,"")
-                        + ": " + errStr.toAscii(), true);
+        emit newMessage(_url.path().toLatin1().replace(0,1,"")
+                        + ": " + errStr.toLatin1(), true);
         return;
       }
@@ -157 +157 @@
      _socket = 0;
      _status = error;
-     emit newMessage(_url.path().toAscii().replace(0,1,"")
+     emit newMessage(_url.path().toLatin1().replace(0,1,"")
                      + ": Write timeout", true);
      return;
@@ -208 +208 @@
   // Send Request
   // ------------
-  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";
   }
 
@@ -220 +220 @@
   if ( proxyHost.isEmpty() ) {
     if (_url.path().indexOf("/") != 0) _url.setPath("/");
-    reqStr = "GET " + _url.path().toAscii() + " HTTP/1.0\r\n"
+    reqStr = "GET " + _url.path().toLatin1() + " HTTP/1.0\r\n"
              + "User-Agent: NTRIP BNC/" BNCVERSION " (" BNC_OS ")\r\n"
-             + "Host: " + _url.host().toAscii() + "\r\n"
+             + "Host: " + _url.host().toLatin1() + "\r\n"
              + userAndPwd + "\r\n";
   } else {
     reqStr = "GET " + _url.toEncoded() + " HTTP/1.0\r\n"
              + "User-Agent: NTRIP BNC/" BNCVERSION " (" BNC_OS ")\r\n"
-             + "Host: " + _url.host().toAscii() + "\r\n"
+             + "Host: " + _url.host().toLatin1() + "\r\n"
              + userAndPwd + "\r\n";
   }
@@ -243 +243 @@
     _socket = 0;
     _status = error;
-    emit newMessage(_url.path().toAscii().replace(0,1,"")
+    emit newMessage(_url.path().toLatin1().replace(0,1,"")
                     + ": Write timeout", true);
     return;
@@ -294 +294 @@
         _socket = 0;
         _status = error;
-        emit newMessage(_url.path().toAscii().replace(0,1,"") 
+        emit newMessage(_url.path().toLatin1().replace(0,1,"") 
                         + ": Response timeout", true);
         return;
@@ -303 +303 @@
       _socket = 0;
       _status = error;
-      emit newMessage(_url.path().toAscii().replace(0,1,"") 
+      emit newMessage(_url.path().toLatin1().replace(0,1,"") 
                       + ": Wrong caster response\n" 
-                      + response.join("").toAscii(), true);
+                      + response.join("").toLatin1(), true);
     }
   }