Changeset 7661 in ntrip for trunk/BNC/src/upload/bncuploadcaster.cpp

Timestamp:

Jan 6, 2016, 5:45:52 PM (8 years ago)

Author:

stuerze

Message:

some code cleanup

File:

• trunk/BNC/src/upload/bncuploadcaster.cpp (modified) (6 diffs)

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -11 +11 @@
  * Created:    29-Mar-2011
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
 
 #include <math.h>
-#include "bncuploadcaster.h" 
+#include "bncuploadcaster.h"
 #include "bncversion.h"
 #include "bnccore.h"
@@ -27 +27 @@
 bncUploadCaster::bncUploadCaster(const QString& mountpoint,
                                  const QString& outHost, int outPort,
-                                 const QString& password, int iRow, 
+                                 const QString& password, int iRow,
                                  int rate) {
   _mountpoint    = mountpoint;
@@ -45 +45 @@
   _isToBeDeleted = false;
 
-  connect(this, SIGNAL(newMessage(QByteArray,bool)), 
+  connect(this, SIGNAL(newMessage(QByteArray,bool)),
           BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
 
   if (BNC_CORE->_uploadTableItems.find(_iRow) != BNC_CORE->_uploadTableItems.end()){
-    connect(this, SIGNAL(newBytes(QByteArray,double)), 
-            BNC_CORE->_uploadTableItems.value(iRow), 
+    connect(this, SIGNAL(newBytes(QByteArray,double)),
+            BNC_CORE->_uploadTableItems.value(iRow),
             SLOT(slotNewBytes(const QByteArray,double)));
   }
@@ -69 +69 @@
   if (isRunning()) {
     wait();
+  }
+  if (_outSocket) {
+    delete _outSocket;
   }
 }
@@ -111 +114 @@
   }
 
-  if (_outSocket != 0 && 
+  if (_outSocket != 0 &&
       _outSocket->state() == QAbstractSocket::ConnectedState) {
     return;
@@ -141 +144 @@
   }
 
-  QByteArray msg = "SOURCE " + _password.toAscii() + " /" + 
+  QByteArray msg = "SOURCE " + _password.toAscii() + " /" +
                    _mountpoint.toAscii() + "\r\n" +
                    "Source-Agent: NTRIP BNC/" BNCVERSION "\r\n\r\n";