Index: trunk/BNC/bnc.pro
===================================================================
--- trunk/BNC/bnc.pro	(revision 1377)
+++ trunk/BNC/bnc.pro	(revision 1378)
@@ -29,5 +29,5 @@
           bnccaster.h bncrinex.h bncapp.h bncutils.h   bnchlpdlg.h    \
           bncconst.h bnchtml.h bnctableitem.h bnczerodecoder.h        \
-          bncsocket.h bncnetquery.h                                   \
+          bncsocket.h bncnetquery.h bncnetqueryv2.h                   \
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
@@ -47,5 +47,5 @@
           bnccaster.cpp bncrinex.cpp bncapp.cpp bncutils.cpp          \
           bncconst.cpp bnchtml.cpp bnchlpdlg.cpp bnctableitem.cpp     \
-          bnczerodecoder.cpp bncsocket.cpp bncnetquery.cpp            \
+          bnczerodecoder.cpp bncsocket.cpp bncnetqueryv2.cpp          \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \
Index: trunk/BNC/bncnetquery.cpp
===================================================================
--- trunk/BNC/bncnetquery.cpp	(revision 1377)
+++ 	(revision )
@@ -1,149 +1,0 @@
-/* -------------------------------------------------------------------------
- * BKG NTRIP Client
- * -------------------------------------------------------------------------
- *
- * Class:      bncNetQuery
- *
- * Purpose:    Blocking Network Requests
- *
- * Author:     L. Mervart
- *
- * Created:    27-Dec-2008
- *
- * Changes:    
- *
- * -----------------------------------------------------------------------*/
-
-#include <iostream>
-#include <iomanip>
-
-#include "bncnetquery.h"
-#include "bncapp.h"
-
-using namespace std;
-
-#define BNCVERSION "1.7"
-
-// Constructor
-////////////////////////////////////////////////////////////////////////////
-bncNetQuery::bncNetQuery() {
-
-  connect(this, SIGNAL(newMessage(QByteArray,bool)), 
-          (bncApp*) qApp, SLOT(slotMessage(const QByteArray,bool)));
-
-  _manager   = new QNetworkAccessManager(this);
-  _reply     = 0;
-  _eventLoop = new QEventLoop(this);
-
-  _status    = init;
-}
-
-// Destructor
-////////////////////////////////////////////////////////////////////////////
-bncNetQuery::~bncNetQuery() {
-  delete _eventLoop;
-  delete _reply;
-  delete _manager;
-}
-
-// Error
-////////////////////////////////////////////////////////////////////////////
-void bncNetQuery::slotError(QNetworkReply::NetworkError) {
-  _status = error;
-  cout << "slotError " << endl;
-  emit newMessage("slotError " + _reply->errorString().toAscii(), true);
-  _eventLoop->quit();
-}
-
-void bncNetQuery::slotFinished() {
-  if (_status != error) {
-    _status = finished;
-  }
-  cout << "slotFinished" << endl;
-}
-
-void bncNetQuery::slotReadyRead() {
-  cout << "slotReadyRead" << endl;
-}
-
-// Start request, block till the next read (public)
-////////////////////////////////////////////////////////////////////////////
-void bncNetQuery::startRequest(const QUrl& url) {
-  startRequest(url, false);
-}
-
-// Start request
-////////////////////////////////////////////////////////////////////////////
-void bncNetQuery::startRequest(const QUrl& url, bool full) {
-
-  _status = running;
-
-  // Default scheme and path
-  // -----------------------
-  QUrl urlLoc(url);
-  if (urlLoc.scheme().isEmpty()) {
-    urlLoc.setScheme("http");
-  }
-  if (urlLoc.path().isEmpty()) {
-    urlLoc.setPath("/");
-  }
-
-  // Network Request
-  // ---------------
-  QNetworkRequest request;
-  request.setUrl(urlLoc);
-  request.setRawHeader("Host"         , urlLoc.host().toAscii());
-  request.setRawHeader("Ntrip-Version", "NTRIP/2.0");
-  request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
-  if (!urlLoc.userName().isEmpty()) {
-    request.setRawHeader("Authorization", "Basic " + 
-           (urlLoc.userName() + ":" + urlLoc.password()).toAscii().toBase64());
-  } 
-  request.setRawHeader("Connection"   , "close");
-
-  _reply = _manager->get(request);
-
-  // Connect Signals
-  // ---------------
-  connect(_reply, SIGNAL(finished()), this, SLOT(slotFinished()));
-  connect(_reply, SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
-
-  connect(_reply, SIGNAL(finished()), _eventLoop, SLOT(quit()));
-  if (!full) {
-    connect(_reply, SIGNAL(readyRead()), _eventLoop, SLOT(quit()));
-  }
-  connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)),
-          this, SLOT(slotError(QNetworkReply::NetworkError)));
-}
-
-// Start Request, wait for its completion
-////////////////////////////////////////////////////////////////////////////
-void bncNetQuery::waitForRequestResult(const QUrl& url, QByteArray& outData) {
-
-  // Send Request
-  // ------------
-  startRequest(url, true);
-
-  // Wait Loop
-  // ---------
-  _eventLoop->exec();
-
-  // Copy Data and Return
-  // --------------------
-  outData = _reply->readAll();
-}
-
-// Wait for next data
-////////////////////////////////////////////////////////////////////////////
-void bncNetQuery::waitForReadyRead(QByteArray& outData) {
-
-  // Wait Loop
-  // ---------
-  if (!_reply->bytesAvailable()) {
-    _eventLoop->exec();
-  }
-
-  // Append Data
-  // -----------
-  outData.append(_reply->readAll());
-}
Index: trunk/BNC/bncnetqueryv2.cpp
===================================================================
--- trunk/BNC/bncnetqueryv2.cpp	(revision 1378)
+++ trunk/BNC/bncnetqueryv2.cpp	(revision 1378)
@@ -0,0 +1,149 @@
+/* -------------------------------------------------------------------------
+ * BKG NTRIP Client
+ * -------------------------------------------------------------------------
+ *
+ * Class:      bncNetQueryV2
+ *
+ * Purpose:    Blocking Network Requests (NTRIP Version 2)
+ *
+ * Author:     L. Mervart
+ *
+ * Created:    27-Dec-2008
+ *
+ * Changes:    
+ *
+ * -----------------------------------------------------------------------*/
+
+#include <iostream>
+#include <iomanip>
+
+#include "bncNetQueryV2.h"
+#include "bncapp.h"
+
+using namespace std;
+
+#define BNCVERSION "1.7"
+
+// Constructor
+////////////////////////////////////////////////////////////////////////////
+bncNetQueryV2::bncNetQueryV2() {
+
+  connect(this, SIGNAL(newMessage(QByteArray,bool)), 
+          (bncApp*) qApp, SLOT(slotMessage(const QByteArray,bool)));
+
+  _manager   = new QNetworkAccessManager(this);
+  _reply     = 0;
+  _eventLoop = new QEventLoop(this);
+
+  _status    = init;
+}
+
+// Destructor
+////////////////////////////////////////////////////////////////////////////
+bncNetQueryV2::~bncNetQueryV2() {
+  delete _eventLoop;
+  delete _reply;
+  delete _manager;
+}
+
+// Error
+////////////////////////////////////////////////////////////////////////////
+void bncNetQueryV2::slotError(QNetworkReply::NetworkError) {
+  _status = error;
+  cout << "slotError " << endl;
+  emit newMessage("slotError " + _reply->errorString().toAscii(), true);
+  _eventLoop->quit();
+}
+
+void bncNetQueryV2::slotFinished() {
+  if (_status != error) {
+    _status = finished;
+  }
+  cout << "slotFinished" << endl;
+}
+
+void bncNetQueryV2::slotReadyRead() {
+  cout << "slotReadyRead" << endl;
+}
+
+// Start request, block till the next read (public)
+////////////////////////////////////////////////////////////////////////////
+void bncNetQueryV2::startRequest(const QUrl& url) {
+  startRequest(url, false);
+}
+
+// Start request
+////////////////////////////////////////////////////////////////////////////
+void bncNetQueryV2::startRequest(const QUrl& url, bool full) {
+
+  _status = running;
+
+  // Default scheme and path
+  // -----------------------
+  QUrl urlLoc(url);
+  if (urlLoc.scheme().isEmpty()) {
+    urlLoc.setScheme("http");
+  }
+  if (urlLoc.path().isEmpty()) {
+    urlLoc.setPath("/");
+  }
+
+  // Network Request
+  // ---------------
+  QNetworkRequest request;
+  request.setUrl(urlLoc);
+  request.setRawHeader("Host"         , urlLoc.host().toAscii());
+  request.setRawHeader("Ntrip-Version", "NTRIP/2.0");
+  request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
+  if (!urlLoc.userName().isEmpty()) {
+    request.setRawHeader("Authorization", "Basic " + 
+           (urlLoc.userName() + ":" + urlLoc.password()).toAscii().toBase64());
+  } 
+  request.setRawHeader("Connection"   , "close");
+
+  _reply = _manager->get(request);
+
+  // Connect Signals
+  // ---------------
+  connect(_reply, SIGNAL(finished()), this, SLOT(slotFinished()));
+  connect(_reply, SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
+
+  connect(_reply, SIGNAL(finished()), _eventLoop, SLOT(quit()));
+  if (!full) {
+    connect(_reply, SIGNAL(readyRead()), _eventLoop, SLOT(quit()));
+  }
+  connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)),
+          this, SLOT(slotError(QNetworkReply::NetworkError)));
+}
+
+// Start Request, wait for its completion
+////////////////////////////////////////////////////////////////////////////
+void bncNetQueryV2::waitForRequestResult(const QUrl& url, QByteArray& outData) {
+
+  // Send Request
+  // ------------
+  startRequest(url, true);
+
+  // Wait Loop
+  // ---------
+  _eventLoop->exec();
+
+  // Copy Data and Return
+  // --------------------
+  outData = _reply->readAll();
+}
+
+// Wait for next data
+////////////////////////////////////////////////////////////////////////////
+void bncNetQueryV2::waitForReadyRead(QByteArray& outData) {
+
+  // Wait Loop
+  // ---------
+  if (!_reply->bytesAvailable()) {
+    _eventLoop->exec();
+  }
+
+  // Append Data
+  // -----------
+  outData.append(_reply->readAll());
+}
Index: trunk/BNC/bncnetqueryv2.h
===================================================================
--- trunk/BNC/bncnetqueryv2.h	(revision 1378)
+++ trunk/BNC/bncnetqueryv2.h	(revision 1378)
@@ -0,0 +1,34 @@
+#ifndef BNCNETQUERYV2_H
+#define BNCNETQUERYV2_H
+
+#include "bncnetquery.h"
+
+class bncNetQueryV2 : public bncNetQuery {
+ Q_OBJECT
+
+ public:
+  enum queryStatus {init, running, finished, error};
+
+  bncNetQueryV2();
+  virtual ~bncNetQueryV2();
+
+  virtual void waitForRequestResult(const QUrl& url, QByteArray& outData);
+  virtual void startRequest(const QUrl& url);
+  virtual void waitForReadyRead(QByteArray& outData);
+
+ signals:
+
+ private slots:
+  void slotError(QNetworkReply::NetworkError);
+  void slotReadyRead();
+  void slotFinished();
+
+ private:
+  void startRequest(const QUrl& url, bool full);
+
+  QNetworkAccessManager* _manager;
+  QNetworkReply*         _reply;
+  QEventLoop*            _eventLoop;
+};
+
+#endif
Index: trunk/BNC/bnctabledlg.cpp
===================================================================
--- trunk/BNC/bnctabledlg.cpp	(revision 1377)
+++ trunk/BNC/bnctabledlg.cpp	(revision 1378)
@@ -79,5 +79,5 @@
 
   _ntripVersionComboBox = new QComboBox();
-  _ntripVersionComboBox->addItems(QString("1,2,AUTO").split(","));
+  _ntripVersionComboBox->addItems(QString("1,2").split(","));
   int kk = _ntripVersionComboBox->findText(settings.value("ntripVersion").toString());
   if (kk != -1) {