Changeset 1704 in ntrip

Timestamp:

Mar 4, 2009, 1:46:49 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncnetqueryv2.cpp (modified) (2 diffs)
• bncnetqueryv2.h (modified) (1 diff)

trunk/BNC/bncnetqueryv2.cpp

@@ -54 +54 @@
 }
 
-// Error
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV2::slotError() {
-  _eventLoop->quit();
-  _status = error;
-  emit newMessage(_url.path().toAscii().replace(0,1,"")  +
-                  ": NetQuery, Error - server replied: " + 
-                  _reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray(),
-                  true);
-}
-
 // End of Request
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryV2::slotFinished() {
-  if (_status != error) {
+  _eventLoop->quit();
+  if (_reply && _reply->error() != QNetworkReply::NoError) {
+    _status = error;
+    emit newMessage(_url.path().toAscii().replace(0,1,"")  +
+                    ": NetQuery, Error - server replied: " + 
+                    _reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray(),
+                    true);
+  }
+  else {
     _status = finished;
   }
@@ -141 +138 @@
     connect(_reply, SIGNAL(readyRead()), _eventLoop, SLOT(quit()));
   }
-  connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)),
-          this, SLOT(slotError()));
 }
 

trunk/BNC/bncnetqueryv2.h

@@ -17 +17 @@
 
  private slots:
-  void slotError();
   void slotFinished();
   void slotProxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*);