Changeset 1716 in ntrip for trunk/BNC/bncnetqueryv2.cpp

Timestamp:

Mar 4, 2009, 6:13:06 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncnetqueryv2.cpp (modified) (2 diffs)

trunk/BNC/bncnetqueryv2.cpp

@@ -113 +113 @@
   // Network Request
   // ---------------
-  _request.setUrl(_url);
-  _request.setRawHeader("Host"         , _url.host().toAscii());
-  _request.setRawHeader("Ntrip-Version", "Ntrip/2.0");
-  _request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
+  QNetworkRequest request;
+  request.setUrl(_url);
+  request.setRawHeader("Host"         , _url.host().toAscii());
+  request.setRawHeader("Ntrip-Version", "Ntrip/2.0");
+  request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
   if (!_url.userName().isEmpty()) {
     QString uName = QUrl::fromPercentEncoding(_url.userName().toAscii());
     QString passW = QUrl::fromPercentEncoding(_url.password().toAscii());
-    _request.setRawHeader("Authorization", "Basic " + 
+    request.setRawHeader("Authorization", "Basic " + 
                          (uName + ":" + passW).toAscii().toBase64());
   } 
   if (!gga.isEmpty()) {
-    _request.setRawHeader("Ntrip-GGA", gga);
+    request.setRawHeader("Ntrip-GGA", gga);
   }
-  _request.setRawHeader("Connection"   , "close");
+  request.setRawHeader("Connection"   , "close");
 
-  this->startGet(full);
-}
-
-// Start Get HTTP Method
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV2::startGet(bool full) {
-
-  if (_reply) {
-    _reply->abort();
-    delete _reply;
-  }
-
-  _reply = _manager->get(_request);
+  delete _reply;
+  _reply = _manager->get(request);
 
   // Connect Signals
@@ -191 +181 @@
 }
 
-// Send NMEA String
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV2::sendNMEA(const QByteArray& gga) {
-  if (!gga.isEmpty()) {
-    _request.setRawHeader("Ntrip-GGA", gga);
-  }
-  this->startGet(false);
-}