Index: /trunk/BNC/bncnetqueryv1.cpp
===================================================================
--- /trunk/BNC/bncnetqueryv1.cpp	(revision 1383)
+++ /trunk/BNC/bncnetqueryv1.cpp	(revision 1384)
@@ -40,68 +40,16 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV1::close() {
-  if (_socket) {
-    _socket->close();
-  }
+void bncNetQueryV1::waitForRequestResult(const QUrl& url, QByteArray& outData) {
 }
 
 // 
 ////////////////////////////////////////////////////////////////////////////
-qint64 bncNetQueryV1::bytesAvailable() const {
-  if (_socket) {
-    return _socket->bytesAvailable();
-  }
-  else {
-    return 0;
-  }
-}
+void bncNetQueryV1::waitForReadyRead(QByteArray& outData) {
 
-// 
-////////////////////////////////////////////////////////////////////////////
-bool bncNetQueryV1::canReadLine() const {
-  if (_socket) {
-    return _socket->canReadLine();
-  }
-  else {
-    return false;
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-QByteArray bncNetQueryV1::readLine() {
-  if (_socket) {
-    return _socket->readLine();
-  }
-  else {
-    return "";
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV1::waitForReadyRead(int msecs) {
-  if (_socket) {
-    _socket->waitForReadyRead(msecs);
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-QByteArray bncNetQueryV1::read(qint64 maxSize) {
-  if (_socket) {
-    return _socket->read(maxSize);
-  }
-  else {
-    return "";
-  }
 }
 
 // Connect to Caster, send the Request
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncNetQueryV1::request(const QUrl& mountPoint, const QByteArray& latitude, 
-                         const QByteArray& longitude, const QByteArray& nmea,
-                         const QByteArray& ntripVersion, 
-                         int timeOut, QString& msg) {
+void bncNetQueryV1::startRequest(const QUrl& url, const QByteArray& gga) {
 
   delete _socket;
@@ -161,5 +109,5 @@
   // --------------------------------
   if ((nmea == "yes") && (hlp.path().length() > 2) && (hlp.path().indexOf(".skl") < 0)) {
-    reqStr += "$" + ggaString(latitude, longitude) + "\r\n";
+    reqStr += ggaString(latitude, longitude) + "\r\n";
   }
 
Index: /trunk/BNC/bncnetqueryv1.h
===================================================================
--- /trunk/BNC/bncnetqueryv1.h	(revision 1383)
+++ /trunk/BNC/bncnetqueryv1.h	(revision 1384)
@@ -5,28 +5,14 @@
 
 class bncNetQueryV1 : public bncNetQuery {
- Q_OBJECT
-
  public:
   bncNetQueryV1();
-  ~bncNetQueryV1();
+  virtual ~bncNetQueryV1();
 
-  void       close();
-  qint64     bytesAvailable() const;
-  bool       canReadLine() const;
-  QByteArray readLine();
-  void       waitForReadyRead(int msecs = 30000);
-  QByteArray read(qint64 maxSize);
-
-  t_irc request(const QUrl& mountPoint, const QByteArray& latitude, 
-                const QByteArray& longitude, const QByteArray& nmea, 
-                const QByteArray& ntripVersion, int timeOut, QString& msg);
-
- signals:
-  void newMessage(QByteArray msg, bool showOnScreen);
-
- private slots:
+  virtual void waitForRequestResult(const QUrl& url, QByteArray& outData);
+  virtual void startRequest(const QUrl& url, const QByteArray& gga);
+  virtual void waitForReadyRead(QByteArray& outData);
 
  private:
-  QTcpSocket*            _socket;
+  QTcpSocket* _socket;
 };
 
Index: /trunk/BNC/bncnetqueryv2.h
===================================================================
--- /trunk/BNC/bncnetqueryv2.h	(revision 1383)
+++ /trunk/BNC/bncnetqueryv2.h	(revision 1384)
@@ -15,6 +15,4 @@
   virtual void waitForReadyRead(QByteArray& outData);
 
- signals:
-
  private slots:
   void slotError(QNetworkReply::NetworkError);
Index: /trunk/BNC/bncutils.cpp
===================================================================
--- /trunk/BNC/bncutils.cpp	(revision 1383)
+++ /trunk/BNC/bncutils.cpp	(revision 1384)
@@ -151,5 +151,5 @@
   ss=(double)ttime.second()+0.001*ttime.msec();
   QString gga;
-  gga += "GPGGA,";
+  gga += "$GPGGA,";
   gga += QString("%1%2%3,").arg((int)hh, 2, 10, QLatin1Char('0')).arg((int)mm, 2, 10, QLatin1Char('0')).arg((int)ss, 2, 10, QLatin1Char('0'));
   gga += QString("%1%2,").arg((int)lat_deg,2, 10, QLatin1Char('0')).arg(lat_min, 7, 'f', 4, QLatin1Char('0'));