Changeset 1349 in ntrip for trunk

Timestamp:

Dec 27, 2008, 1:13:19 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncsocket.cpp (modified) (2 diffs)
• bncsocket.h (modified) (2 diffs)
• bnctabledlg.cpp (modified) (1 diff)

trunk/BNC/bncsocket.cpp

@@ -5 +5 @@
  * Class:      bncSocket
  *
- * Purpose:    Subclass QIODevice (QTcpSocket, QNetworkReply)
+ * Purpose:    Combines QTcpSocket (NTRIP v1) and  QNetworkReply (NTRIP v2)
  *
  * Author:     L. Mervart
@@ -152 +152 @@
 }
 
-// Connect to Caster, send the Request (static)
+// Connect to Caster, send the Request
 ////////////////////////////////////////////////////////////////////////////
 t_irc bncSocket::request(const QUrl& mountPoint, const QByteArray& latitude, 

trunk/BNC/bncsocket.h

@@ -3 +3 @@
 
 #include <QtNetwork>
+#include "bncconst.h"
 
 class bncSocket : public QObject {
 
  public:
-  bncSocket(QTcpSocket* socket);
+  bncSocket();
   ~bncSocket();
 
@@ -23 +24 @@
   QAbstractSocket::SocketState state() const;
 
- static bncSocket* request(const QUrl& mountPoint, QByteArray& latitude, 
-                           QByteArray& longitude, QByteArray& nmea, 
-                           int timeOut, QString& msg);
-
+  t_irc request(const QUrl& mountPoint, const QByteArray& latitude, 
+                const QByteArray& longitude, const QByteArray& nmea, 
+                int timeOut, QString& msg);
 
  private:

trunk/BNC/bnctabledlg.cpp

@@ -163 +163 @@
   QByteArray _longitude;
   QByteArray _nmea;
-  bncSocket* socket = bncSocket::request(url, _latitude, _longitude, _nmea, timeOut, msg);
-
-  if (!socket) {
+  bncSocket* socket = new bncSocket();
+  if (socket->request(url, _latitude, _longitude, 
+                      _nmea, timeOut, msg) != success) {
+    delete socket;
     return failure;
   }