Changeset 5736 in ntrip for trunk/BNC/src/PPP/pppMain.cpp

Timestamp:

Aug 1, 2014, 7:49:40 AM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/pppMain.cpp (modified) (5 diffs)

trunk/BNC/src/PPP/pppMain.cpp

@@ -68 +68 @@
   readOptions();
 
-  QListIterator<QSharedPointer<t_options> > it(_options);
-  while (it.hasNext()) {
-    QSharedPointer<t_options> opt = it.next();
-    t_pppThread* pppThread = new t_pppThread(opt.data());
+  QListIterator<t_options*> iOpt(_options);
+  while (iOpt.hasNext()) {
+    const t_options* opt = iOpt.next();
+    t_pppThread* pppThread = new t_pppThread(opt);
     pppThread->start();
     _pppThreads << pppThread;
@@ -93 +93 @@
   _pppThreads.clear();
 
+  QListIterator<t_options*> iOpt(_options);
+  while (iOpt.hasNext()) {
+    delete iOpt.next();
+  }
+  _options.clear();
+
   _running = false;
 }
@@ -100 +106 @@
 void t_pppMain::readOptions() {
 
+  QListIterator<t_options*> iOpt(_options);
+  while (iOpt.hasNext()) {
+    delete iOpt.next();
+  }
   _options.clear();
 
@@ -119 +129 @@
   }
 
-  QListIterator<QString> it(settings.value("PPP/staTable").toStringList());
-  while (it.hasNext()) {
-    QStringList hlp = it.next().split(",");
+  QListIterator<QString> iSta(settings.value("PPP/staTable").toStringList());
+  while (iSta.hasNext()) {
+    QStringList hlp = iSta.next().split(",");
 
     if (hlp.size() < 9) {
@@ -127 +137 @@
     }
 
-    QSharedPointer<t_options> opt(new t_options());
+    t_options* opt = new t_options();
 
     opt->_realTime    = realTime;