Changeset 5729 in ntrip for trunk/BNC/src/bncwindow.cpp

Timestamp:

Jul 31, 2014, 3:18:23 PM (10 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/bncwindow.cpp

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