Changeset 5732 in ntrip

Timestamp:

Jul 31, 2014, 4:28:21 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppThread.cpp (modified) (2 diffs)
• PPP/pppThread.h (modified) (1 diff)
• bnccore.cpp (modified) (3 diffs)
• bnccore.h (modified) (2 diffs)
• bncpppclient.cpp (modified) (2 diffs)
• bncpppclient.h (modified) (1 diff)
• rinex/bncpostprocess.cpp (modified) (1 diff)
• rinex/corrfile.cpp (modified) (1 diff)
• rinex/corrfile.h (modified) (1 diff)

trunk/BNC/src/PPP/pppThread.cpp ¶

@@ -94 +94 @@
             this, SLOT(slotNewEphGalileo(galileoephemeris)));
 
-    connect(BNC_CORE, SIGNAL(newCorrections(QList<QString>)),
-            this, SLOT(slotNewCorrections(QList<QString>)));
+    connect(BNC_CORE, SIGNAL(newCorrections(QStringList)),
+            this, SLOT(slotNewCorrections(QStringList)));
   }
 }
@@ -128 +128 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_pppRun::slotNewCorrections(QList<QString> corrList) {
+void t_pppRun::slotNewCorrections(QStringList corrList) {
   QMutexLocker locker(&_mutex);
   cout << _opt._roverName << " slotNewCorrections" << endl;

trunk/BNC/src/PPP/pppThread.h ¶

@@ -20 +20 @@
   void slotNewEphGlonass(glonassephemeris gloeph);
   void slotNewEphGalileo(galileoephemeris galeph);
-  void slotNewCorrections(QList<QString> corrList);
+  void slotNewCorrections(QStringList corrList);
   void slotNewObs(QByteArray staID, QList<t_obs> obsList);
 

trunk/BNC/src/bnccore.cpp ¶

@@ -690 +690 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::dumpCorrs(bncTime minTime, bncTime maxTime) {
-  QList<QString> allCorrs;
+  QStringList allCorrs;
   QMutableMapIterator<bncTime, QString> it(*_corrs);
   while (it.hasNext()) {
@@ -706 +706 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::dumpCorrs() {
-  QList<QString> allCorrs;
+  QStringList allCorrs;
   QMutableMapIterator<bncTime, QString> it(*_corrs);
   while (it.hasNext()) {
@@ -717 +717 @@
 // Dump List of Corrections 
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::dumpCorrs(const QList<QString>& allCorrs) {
+void t_bncCore::dumpCorrs(const QStringList& allCorrs) {
   emit newCorrections(allCorrs);
   if (_socketsCorr) {

trunk/BNC/src/bnccore.h ¶

@@ -81 +81 @@
     void newEphGlonass(glonassephemeris glonasseph);
     void newEphGalileo(galileoephemeris galileoeph);
-    void newCorrections(QList<QString>);
+    void newCorrections(QStringList);
     void providerIDChanged(QString);
     
@@ -96 +96 @@
     void dumpCorrs(bncTime minTime, bncTime maxTime);
     void dumpCorrs();
-    void dumpCorrs(const QList<QString>& allCorrs);
+    void dumpCorrs(const QStringList& allCorrs);
     void messagePrivate(const QByteArray& msg);
     void checkEphemeris(gpsephemeris* oldEph, gpsephemeris* newEph);

trunk/BNC/src/bncpppclient.cpp ¶

@@ -74 +74 @@
             BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
 
-    connect(BNC_CORE, SIGNAL(newCorrections(QList<QString>)),
-            this, SLOT(slotNewCorrections(QList<QString>)));
+    connect(BNC_CORE, SIGNAL(newCorrections(QStringList)),
+            this, SLOT(slotNewCorrections(QStringList)));
 
     connect(BNC_CORE, SIGNAL(providerIDChanged(QString)),
@@ -254 +254 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncPPPclient::slotNewCorrections(QList<QString> corrList) {
+void bncPPPclient::slotNewCorrections(QStringList corrList) {
   QMutexLocker locker(&_mutex);
 

trunk/BNC/src/bncpppclient.h ¶

@@ -132 +132 @@
 
  public slots:
-  void slotNewCorrections(QList<QString> corrList);
+  void slotNewCorrections(QStringList corrList);
   void slotProviderIDChanged(QString mountPoint);
 

trunk/BNC/src/rinex/bncpostprocess.cpp ¶

@@ -169 +169 @@
     if (!_opt->corrFileName.isEmpty()) {
       _corrFile = new t_corrFile(_opt->corrFileName);
-      connect(_corrFile, SIGNAL(newCorrections(QList<QString>)),
-              _pppClient, SLOT(slotNewCorrections(QList<QString>)),
+      connect(_corrFile, SIGNAL(newCorrections(QStringList)),
+              _pppClient, SLOT(slotNewCorrections(QStringList)),
               Qt::DirectConnection);
     }

trunk/BNC/src/rinex/corrfile.cpp ¶

@@ -71 +71 @@
   }
 
-  QList<QString> corrs;
+  QStringList corrs;
 
   if (!_lastLine.isEmpty()) {

trunk/BNC/src/rinex/corrfile.h ¶

@@ -40 +40 @@
 
  signals:
-  void newCorrections(QList<QString>);
+  void newCorrections(QStringList);
 
  private: