Changeset 290 in pacpusframework for trunk/src

Timestamp:

03/27/14 12:53:36 (10 years ago)

Author:

Marek Kurdej

Message:

Some clean-up.

Location:

trunk/src

Files:

• DBITEPlayerLib/DbtPlyTrigger.cpp (modified) (1 diff)
• DBITEPlayerLib/DbtPlyUserInterface.cpp (modified) (4 diffs)
• PacpusLib/ComponentBase.cpp (modified) (3 diffs)
• PacpusLib/ComponentManager.cpp (modified) (1 diff)
• PacpusSensor/src/main.cpp (modified) (2 diffs)

trunk/src/DBITEPlayerLib/DbtPlyTrigger.cpp

@@ -48 +48 @@
         return CONFIGURED_FAILED;
     }
-    connect(this, SIGNAL(triggerSig()),
+    QObject::connect(this, SIGNAL(triggerSig()),
             mEngine.get(), SLOT(engReceiver()),
             Qt::DirectConnection);

trunk/src/DBITEPlayerLib/DbtPlyUserInterface.cpp

@@ -167 +167 @@
     QGridLayout * mainLayout = new QGridLayout(this);
 
-    butGroup = new QButtonGroup (this );
+    butGroup = new QButtonGroup(this);
     playBut = new QPushButton ("|>", this);
     playBut->resize(kButtonWidthInPixels, kButtonHeightInPixels);
@@ -314 +314 @@
 {
     // FIXME: use Qt5 connect style
-    connect(playBut, SIGNAL(clicked()),
+    QObject::connect(playBut, SIGNAL(clicked()),
         mEngine.get(), SLOT(playEvent()));
-    connect(pauseBut, SIGNAL(clicked()),
+    QObject::connect(pauseBut, SIGNAL(clicked()),
         mEngine.get(), SLOT(pauseEvent()));
-    connect(stopBut, SIGNAL(clicked()),
+    QObject::connect(stopBut, SIGNAL(clicked()),
         mEngine.get(), SLOT(stopEvent()));
-    connect(speedUpBut, SIGNAL(clicked()),
+    QObject::connect(speedUpBut, SIGNAL(clicked()),
         mEngine.get(), SLOT(speedUpEvent()));
-    connect(speedDownBut, SIGNAL(clicked()),
+    QObject::connect(speedDownBut, SIGNAL(clicked()),
         mEngine.get(), SLOT(speedDownEvent()));
 }
@@ -328 +328 @@
 void DbtPlyUserInterface::connectDisplay()
 {
-    connect(mEngine.get(), SIGNAL(displayStateSig(DbtPlyEngineState *, float)),
+    QObject::connect(mEngine.get(), SIGNAL(displayStateSig(DbtPlyEngineState *, float)),
         this, SLOT(displayStateSlot(DbtPlyEngineState *, float)));
-
-    connect (mEngine.get(), SIGNAL(timeMinMax(road_time_t, road_time_t)),
+    QObject::connect(mEngine.get(), SIGNAL(timeMinMax(road_time_t, road_time_t)),
         this, SLOT(displayMinMaxTime(road_time_t , road_time_t)));
-    connect (mEngine.get(), SIGNAL(curReplayTime(road_time_t)),
+    QObject::connect(mEngine.get(), SIGNAL(curReplayTime(road_time_t)),
         this, SLOT(displayTime(road_time_t)));
-    connect (rev, SIGNAL(toggled(bool)),
+    QObject::connect(rev, SIGNAL(toggled(bool)),
         mEngine.get(), SLOT(changeDirection(bool)));
 }
@@ -341 +340 @@
 void DbtPlyUserInterface::connectSlider()
 {
-    connect (timeSlider, SIGNAL(sliderPressed()),
+    QObject::connect(timeSlider, SIGNAL(sliderPressed()),
         mEngine.get(), SLOT(pauseEvent()));
-    connect (timeSlider, SIGNAL(sliderReleased()),
+    QObject::connect(timeSlider, SIGNAL(sliderReleased()),
         mEngine.get(), SLOT(playEvent()));
 }

trunk/src/PacpusLib/ComponentBase.cpp

@@ -17 +17 @@
 #include <boost/program_options/parsers.hpp>
 #include <boost/program_options/variables_map.hpp>
-//#include <boost/thread/thread.hpp>
 #include <ostream>
 #include <string>
@@ -245 +244 @@
 }
 
-InputInterfaceBase * ComponentBase::getInput(QString inputName) const
+InputInterfaceBase* ComponentBase::getInput(QString inputName) const
 {
     if (inputs().contains(inputName)) {
-        return inputs()[inputName];
+        return inputs()[inputName].get();
     }
     LOG_WARN("Component " << getName() << " does not contain input " << inputName);
@@ -254 +253 @@
 }
 
-OutputInterfaceBase * ComponentBase::getOutput(QString outputName) const
+OutputInterfaceBase* ComponentBase::getOutput(QString outputName) const
 {
     if (outputs().contains(outputName)) {
-        return outputs()[outputName];
+        return outputs()[outputName].get();
     }
     LOG_WARN("Component " << getName() << " does not contain output " << outputName);

trunk/src/PacpusLib/ComponentManager.cpp

@@ -38 +38 @@
 /// Connects OutputInterfaceBase @b out to InputInterfaceBase @b in using given priority and reading mode.
 /// @returns @b true if connection has been added successfully, @b false otherwise.
-bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast);
+bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase* in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast);
 
 ////////////////////////////////////////////////////////////////////////////////
 
-bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode)
+bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase* in, int priority, InputInterfaceBase::ReadingMode mode)
 {
     // check connections

trunk/src/PacpusSensor/src/main.cpp

@@ -14 +14 @@
 #include <boost/cstdlib.hpp>
 #include <boost/exception/diagnostic_information.hpp>
-#include <QApplication>
-#include <QThread>
 #ifdef WIN32
-#       define NOMINMAX 
+#   define NOMINMAX 
 #   include <windows.h>
 #endif
@@ -64 +62 @@
     PacpusMainWindow window;
     window.show();
-    LOG_INFO("Current Thread " << QThread::currentThread());
     
     int exitStatus = boost::exit_exception_failure;