Changeset 628 in ntrip for trunk/BNC

Timestamp:

Dec 16, 2007, 6:57:42 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnccaster.cpp (modified) (2 diffs)
• bnccaster.h (modified) (1 diff)
• bncgetthread.h (modified) (1 diff)
• bncmain.cpp (modified) (2 diffs)
• bncwindow.cpp (modified) (2 diffs)

trunk/BNC/bnccaster.cpp

@@ -178 +178 @@
   qRegisterMetaType<p_obs>("p_obs");
 
-  connect(getThread, SIGNAL(newObs(const QByteArray, bool, p_obs)),
-          this,      SLOT(newObs(const QByteArray, bool, p_obs)));
-
-  connect(getThread, SIGNAL(error(const QByteArray)), 
-          this, SLOT(slotGetThreadError(const QByteArray)));
+  connect(getThread, SIGNAL(newObs(QByteArray, bool, p_obs)),
+          this,      SLOT(newObs(QByteArray, bool, p_obs)));
+
+  connect(getThread, SIGNAL(error(QByteArray)), 
+          this, SLOT(slotGetThreadError(QByteArray)));
 
   _staIDs.push_back(getThread->staID());
@@ -190 +190 @@
 // Error in get thread
 ////////////////////////////////////////////////////////////////////////////
-void bncCaster::slotGetThreadError(const QByteArray staID) {
+void bncCaster::slotGetThreadError(QByteArray staID) {
   QMutexLocker locker(&_mutex);
   _staIDs.removeAll(staID);

trunk/BNC/bnccaster.h

@@ -44 +44 @@
 
  public slots:
-   void newObs(const QByteArray staID, bool firstObs, p_obs obs);
+   void newObs(QByteArray staID, bool firstObs, p_obs obs);
 
  signals:
    void getThreadErrors();   
-   void newMessage(const QByteArray& msg);
+   void newMessage(QByteArray msg);
 
  private slots:
    void slotNewConnection();
-   void slotGetThreadError(const QByteArray staID);
+   void slotGetThreadError(QByteArray staID);
 
  private:

trunk/BNC/bncgetthread.h

@@ -51 +51 @@
 
  signals:
-   void newBytes(const QByteArray staID, double nbyte);
-   void newObs(const QByteArray staID, bool firstObs, p_obs obs);
-   void error(const QByteArray staID);
-   void newMessage(const QByteArray msg);
+   void newBytes(QByteArray staID, double nbyte);
+   void newObs(QByteArray staID, bool firstObs, p_obs obs);
+   void error(QByteArray staID);
+   void newMessage(QByteArray msg);
 
  protected:

trunk/BNC/bncmain.cpp

@@ -123 +123 @@
 
     app.connect(caster, SIGNAL(getThreadErrors()), &app, SLOT(quit()));
-    app.connect(caster, SIGNAL(newMessage(const QByteArray&)), 
-                &app, SLOT(slotMessage(const QByteArray&)));
+    app.connect(caster, SIGNAL(newMessage(QByteArray)), 
+                &app, SLOT(slotMessage(QByteArray)));
   
     ((bncApp*)qApp)->slotMessage("============ Start BNC ============");
@@ -140 +140 @@
       QByteArray nmea = hlp[4].toAscii();
       bncGetThread* getThread = new bncGetThread(url, format, latitude, longitude, nmea, iMount);
-      app.connect(getThread, SIGNAL(newMessage(const QByteArray&)), 
-                  &app, SLOT(slotMessage(const QByteArray&)));
+      app.connect(getThread, SIGNAL(newMessage(QByteArray)), 
+                  &app, SLOT(slotMessage(const QByteArray)));
 
       caster->addGetThread(getThread);

trunk/BNC/bncwindow.cpp

@@ -523 +523 @@
           this, SLOT(slotGetThreadErrors()));
 
-  connect(_caster, SIGNAL(newMessage(const QByteArray&)), 
-          this, SLOT(slotMessage(const QByteArray&)));
-  connect(_caster, SIGNAL(newMessage(const QByteArray&)), 
-          (bncApp*)qApp, SLOT(slotMessage(const QByteArray&)));
+  connect(_caster, SIGNAL(newMessage(QByteArray)), 
+          this, SLOT(slotMessage(QByteArray)));
+  connect(_caster, SIGNAL(newMessage(QByteArray)), 
+          (bncApp*)qApp, SLOT(slotMessage(QByteArray)));
 
   slotMessage("============ Start BNC ============");
@@ -543 +543 @@
     bncGetThread* getThread = new bncGetThread(url, format, latitude, longitude, nmea, iRow);
 
-    connect(getThread, SIGNAL(newMessage(const QByteArray&)), 
-            this, SLOT(slotMessage(const QByteArray&)));
-    connect(getThread, SIGNAL(newMessage(const QByteArray&)), 
-            (bncApp*)qApp, SLOT(slotMessage(const QByteArray&)));
-
-    connect(getThread, SIGNAL(newBytes(const QByteArray, double)),
+    connect(getThread, SIGNAL(newMessage(QByteArray)), 
+            this, SLOT(slotMessage(QByteArray)));
+    connect(getThread, SIGNAL(newMessage(QByteArray)), 
+            (bncApp*)qApp, SLOT(slotMessage(QByteArray)));
+
+    connect(getThread, SIGNAL(newBytes(QByteArray, double)),
             (bncTableItem*) _mountPointsTable->item(iRow, 6), 
-            SLOT(slotNewBytes(const QByteArray, double)));
+            SLOT(slotNewBytes(QByteArray, double)));
 
     _caster->addGetThread(getThread);