Changeset 1391 in ntrip

Timestamp:

Dec 29, 2008, 11:15:50 AM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnccaster.cpp (modified) (3 diffs)
• bncgetthread.cpp (modified) (1 diff)
• bncnetqueryv2.cpp (modified) (1 diff)
• bncnetqueryv2.h (modified) (1 diff)

trunk/BNC/bnccaster.cpp

@@ -39 +39 @@
  * -----------------------------------------------------------------------*/
 
-#include <iostream>
-
 #include <math.h>
 #include <unistd.h>
@@ -49 +47 @@
 #include "bncutils.h"
 #include "RTCM/GPSDecoder.h"
-
-using namespace std;
 
 // Constructor
@@ -121 +117 @@
   while(it.hasNext()){
     bncGetThread* thread = it.next();
-    cout << "~bncCaster A" << endl;
     thread->terminate();
-    cout << "~bncCaster B" << endl;
     thread->wait();
-    cout << "~bncCaster C" << endl;
     delete thread;
-    cout << "~bncCaster D" << endl;
   }
   delete _out;

trunk/BNC/bncgetthread.cpp

@@ -302 +302 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncGetThread::terminate() {
-  cout << "terminate a" << endl;
   if (_query) {
     _query->stop();
   }
-  cout << "terminate b" << endl;
   QThread::terminate();
 }

trunk/BNC/bncnetqueryv2.cpp

@@ -37 +37 @@
 }
 
-// 
+// Stop (quit even loop)
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryV2::stop() {
-  _reply->abort();
   _eventLoop->quit();
 }

trunk/BNC/bncnetqueryv2.h

@@ -11 +11 @@
   virtual ~bncNetQueryV2();
 
+  virtual void stop();
   virtual void waitForRequestResult(const QUrl& url, QByteArray& outData);
   virtual void startRequest(const QUrl& url, const QByteArray& gga);