Changeset 200 in pacpusframework

Timestamp:

10/28/13 14:39:22 (11 years ago)

Author:

Marek Kurdej

Message:

Fixed: unnecessary QThread dependency.

Location:

trunk

Files:

• include/Pacpus/kernel/InputOutputBase.h (modified) (1 diff)
• include/Pacpus/kernel/InputOutputInterface.h (modified) (4 diffs)
• src/PacpusLib/InputOutputBase.cpp (modified) (1 diff)

trunk/include/Pacpus/kernel/InputOutputBase.h

@@ -7 +7 @@
 #include <Pacpus/kernel/PacpusLibConfig.h>
 
-#include <QApplication>
 #include <QList>
+#include <QString>
 #include <QStringList>
 #include <typeinfo>
+
+class QByteArray;
 
 namespace pacpus {

trunk/include/Pacpus/kernel/InputOutputInterface.h

@@ -5 +5 @@
 #include <Pacpus/kernel/Log.h>
 
+#include <QApplication>
 #include <QByteArray>
-//#include <QThread>
+#include <QCoreApplication>
 #include <typeinfo>
 
@@ -54 +55 @@
             PacpusTypedEvent<T> * typedEvent = dynamic_cast<PacpusTypedEvent<T> *> (event);
 
-            LOG_DEBUG("Receiver " << getSignature() << " thread " << QThread::currentThread());
+            LOG_DEBUG("Receiver: " << getSignature());
 
             if (typedEvent->timerange() < 500 && readingMode() == TimeBounded) {
@@ -65 +66 @@
 
                 if (road_time() - typedEvent->time() > typedEvent->timerange()) {
-                    LOG_DEBUG("Data skip " << this->getSignature());
+                    LOG_DEBUG("Data skipped, receiver: " << this->getSignature());
                     break;
                 }
@@ -145 +146 @@
     //QSharedPointer<T> sharedPointer = new T(data);
 
-    for (QList<ConnectionBase>::iterator it = connections().begin(); it != connections().end(); ++it) {
-        QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<T>(TYPED_EVENT,data,t,tr),it->getPriority()); // Event is delete by the event loop handler
-        //qDebug() << "sender " << it->getInterface()->getSignature() <<  " thread " << QThread::currentThread() << " Data & " << &data << " ";
+    for (QList<ConnectionBase>::iterator it = connections().begin(), itend = connections().end(); it != itend; ++it) {
+        // Event is deleted by the event loop handler
+        QApplication::postEvent(it->getInterface(), new PacpusTypedEvent<T>(TYPED_EVENT,data,t,tr),it->getPriority());
+        //qDebug() << "sender " << it->getInterface()->getSignature() << " Data & " << &data << " ";
     }
 }

trunk/src/PacpusLib/InputOutputBase.cpp

@@ -5 +5 @@
 #include <Pacpus/kernel/InputOutputInterface.h>
 #include <Pacpus/kernel/Log.h>
+
+#include <QApplication>
 
 using namespace pacpus;