Index: trunk/BNC/src/bnccore.h
===================================================================
--- trunk/BNC/src/bnccore.h	(revision 5846)
+++ trunk/BNC/src/bnccore.h	(revision 5861)
@@ -33,123 +33,120 @@
 
 class bncComb;
-class bncPPPclient;
 class bncTableItem;
 
 class t_bncCore : public QObject {
-  Q_OBJECT
+Q_OBJECT
+friend class bncSettings;
 
-    friend class bncSettings;
-    QSettings::SettingsMap   _settings;
+ public:
+  enum e_mode {interactive, nonInteractive, batchPostProcessing};
+  t_bncCore();
+  virtual ~t_bncCore();  
+  static t_bncCore* instance();
+  e_mode mode() const {return _mode;}
+  void setGUIenabled(bool GUIenabled) {_GUIenabled = GUIenabled;}
+  void setMode(e_mode mode) {_mode = mode;}
+  void setPort(int port);
+  void setPortCorr(int port);
+  void setCaster(bncCaster* caster) {_caster = caster;}
+  const bncCaster* caster() const {return _caster;}
+  bool      dateAndTimeGPSSet() const;
+  QDateTime dateAndTimeGPS() const;
+  void      setDateAndTimeGPS(QDateTime dateTime);
+  void setConfFileName(const QString& confFileName);
+  QString confFileName() const {return _confFileName;}
+  void writeRawData(const QByteArray& data, const QByteArray& staID,
+                    const QByteArray& format);
+  void storeGlonassSlotNums(const int GLOFreq[]);
+  void getGlonassSlotNums(int GLOFreq[]);
+  void initCombination();
+  void stopCombination();
+  const QString& pgmName() {return _pgmName;}
+  const QString& userName() {return _userName;}
+  QWidget* mainWindow() const {return _mainWindow;};
+  void setMainWindow(QWidget* mainWindow){_mainWindow = mainWindow;}
+  bool GUIenabled() const {return _GUIenabled;}
 
-  public:
-    enum e_mode {interactive, nonInteractive, batchPostProcessing};
-    t_bncCore();
-    virtual ~t_bncCore();  
-    e_mode mode() const {return _mode;}
-    void setGUIenabled(bool GUIenabled) {_GUIenabled = GUIenabled;}
-    void setMode(e_mode mode) {_mode = mode;}
-    void setPort(int port);
-    void setPortCorr(int port);
-    void setCaster(bncCaster* caster) {_caster = caster;}
-    const bncCaster* caster() const {return _caster;}
-    bool      dateAndTimeGPSSet() const;
-    QDateTime dateAndTimeGPS() const;
-    void      setDateAndTimeGPS(QDateTime dateTime);
-    void setConfFileName(const QString& confFileName);
-    QString confFileName() const {return _confFileName;}
-    void writeRawData(const QByteArray& data, const QByteArray& staID,
-                      const QByteArray& format);
-    void storeGlonassSlotNums(const int GLOFreq[]);
-    void getGlonassSlotNums(int GLOFreq[]);
-    void initCombination();
-    void stopCombination();
-    const QString& pgmName() {return _pgmName;}
-    const QString& userName() {return _userName;}
-    QWidget* mainWindow() const {return _mainWindow;};
-    void setMainWindow(QWidget* mainWindow){_mainWindow = mainWindow;}
-    bool GUIenabled() const {return _GUIenabled;}
+  QMap<int, bncTableItem*> _uploadTableItems;
 
-  public slots:
-    void slotMessage(QByteArray msg, bool showOnScreen);
-    void slotNewGPSEph(gpsephemeris* gpseph);
-    void slotNewGlonassEph(glonassephemeris* glonasseph, const QString& staID);
-    void slotNewGalileoEph(galileoephemeris* galileoeph);
-    void slotNewCorrLine(QString line, QString staID, bncTime coTime);
-    void slotQuit();
+ public slots:
+  void slotMessage(QByteArray msg, bool showOnScreen);
+  void slotNewGPSEph(gpsephemeris* gpseph);
+  void slotNewGlonassEph(glonassephemeris* glonasseph, const QString& staID);
+  void slotNewGalileoEph(galileoephemeris* galileoeph);
+  void slotNewCorrLine(QString line, QString staID, bncTime coTime);
+  void slotQuit();
 
-  signals:
-    void newMessage(QByteArray msg, bool showOnScreen);
-    void newEphGPS(gpsephemeris gpseph);
-    void newEphGlonass(glonassephemeris glonasseph);
-    void newEphGalileo(galileoephemeris galileoeph);
-    void newCorrections(QStringList);
-    void providerIDChanged(QString);
+ signals:
+  void newMessage(QByteArray msg, bool showOnScreen);
+  void newEphGPS(gpsephemeris gpseph);
+  void newEphGlonass(glonassephemeris glonasseph);
+  void newEphGalileo(galileoephemeris galileoeph);
+  void newCorrections(QStringList);
+  void providerIDChanged(QString);
     
  private slots:
-   void slotNewConnection();
-   void slotNewConnectionCorr();
-  private:
-    void printEphHeader();
-    void printGPSEph(gpsephemeris* ep, bool printFile);
-    void printGlonassEph(glonassephemeris* ep, bool printFile, const QString& staID);
-    void printGalileoEph(galileoephemeris* ep, bool printFile);
-    void printOutput(bool printFile, QTextStream* stream, 
-                     const QString& strV2, const QString& strV3);
-    void dumpCorrs(bncTime minTime, bncTime maxTime);
-    void dumpCorrs();
-    void dumpCorrs(const QStringList& allCorrs);
-    void messagePrivate(const QByteArray& msg);
-    void checkEphemeris(gpsephemeris* oldEph, gpsephemeris* newEph);
+  void slotNewConnection();
+  void slotNewConnectionCorr();
 
-    QFile*            _logFile;
-    QTextStream*      _logStream;
-    int               _logFileFlag;
-    QMutex            _mutex;
-    QMutex            _mutexMessage;
-    QString           _ephPath;
-    QString           _ephFileNameGPS;
-    int               _rinexVers;
-    QFile*            _ephFileGPS;
-    QTextStream*      _ephStreamGPS;
-    QFile*            _ephFileGlonass;
-    QTextStream*      _ephStreamGlonass;
-    QFile*            _ephFileGalileo;
-    QTextStream*      _ephStreamGalileo;
-    gpsephemeris*     _gpsEph[PRN_GPS_END - PRN_GPS_START + 1];
-    glonassephemeris* _glonassEph[PRN_GLONASS_END - PRN_GLONASS_START + 1];
-    galileoephemeris* _galileoEph[PRN_GALILEO_END - PRN_GALILEO_START + 1];
-    QString           _userName;
-    QString           _pgmName;
-    int                 _port;
-    QTcpServer*         _server;
-    QList<QTcpSocket*>* _sockets;
-    int                 _portCorr;
-    QTcpServer*         _serverCorr;
-    QList<QTcpSocket*>* _socketsCorr;
-    int                 _portNMEA;
-    QTcpServer*         _serverNMEA;
-    QList<QTcpSocket*>* _socketsNMEA;
-    bncCaster*          _caster;
-    QMap<QString, bncTime> _lastCorrDumpTime;
-    double              _waitCoTime;
-    QMultiMap<bncTime, QString>* _corrs;
-    QString             _confFileName;
-    QDate               _fileDate;
-    bncRawFile*         _rawFile;
-    int                 _GLOFreq[PRN_GLONASS_NUM];
-    bncComb*            _bncComb;
-    e_mode              _mode;
-    QWidget*            _mainWindow;
-    bool                _GUIenabled;
-    QDateTime*          _dateAndTimeGPS;
-    mutable QMutex      _mutexDateAndTimeGPS;
- public:
-    bncPPPclient*       _bncPPPclient;
-    QMap<int, bncTableItem*> _uploadTableItems;
+ private:
+  void printEphHeader();
+  void printGPSEph(gpsephemeris* ep, bool printFile);
+  void printGlonassEph(glonassephemeris* ep, bool printFile, const QString& staID);
+  void printGalileoEph(galileoephemeris* ep, bool printFile);
+  void printOutput(bool printFile, QTextStream* stream, 
+                   const QString& strV2, const QString& strV3);
+  void dumpCorrs(bncTime minTime, bncTime maxTime);
+  void dumpCorrs();
+  void dumpCorrs(const QStringList& allCorrs);
+  void messagePrivate(const QByteArray& msg);
+  void checkEphemeris(gpsephemeris* oldEph, gpsephemeris* newEph);
+
+  QSettings::SettingsMap   _settings;
+  QFile*            _logFile;
+  QTextStream*      _logStream;
+  int               _logFileFlag;
+  QMutex            _mutex;
+  QMutex            _mutexMessage;
+  QString           _ephPath;
+  QString           _ephFileNameGPS;
+  int               _rinexVers;
+  QFile*            _ephFileGPS;
+  QTextStream*      _ephStreamGPS;
+  QFile*            _ephFileGlonass;
+  QTextStream*      _ephStreamGlonass;
+  QFile*            _ephFileGalileo;
+  QTextStream*      _ephStreamGalileo;
+  gpsephemeris*     _gpsEph[PRN_GPS_END - PRN_GPS_START + 1];
+  glonassephemeris* _glonassEph[PRN_GLONASS_END - PRN_GLONASS_START + 1];
+  galileoephemeris* _galileoEph[PRN_GALILEO_END - PRN_GALILEO_START + 1];
+  QString           _userName;
+  QString           _pgmName;
+  int                 _port;
+  QTcpServer*         _server;
+  QList<QTcpSocket*>* _sockets;
+  int                 _portCorr;
+  QTcpServer*         _serverCorr;
+  QList<QTcpSocket*>* _socketsCorr;
+  int                 _portNMEA;
+  QTcpServer*         _serverNMEA;
+  QList<QTcpSocket*>* _socketsNMEA;
+  bncCaster*          _caster;
+  QMap<QString, bncTime> _lastCorrDumpTime;
+  double              _waitCoTime;
+  QMultiMap<bncTime, QString>* _corrs;
+  QString             _confFileName;
+  QDate               _fileDate;
+  bncRawFile*         _rawFile;
+  int                 _GLOFreq[PRN_GLONASS_NUM];
+  bncComb*            _bncComb;
+  e_mode              _mode;
+  QWidget*            _mainWindow;
+  bool                _GUIenabled;
+  QDateTime*          _dateAndTimeGPS;
+  mutable QMutex      _mutexDateAndTimeGPS;
 };
 
-t_bncCore& bncCoreInstance();
-
-#define BNC_CORE (&bncCoreInstance())
+#define BNC_CORE (t_bncCore::instance())
 
 #endif
