Changeset 1366 in ntrip for trunk/BNC/bncsocket.cpp

Timestamp:

Dec 27, 2008, 11:03:14 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncsocket.cpp (modified) (9 diffs)

trunk/BNC/bncsocket.cpp

@@ -39 +39 @@
 ////////////////////////////////////////////////////////////////////////////
 bncSocket::~bncSocket() {
-  cout << "~bncSocket" << endl;
   delete _socket;
   delete _http;
@@ -81 +80 @@
 bool bncSocket::canReadLine() const {
   if      (_http) {
-    cout << "canReadLine " << _buffer.size() << endl;
     if (_buffer.indexOf('\n') != -1) {
       return true;
@@ -102 +100 @@
   if      (_http) {
     int ind = _buffer.indexOf('\n');
-    cout << "readLine " << ind << endl;
     if (ind != -1) {
       QByteArray ret = _buffer.left(ind+1);
-      cout << ret.data();
       _buffer = _buffer.right(_buffer.size()-ind-1);
       return ret;
@@ -156 +152 @@
 
   if      (ntripVersion == "AUTO") {
-    emit newMessage("NTRIP Version AUTO not yet implemented", "true");
+    emit newMessage("NTRIP Version AUTO not yet implemented", true);
     return failure;
   }
@@ -163 +159 @@
   }
   else if (ntripVersion != "1") {
-    emit newMessage("Unknown NTRIP Version " + ntripVersion, "true");
+    emit newMessage("Unknown NTRIP Version " + ntripVersion, true);
     return failure;
   }
@@ -280 +276 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncSocket::slotRequestFinished(int id, bool error) {
-  cout << "slotRequestFinished " << id << endl;
+void bncSocket::slotRequestFinished(int /* id */, bool error) {
   if (error) {
-    cout << "error: " << _http->error() << " " 
-         << _http->errorString().toAscii().data() << endl;
+    emit newMessage("slotRequestFinished " + 
+                    _http->errorString().toAscii(), true);
   }
 }
@@ -291 +286 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncSocket::slotReadyRead(const QHttpResponseHeader&) {
-  cout << "slotReadyRead " << _buffer.size() << " "
-       << _http->bytesAvailable() << endl;
   _buffer.append(_http->readAll());
-  cout << _buffer.data();
   emit quitEventLoop();
 }
@@ -301 +293 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncSocket::slotDone(bool error) {
-  cout << "slotDone " << endl;
   if (error) {
-    cout << "error: " << _http->error() << " " 
-         << _http->errorString().toAscii().data() << endl;
-  }
+    emit newMessage("slotDone " + _http->errorString().toAscii(), true);
+  }
+  emit quitEventLoop();
 }
 
@@ -345 +336 @@
   _http->request(request);
 
-  cout << "before return" << endl;
   return success;
 }