Changeset 5813 in ntrip


Ignore:
Timestamp:
Aug 6, 2014, 11:51:11 AM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppMain.cpp

    r5810 r5813  
    7373    while (iOpt.hasNext()) {
    7474      const t_pppOptions* opt = iOpt.next();
    75       t_pppInclude.hread* pppInclude.hread = new t_pppInclude.hread(opt);
    76       pppInclude.hread->start();
    77       _pppInclude.hreads << pppInclude.hread;
     75      t_pppThread* pppThread = new t_pppThread(opt);
     76      pppThread->start();
     77      _pppThreads << pppThread;
    7878      _running = true;
    7979    }
     
    9292  }
    9393
    94   QListIterator<t_pppInclude.hread*> it(_pppInclude.hreads);
     94  QListIterator<t_pppThread*> it(_pppThreads);
    9595  while (it.hasNext()) {
    96     t_pppInclude.hread* pppInclude.hread = it.next();
    97     pppInclude.hread->exit();
    98   }
    99   _pppInclude.hreads.clear();
     96    t_pppThread* pppThread = it.next();
     97    pppThread->exit();
     98  }
     99  _pppThreads.clear();
    100100
    101101  QListIterator<t_pppOptions*> iOpt(_options);
  • trunk/BNC/src/PPP/pppMain.h

    r5810 r5813  
    44#include <QtCore>
    55#include "pppOptions.h"
    6 #include "pppInclude.hread.h"
     6#include "pppThread.h"
    77
    88namespace BNC {
     
    1818  void readOptions();
    1919
    20   QList<t_pppOptions*>   _options;
    21   QList<t_pppInclude.hread*> _pppInclude.hreads;
    22   QString             _logFile;
    23   QString             _nmeaFile;
    24   int                 _nmeaPort;
    25   bool                _running;
     20  QList<t_pppOptions*> _options;
     21  QList<t_pppThread*>  _pppThreads;
     22  QString              _logFile;
     23  QString              _nmeaFile;
     24  int                  _nmeaPort;
     25  bool                 _running;
    2626};
    2727
  • trunk/BNC/src/PPP/pppThread.cpp

    r5810 r5813  
    2828 * -------------------------------------------------------------------------
    2929 *
    30  * Class:      t_pppInclude.hread, t_pppRun
     30 * Class:      t_pppThread, t_pppRun
    3131 *
    3232 * Purpose:    Single PPP Client (running in its own thread)
     
    4646#include <map>
    4747
    48 #include "pppInclude.hread.h"
     48#include "pppThread.h"
    4949#include "bnccore.h"
    5050
     
    5454// Constructor
    5555////////////////////////////////////////////////////////////////////////////
    56 t_pppInclude.hread::t_pppInclude.hread(const t_pppOptions* opt) : QThread(0) {
     56t_pppThread::t_pppThread(const t_pppOptions* opt) : QThread(0) {
    5757  _opt   = opt;
    5858  _pppRun = 0;
     
    6565// Destructor
    6666////////////////////////////////////////////////////////////////////////////
    67 t_pppInclude.hread::~t_pppInclude.hread() {
     67t_pppThread::~t_pppThread() {
    6868  delete _pppRun;
    6969}
     
    7171// Run (virtual)
    7272////////////////////////////////////////////////////////////////////////////
    73 void t_pppInclude.hread::run() {
     73void t_pppThread::run() {
    7474  try {
    7575    _pppRun = new t_pppRun(_opt);
  • trunk/BNC/src/PPP/pppThread.h

    r5810 r5813  
    4747};
    4848
    49 class t_pppInclude.hread : public QThread {
     49class t_pppThread : public QThread {
    5050 Q_OBJECT
    5151 public:
    52   t_pppInclude.hread(const t_pppOptions* opt);
    53   ~t_pppInclude.hread();
     52  t_pppThread(const t_pppOptions* opt);
     53  ~t_pppThread();
    5454  virtual void run();
    5555
  • trunk/BNC/src/bncantex.h

    r5755 r5813  
    3131#include "bncconst.h"
    3232#include "bnctime.h"
    33 #include "PPP/ppp.h"
     33#include "PPP/pppInclude.h"
    3434
    3535class bncAntex {
  • trunk/BNC/src/bncwindow.h

    r5729 r5813  
    3131#include "bncgetthread.h"
    3232#include "bnccaster.h"
    33 #include "PPP/pppwidgets.h"
     33#include "PPP/pppWidgets.h"
    3434
    3535class bncAboutDlg : public QDialog {
  • trunk/BNC/src/ephemeris.cpp

    r5789 r5813  
    1212#include "bnctime.h"
    1313#include "bnccore.h"
    14 #include "PPP/ppp.h"
     14#include "PPP/pppInclude.h"
    1515
    1616using namespace BNC;
Note: See TracChangeset for help on using the changeset viewer.