Index: /trunk/BNC/bncnetrequest.cpp
===================================================================
--- /trunk/BNC/bncnetrequest.cpp	(revision 1334)
+++ /trunk/BNC/bncnetrequest.cpp	(revision 1335)
@@ -22,6 +22,4 @@
 using namespace std;
 
-#define AGENTVERSION "1.7"
-
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
@@ -40,5 +38,5 @@
 // Network Request
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncNetRequest::request(const QUrl& mountPoint, const QByteArray& ggaStr) {
+t_irc bncNetRequest::request(const QUrl& url) {
 
   // Network Access Manager
@@ -51,65 +49,24 @@
   }
 
-  // Proxy
-  // -----
-  QSettings settings;
-  QString proxyHost = settings.value("proxyHost").toString();
-  if (proxyHost.isEmpty()) {
-    QNetworkProxy proxy(QNetworkProxy::NoProxy);
-    _manager->setProxy(proxy);
-  }
-  else {
-    QNetworkProxy proxy(QNetworkProxy::Socks5Proxy);
-    proxy.setHostName(proxyHost);
-    proxy.setPort(settings.value("proxyPort").toInt());
-    _manager->setProxy(proxy);
-  }
-
-  connect(_manager, SIGNAL(finished(QNetworkReply*)),
-          this, SLOT(slotReplyFinished(QNetworkReply*)));
-
   // Network Request
   // ---------------
-///  QNetworkRequest request;
-///  request.setUrl(mountPoint);
-///  request.setRawHeader("User-Agent", "NTRIP BNC/" AGENTVERSION);
-///  request.setRawHeader("Host", mountPoint.host().toAscii());
-///
-///  QString uName = QUrl::fromPercentEncoding(mountPoint.userName().toAscii());
-///  QString passW = QUrl::fromPercentEncoding(mountPoint.password().toAscii());
-///  if (!uName.isEmpty() || !passW.isEmpty()) {
-///    QByteArray userAndPwd = "Basic " + (uName.toAscii() + ":" +
-///                                        passW.toAscii()).toBase64();
-///    request.setRawHeader("Authorization", userAndPwd);
-///  }
-///  
-///  if (!ggaStr.isEmpty()) {
-///    request.setRawHeader("", ggaStr);
-///  }
+  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()) {
+    request.setRawHeader("Authorization", "Basic " + 
+                 (url.userName() + ":" + url.password()).toAscii().toBase64());
+  } 
+  request.setRawHeader("Connection"   , "close");
 
-  QHttpRequestHeader header("GET", "/CBRU0", 1, 1);
+  _reply = _manager->get(request);
 
-  header.addValue("User-Agent", "NTRIP BNC/1.7");
-
-  QByteArray userAndPwd = "Basic " + QByteArray("cvutlukes:monitoring").toBase64();
-  header.addValue("Authorization", userAndPwd);
-
-  QHttp* http = new QHttp("czeposr.cuzk.cz", 2101);
-
-  connect(http, SIGNAL(readyRead(const QHttpResponseHeader&)), 
-          this, SLOT(slotReadyRead()));
-
-  QBuffer buffer;
-  http->request(header, 0, &buffer);
-
-  while (true) {
-    if (buffer.bytesAvailable()) {
-      QByteArray arr = buffer.readAll();
-      cout << arr.data();
-    }
-    else {
-      buffer.waitForReadyRead(1000);
-    }
-  }
+  connect(_reply, SIGNAL(finished()), this, SLOT(slotReplyFinished()));
+  connect(_reply, SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
+  connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)),
+          this, SLOT(slotError(QNetworkReply::NetworkError)));
+  connect(_reply, SIGNAL(sslErrors()), this, SLOT(slotSslErrors()));
 
 
@@ -119,5 +76,5 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncNetRequest::slotReplyFinished(QNetworkReply*) {
+void bncNetRequest::slotReplyFinished() {
   cout << "slotReplyFinished" << endl;
   this->deleteLater();
@@ -141,5 +98,5 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncNetRequest::slotSslErrors(QList<QSslError>) {
+void bncNetRequest::slotSslErrors() {
   cout << "slotSslError" << endl;
 }
Index: /trunk/BNC/bncnetrequest.h
===================================================================
--- /trunk/BNC/bncnetrequest.h	(revision 1334)
+++ /trunk/BNC/bncnetrequest.h	(revision 1335)
@@ -11,14 +11,13 @@
   bncNetRequest();
   ~bncNetRequest();
-
-  t_irc request(const QUrl& mountPoint, const QByteArray& ggaStr);
+  t_irc request(const QUrl& mountPoint);
 
  signals:
 
  private slots:
-  void slotReplyFinished(QNetworkReply* reply);
+  void slotReplyFinished();
   void slotReadyRead();
   void slotError(QNetworkReply::NetworkError);
-  void slotSslErrors(QList<QSslError>);
+  void slotSslErrors();
 
  private:
Index: /trunk/BNC/ntrip2test.cpp
===================================================================
--- /trunk/BNC/ntrip2test.cpp	(revision 1335)
+++ /trunk/BNC/ntrip2test.cpp	(revision 1335)
@@ -0,0 +1,20 @@
+
+#include <QApplication>
+
+#include "bncnetrequest.h"
+
+using namespace std;
+
+// Main Program
+/////////////////////////////////////////////////////////////////////////////
+int main(int argc, char *argv[]) {
+
+  QApplication app(argc, argv, false);
+
+  QUrl url;
+  bncNetRequest req;
+
+  req.request(url);
+
+  return app.exec();
+}
Index: /trunk/BNC/ntrip2test.pro
===================================================================
--- /trunk/BNC/ntrip2test.pro	(revision 1335)
+++ /trunk/BNC/ntrip2test.pro	(revision 1335)
@@ -0,0 +1,23 @@
+
+# Switch to debug configuration
+# -----------------------------
+CONFIG -= release
+CONFIG += debug
+
+# Get rid of mingwm10.dll
+# -----------------------
+win32:QMAKE_LFLAGS                 -= -mthreads
+win32:QMAKE_CXXFLAGS_EXCEPTIONS_ON -= -mthreads
+win32:QMAKE_LFLAGS_EXCEPTIONS_ON   -= -mthreads
+
+debug:OBJECTS_DIR=.obj/debug
+debug:MOC_DIR=.moc/debug
+release:OBJECTS_DIR=.obj/release
+release:MOC_DIR=.moc/release
+
+HEADERS =                bncnetrequest.h
+
+SOURCES = ntrip2test.cpp bncnetrequest.cpp
+
+QT += network
+