Changeset 1362 in ntrip

Timestamp:

Dec 27, 2008, 9:39:50 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncsocket.cpp (modified) (2 diffs)
• bncsocket.h (modified) (5 diffs)

trunk/BNC/bncsocket.cpp ¶

@@ -31 +31 @@
   app->connect(this, SIGNAL(newMessage(QByteArray,bool)), 
                app, SLOT(slotMessage(const QByteArray,bool)));
-  _socket = 0;
-  _http   = 0;
-  _buffer = 0;
+  _socket    = 0;
+  _http      = 0;
+  _buffer    = 0;
+  _eventLoop = 0;
 }
 
@@ -43 +44 @@
   delete _http;
   delete _buffer;
+  delete _eventLoop;
 }
 

trunk/BNC/bncsocket.h ¶

@@ -5 +5 @@
 #include "bncconst.h"
 
-class bncSocket : public QThread {
+class bncSocket : public QObject {
  Q_OBJECT
 
@@ -18 +18 @@
   bool       waitForReadyRead(int msecs = 30000);
   qint64     read(char *data, qint64 maxlen);
-  qint64     write(const char *data, qint64 len);
-  bool       waitForBytesWritten(int msecs = 30000);
-  void       connectToHost(const QString &hostName, quint16 port, 
-                           QIODevice::OpenMode mode = QIODevice::ReadWrite);
-  bool       waitForConnected(int msecs = 30000);
   QAbstractSocket::SocketState state() const;
 
@@ -30 +25 @@
 
  signals:
+  void quitEventLoop();
   void newMessage(QByteArray msg, bool showOnScreen);
 
@@ -36 +32 @@
   void slotRequestFinished(int, bool);
   void slotReadyRead();
-  void slotSslErrors(const QList<QSslError>&);
 
  private:
@@ -46 +41 @@
   QHttp*      _http;      
   QBuffer*    _buffer;
+  QEventLoop* _eventLoop;
 };