Changeset 290 in pacpusframework for trunk/src/DBITEPlayerLib

Timestamp:

Mar 27, 2014, 12:53:36 PM (11 years ago)

Author:

Marek Kurdej

Message:

Some clean-up.

Location:

trunk/src/DBITEPlayerLib

Files:

• DbtPlyTrigger.cpp (modified) (1 diff)
• DbtPlyUserInterface.cpp (modified) (4 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()));
 }