Index: trunk/BNC/bncnetquery.h
===================================================================
--- trunk/BNC/bncnetquery.h	(revision 1715)
+++ trunk/BNC/bncnetquery.h	(revision 1716)
@@ -22,5 +22,9 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga) = 0;
   virtual void waitForReadyRead(QByteArray& outData) = 0;
-  virtual void sendNMEA(const QByteArray& gga) = 0;
+  
+  void sendNMEA(const QByteArray& gga) {
+    stop();
+    startRequest(_url, gga);
+  }
 
   queryStatus status() const {return _status;}
Index: trunk/BNC/bncnetqueryrtp.cpp
===================================================================
--- trunk/BNC/bncnetqueryrtp.cpp	(revision 1715)
+++ trunk/BNC/bncnetqueryrtp.cpp	(revision 1716)
@@ -238,7 +238,2 @@
 }
 
-// Send NMEA String
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryRtp::sendNMEA(const QByteArray& gga) {
-  startRequest(_url, gga);
-}
Index: trunk/BNC/bncnetqueryrtp.h
===================================================================
--- trunk/BNC/bncnetqueryrtp.h	(revision 1715)
+++ trunk/BNC/bncnetqueryrtp.h	(revision 1716)
@@ -14,5 +14,4 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
-  virtual void sendNMEA(const QByteArray& gga);
 
  private slots:
Index: trunk/BNC/bncnetqueryv0.cpp
===================================================================
--- trunk/BNC/bncnetqueryv0.cpp	(revision 1715)
+++ trunk/BNC/bncnetqueryv0.cpp	(revision 1716)
@@ -130,8 +130,2 @@
 }
 
-// Send NMEA String
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV0::sendNMEA(const QByteArray& /* gga */) {
-  emit newMessage(_url.path().toAscii().replace(0,1,"") 
-                  + ": sending NMEA not impelmented for NTRIP v0", true);
-}
Index: trunk/BNC/bncnetqueryv0.h
===================================================================
--- trunk/BNC/bncnetqueryv0.h	(revision 1715)
+++ trunk/BNC/bncnetqueryv0.h	(revision 1716)
@@ -13,5 +13,4 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
-  virtual void sendNMEA(const QByteArray& gga);
 
  private:
Index: trunk/BNC/bncnetqueryv1.cpp
===================================================================
--- trunk/BNC/bncnetqueryv1.cpp	(revision 1715)
+++ trunk/BNC/bncnetqueryv1.cpp	(revision 1716)
@@ -219,7 +219,2 @@
 }
 
-// Send NMEA String
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV1::sendNMEA(const QByteArray& gga) {
-  startRequest(_url, gga);
-}
Index: trunk/BNC/bncnetqueryv1.h
===================================================================
--- trunk/BNC/bncnetqueryv1.h	(revision 1715)
+++ trunk/BNC/bncnetqueryv1.h	(revision 1716)
@@ -13,5 +13,4 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
-  virtual void sendNMEA(const QByteArray& gga);
 
  private:
Index: trunk/BNC/bncnetqueryv2.cpp
===================================================================
--- trunk/BNC/bncnetqueryv2.cpp	(revision 1715)
+++ trunk/BNC/bncnetqueryv2.cpp	(revision 1716)
@@ -113,32 +113,22 @@
   // 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,10 +181,2 @@
 }
 
-// Send NMEA String
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV2::sendNMEA(const QByteArray& gga) {
-  if (!gga.isEmpty()) {
-    _request.setRawHeader("Ntrip-GGA", gga);
-  }
-  this->startGet(false);
-}
Index: trunk/BNC/bncnetqueryv2.h
===================================================================
--- trunk/BNC/bncnetqueryv2.h	(revision 1715)
+++ trunk/BNC/bncnetqueryv2.h	(revision 1716)
@@ -15,5 +15,4 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
-  virtual void sendNMEA(const QByteArray& gga);
 
  private slots:
@@ -23,9 +22,7 @@
  private:
   void startRequestPrivate(const QUrl& url, const QByteArray& gga, bool full);
-  void startGet(bool full);
 
   QNetworkAccessManager* _manager;
   QNetworkReply*         _reply;
-  QNetworkRequest        _request;
   QEventLoop*            _eventLoop;
   bool                   _firstData;