Changeset 153 in pacpusframework for branches/2.0-beta1/include/Pacpus/kernel/InputOutputInterface.h

Timestamp:

08/01/13 11:42:22 (11 years ago)

Author:

Marek Kurdej

Message:

Fixed: C4996 unchecked iterator warning on MSVC.

File:

• branches/2.0-beta1/include/Pacpus/kernel/InputOutputInterface.h (modified) (5 diffs)

branches/2.0-beta1/include/Pacpus/kernel/InputOutputInterface.h

@@ -5 +5 @@
 #include <Pacpus/kernel/InputOutputBase.h>
 #include <QApplication>
+#include <QByteArray>
+#include <QThread>
 #include <typeinfo>
-
-#include <QDebug>
-#include <QThread>
-
-#include <QByteArray>
-
-//#define ADD_INPUT(name, ComponentType, DataType, functionName) \
-//    inputs().insert((name), new InputInterface<DataType, ComponentType> ((name), this, &ComponentType::functionName))
-//#define ADD_OUTPUT(name, ComponentType, DataType) \
-//    outputs().insert((name), new OutputInterface<DataType, ComponentType> ((name), this))
-
-//#define GET_INPUT(name, ComponentType, DataType) \
-//    dynamic_cast<InputInterface<DataType, ComponentType> *> (input.value(name))
-//#define GET_OUTPUT(name, ComponentType, DataType) \
-//    dynamic_cast<OutputInterface<DataType, ComponentType> *> (output.value(name))
 
 namespace pacpus {
@@ -61 +48 @@
             PacpusTypedEvent<T> * typedEvent = dynamic_cast<PacpusTypedEvent<T> *> (event);
 
-            //qDebug() << "Reciever " << getSignature() << " thread " << QThread::currentThread() << " Data & " << & typedEvent->data_;
+            LOG_DEBUG("Receiver " << getSignature() << " thread " << QThread::currentThread() << " Data & " << & typedEvent->data_);
 
             //if(_component) get state
 
             if (typedEvent->timerange() < 500 && readingMode() == TimeBounded) {
-                //LOG_WARN("Incorrect TimeRange (0), switch to NeverSkip");
-                qDebug() << "Incorrect TimeRange (0), switch to NeverSkip";
-                readingMode() = NeverSkip;}
+                LOG_WARN("Incorrect TimeRange (0), switch to NeverSkip");
+                readingMode() = NeverSkip;
+            }
 
             switch (readingMode()) {
             case TimeBounded:
-                //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("Time bournded").leftJustified(15) << road_time()- typedEvent->t_ << "\t" << typedEvent->tr_;
+                LOG_DEBUG("Input " << this->getSignature().leftJustified(20) << QString("Time bournded").leftJustified(15) << road_time()- typedEvent->t_ << "\t" << typedEvent->tr_);
 
                 if (road_time() - typedEvent->time() > typedEvent->timerange()) {
-                    qDebug() << "Data skip " << this->getSignature();
+                    LOG_DEBUG("Data skip " << this->getSignature());
                     break;
                 }
@@ -83 +70 @@
 
             case GetLast:
-                //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("GetLast").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_;
+                LOG_DEBUG("Input " << this->getSignature().leftJustified(20) << QString("GetLast").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_);
 
                 (dynamic_cast<C*>(component())->*method)(typedEvent->data());
-                QCoreApplication::removePostedEvents(this,TYPED_EVENT); // delete all remining events
+                // delete all remaining events
+                QCoreApplication::removePostedEvents(this, TYPED_EVENT);
                 break;
 
             case NeverSkip:
-                //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("NeverSkip").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_;
+                LOG_DEBUG("Input " << this->getSignature().leftJustified(20) << QString("NeverSkip").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_);
 
             default:
@@ -118 +106 @@
 
         default:
-
-            qDebug() << "Unknown event ID " << event->type();
+            LOG_WARN("Unknown event ID " << event->type());
             break;
         }
@@ -152 +139 @@
 
     // Used by Components to send data througth typed output
-    void send(const T & data, road_time_t t = road_time(), road_timerange_t tr = 0) {
-
+    void send(const T & data, road_time_t t = road_time(), road_timerange_t tr = 0)
+    {
         //QSharedPointer<T> sharedPointer = new T(data);
 
-        for(QList<ConnectionBase>::iterator it = connections().begin(); it != connections().end(); ++it){
+        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 << " ";