Changeset 5813 in ntrip

Timestamp:

Aug 6, 2014, 11:51:11 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppMain.cpp (modified) (2 diffs)
• PPP/pppMain.h (modified) (2 diffs)
• PPP/pppThread.cpp (modified) (5 diffs)
• PPP/pppThread.h (modified) (1 diff)
• bncantex.h (modified) (1 diff)
• bncwindow.h (modified) (1 diff)
• ephemeris.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppMain.cpp

@@ -73 +73 @@
     while (iOpt.hasNext()) {
       const t_pppOptions* opt = iOpt.next();
-      t_pppInclude.hread* pppInclude.hread = new t_pppInclude.hread(opt);
-      pppInclude.hread->start();
-      _pppInclude.hreads << pppInclude.hread;
+      t_pppThread* pppThread = new t_pppThread(opt);
+      pppThread->start();
+      _pppThreads << pppThread;
       _running = true;
     }
@@ -92 +92 @@
   }
 
-  QListIterator<t_pppInclude.hread*> it(_pppInclude.hreads);
+  QListIterator<t_pppThread*> it(_pppThreads);
   while (it.hasNext()) {
-    t_pppInclude.hread* pppInclude.hread = it.next();
-    pppInclude.hread->exit();
-  }
-  _pppInclude.hreads.clear();
+    t_pppThread* pppThread = it.next();
+    pppThread->exit();
+  }
+  _pppThreads.clear();
 
   QListIterator<t_pppOptions*> iOpt(_options);

trunk/BNC/src/PPP/pppMain.h

@@ -4 +4 @@
 #include <QtCore>
 #include "pppOptions.h"
-#include "pppInclude.hread.h"
+#include "pppThread.h"
 
 namespace BNC {
@@ -18 +18 @@
   void readOptions();
 
-  QList<t_pppOptions*>   _options;
-  QList<t_pppInclude.hread*> _pppInclude.hreads;
-  QString             _logFile;
-  QString             _nmeaFile;
-  int                 _nmeaPort;
-  bool                _running;
+  QList<t_pppOptions*> _options;
+  QList<t_pppThread*>  _pppThreads;
+  QString              _logFile;
+  QString              _nmeaFile;
+  int                  _nmeaPort;
+  bool                 _running;
 };
 

trunk/BNC/src/PPP/pppThread.cpp

@@ -28 +28 @@
  * -------------------------------------------------------------------------
  *
- * Class:      t_pppInclude.hread, t_pppRun
+ * Class:      t_pppThread, t_pppRun
  *
  * Purpose:    Single PPP Client (running in its own thread)
@@ -46 +46 @@
 #include <map>
 
-#include "pppInclude.hread.h"
+#include "pppThread.h"
 #include "bnccore.h"
 
@@ -54 +54 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_pppInclude.hread::t_pppInclude.hread(const t_pppOptions* opt) : QThread(0) {
+t_pppThread::t_pppThread(const t_pppOptions* opt) : QThread(0) {
   _opt   = opt;
   _pppRun = 0;
@@ -65 +65 @@
 // Destructor
 ////////////////////////////////////////////////////////////////////////////
-t_pppInclude.hread::~t_pppInclude.hread() {
+t_pppThread::~t_pppThread() {
   delete _pppRun;
 }
@@ -71 +71 @@
 // Run (virtual)
 ////////////////////////////////////////////////////////////////////////////
-void t_pppInclude.hread::run() {
+void t_pppThread::run() {
   try {
     _pppRun = new t_pppRun(_opt);

trunk/BNC/src/PPP/pppThread.h

@@ -47 +47 @@
 };
 
-class t_pppInclude.hread : public QThread {
+class t_pppThread : public QThread {
  Q_OBJECT
  public:
-  t_pppInclude.hread(const t_pppOptions* opt);
-  ~t_pppInclude.hread();
+  t_pppThread(const t_pppOptions* opt);
+  ~t_pppThread();
   virtual void run();
 

trunk/BNC/src/bncantex.h

@@ -31 +31 @@
 #include "bncconst.h"
 #include "bnctime.h"
-#include "PPP/ppp.h"
+#include "PPP/pppInclude.h"
 
 class bncAntex {

trunk/BNC/src/bncwindow.h

@@ -31 +31 @@
 #include "bncgetthread.h"
 #include "bnccaster.h"
-#include "PPP/pppwidgets.h"
+#include "PPP/pppWidgets.h"
 
 class bncAboutDlg : public QDialog {

trunk/BNC/src/ephemeris.cpp

@@ -12 +12 @@
 #include "bnctime.h"
 #include "bnccore.h"
-#include "PPP/ppp.h"
+#include "PPP/pppInclude.h"
 
 using namespace BNC;