Changeset 1850 in ntrip for trunk/BNC/bncnetqueryv1.cpp

Timestamp:

Jun 29, 2009, 11:26:45 AM (15 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncnetqueryv1.cpp (modified) (2 diffs)

trunk/BNC/bncnetqueryv1.cpp

@@ -52 +52 @@
 }
 
-// End of Request
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV1::slotFinished() {
-  _eventLoop->quit();
-  if (_socket) { 
-    _outData = _socket->readAll();
-    _status = finished;
-  }
-}
-
 // 
 ////////////////////////////////////////////////////////////////////////////
@@ -69 +59 @@
   _socket = new QTcpSocket();
 
-  connect(_socket, SIGNAL(disconnected()), this, SLOT(slotFinished()));
+  connect(_socket, SIGNAL(disconnected()), _eventLoop, SLOT(quit()));
 
   startRequestPrivate(url, "", true);
 
-  QTimer::singleShot(10000, this, SLOT(slotFinished()));
+  QTimer::singleShot(10000, _eventLoop, SLOT(quit()));
 
   _eventLoop->exec();
 
+  outData = _socket->readAll();
+
   delete _socket; _socket = 0;
 
-  outData = _outData;
-  _outData.clear();
+  _status = finished;
 }