Changeset 5727 in ntrip

Timestamp:

Jul 31, 2014, 2:32:14 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppThread.cpp (modified) (1 diff)
• bnccore.cpp (modified) (2 diffs)
• bnccore.h (modified) (2 diffs)
• bncmain.cpp (modified) (2 diffs)
• bncwindow.cpp (modified) (6 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/src/PPP/pppThread.cpp

@@ -69 +69 @@
   // ----------------------
   if (BNC_CORE->caster()) {
-    connect(BNC_CORE->caster(), SIGNAL(newObs(QByteArray, QList<t_obs>)),
+    connect(BNC_CORE->caster().data(), SIGNAL(newObs(QByteArray, QList<t_obs>)),
           this,      SLOT(slotNewObs(QByteArray, QList<t_obs>)));
 

trunk/BNC/src/bnccore.cpp

@@ -72 +72 @@
   _logFile     = 0;
   _logStream   = 0;
-  _caster      = 0;
   _rawFile     = 0;
 #ifdef USE_COMBINATION
@@ -631 +630 @@
 void t_bncCore::slotQuit() {
   cout << "t_bncCore::slotQuit" << endl;
-  delete _caster;
+  _caster.clear();
   qApp->quit();
 }

trunk/BNC/src/bnccore.h

@@ -51 +51 @@
     void setPort(int port);
     void setPortCorr(int port);
-    void setCaster(bncCaster* caster) {_caster = caster;}
-    const bncCaster* caster() const {return _caster;}
+    void setCaster(QSharedPointer<bncCaster> caster) {_caster = caster;}
+    QSharedPointer<bncCaster> caster() const {return _caster;}
     QDateTime* _currentDateAndTimeGPS;
     void setConfFileName(const QString& confFileName);
@@ -128 +128 @@
     QTcpServer*         _serverNMEA;
     QList<QTcpSocket*>* _socketsNMEA;
-    bncCaster*          _caster;
+    QSharedPointer<bncCaster> _caster;
     QMap<QString, bncTime> _lastCorrDumpTime;
     double              _waitCoTime;

trunk/BNC/src/bncmain.cpp

@@ -193 +193 @@
     bncEphUploadCaster* casterEph = new bncEphUploadCaster(); (void) casterEph;
     
-    bncCaster* caster = new bncCaster();
+    QSharedPointer<bncCaster> caster(new bncCaster());
     
     BNC_CORE->setCaster(caster);
@@ -200 +200 @@
     BNC_CORE->initCombination();
     
-    BNC_CORE->connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
+    BNC_CORE->connect(caster.data(), SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
     
     BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true);

trunk/BNC/src/bncwindow.cpp

@@ -90 +90 @@
 #endif
 
-  _caster    = 0;
   _casterEph = 0;
 
@@ -1528 +1527 @@
 ////////////////////////////////////////////////////////////////////////////
 bncWindow::~bncWindow() {
-  delete _caster;
+  _caster.clear();
   delete _casterEph;
   delete _pppMain;
@@ -1991 +1990 @@
 void bncWindow::slotGetThreadsFinished() {
   BNC_CORE->slotMessage("All Get Threads Terminated", true);
-  delete _caster;    _caster    = 0;
+  _caster.clear();
   delete _casterEph; _casterEph = 0;
   _runningRealTime = false;
@@ -2026 +2025 @@
   enableStartStop();
 
-  _caster = new bncCaster();
+  _caster = QSharedPointer<bncCaster>(new bncCaster());
 
   BNC_CORE->setCaster(_caster);
@@ -2033 +2032 @@
   BNC_CORE->initCombination();
 
-  connect(_caster, SIGNAL(getThreadsFinished()), 
+  connect(_caster.data(), SIGNAL(getThreadsFinished()), 
           this, SLOT(slotGetThreadsFinished()));
 
-  connect (_caster, SIGNAL(mountPointsRead(QList<bncGetThread*>)), 
+  connect (_caster.data(), SIGNAL(mountPointsRead(QList<bncGetThread*>)), 
            this, SLOT(slotMountPointsRead(QList<bncGetThread*>)));
 
@@ -2088 +2087 @@
     }
     BNC_CORE->stopCombination();
-    delete _caster;    _caster    = 0;
+    _caster.clear();
     delete _casterEph; _casterEph = 0;
     _runningRealTime = false;

trunk/BNC/src/bncwindow.h

@@ -260 +260 @@
     bncBytesCounter* _uploadEphBytesCounter;
 
-    bncCaster* _caster;
+    QSharedPointer<bncCaster> _caster;
 
     bncEphUploadCaster* _casterEph;