Changeset 290 in pacpusframework for trunk/src


Ignore:
Timestamp:
Mar 27, 2014, 12:53:36 PM (11 years ago)
Author:
Marek Kurdej
Message:

Some clean-up.

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/DBITEPlayerLib/DbtPlyTrigger.cpp

    r288 r290  
    4848        return CONFIGURED_FAILED;
    4949    }
    50     connect(this, SIGNAL(triggerSig()),
     50    QObject::connect(this, SIGNAL(triggerSig()),
    5151            mEngine.get(), SLOT(engReceiver()),
    5252            Qt::DirectConnection);
  • trunk/src/DBITEPlayerLib/DbtPlyUserInterface.cpp

    r288 r290  
    167167    QGridLayout * mainLayout = new QGridLayout(this);
    168168
    169     butGroup = new QButtonGroup (this );
     169    butGroup = new QButtonGroup(this);
    170170    playBut = new QPushButton ("|>", this);
    171171    playBut->resize(kButtonWidthInPixels, kButtonHeightInPixels);
     
    314314{
    315315    // FIXME: use Qt5 connect style
    316     connect(playBut, SIGNAL(clicked()),
     316    QObject::connect(playBut, SIGNAL(clicked()),
    317317        mEngine.get(), SLOT(playEvent()));
    318     connect(pauseBut, SIGNAL(clicked()),
     318    QObject::connect(pauseBut, SIGNAL(clicked()),
    319319        mEngine.get(), SLOT(pauseEvent()));
    320     connect(stopBut, SIGNAL(clicked()),
     320    QObject::connect(stopBut, SIGNAL(clicked()),
    321321        mEngine.get(), SLOT(stopEvent()));
    322     connect(speedUpBut, SIGNAL(clicked()),
     322    QObject::connect(speedUpBut, SIGNAL(clicked()),
    323323        mEngine.get(), SLOT(speedUpEvent()));
    324     connect(speedDownBut, SIGNAL(clicked()),
     324    QObject::connect(speedDownBut, SIGNAL(clicked()),
    325325        mEngine.get(), SLOT(speedDownEvent()));
    326326}
     
    328328void DbtPlyUserInterface::connectDisplay()
    329329{
    330     connect(mEngine.get(), SIGNAL(displayStateSig(DbtPlyEngineState *, float)),
     330    QObject::connect(mEngine.get(), SIGNAL(displayStateSig(DbtPlyEngineState *, float)),
    331331        this, SLOT(displayStateSlot(DbtPlyEngineState *, float)));
    332 
    333     connect (mEngine.get(), SIGNAL(timeMinMax(road_time_t, road_time_t)),
     332    QObject::connect(mEngine.get(), SIGNAL(timeMinMax(road_time_t, road_time_t)),
    334333        this, SLOT(displayMinMaxTime(road_time_t , road_time_t)));
    335     connect (mEngine.get(), SIGNAL(curReplayTime(road_time_t)),
     334    QObject::connect(mEngine.get(), SIGNAL(curReplayTime(road_time_t)),
    336335        this, SLOT(displayTime(road_time_t)));
    337     connect (rev, SIGNAL(toggled(bool)),
     336    QObject::connect(rev, SIGNAL(toggled(bool)),
    338337        mEngine.get(), SLOT(changeDirection(bool)));
    339338}
     
    341340void DbtPlyUserInterface::connectSlider()
    342341{
    343     connect (timeSlider, SIGNAL(sliderPressed()),
     342    QObject::connect(timeSlider, SIGNAL(sliderPressed()),
    344343        mEngine.get(), SLOT(pauseEvent()));
    345     connect (timeSlider, SIGNAL(sliderReleased()),
     344    QObject::connect(timeSlider, SIGNAL(sliderReleased()),
    346345        mEngine.get(), SLOT(playEvent()));
    347346}
  • trunk/src/PacpusLib/ComponentBase.cpp

    r288 r290  
    1717#include <boost/program_options/parsers.hpp>
    1818#include <boost/program_options/variables_map.hpp>
    19 //#include <boost/thread/thread.hpp>
    2019#include <ostream>
    2120#include <string>
     
    245244}
    246245
    247 InputInterfaceBase * ComponentBase::getInput(QString inputName) const
     246InputInterfaceBase* ComponentBase::getInput(QString inputName) const
    248247{
    249248    if (inputs().contains(inputName)) {
    250         return inputs()[inputName];
     249        return inputs()[inputName].get();
    251250    }
    252251    LOG_WARN("Component " << getName() << " does not contain input " << inputName);
     
    254253}
    255254
    256 OutputInterfaceBase * ComponentBase::getOutput(QString outputName) const
     255OutputInterfaceBase* ComponentBase::getOutput(QString outputName) const
    257256{
    258257    if (outputs().contains(outputName)) {
    259         return outputs()[outputName];
     258        return outputs()[outputName].get();
    260259    }
    261260    LOG_WARN("Component " << getName() << " does not contain output " << outputName);
  • trunk/src/PacpusLib/ComponentManager.cpp

    r288 r290  
    3838/// Connects OutputInterfaceBase @b out to InputInterfaceBase @b in using given priority and reading mode.
    3939/// @returns @b true if connection has been added successfully, @b false otherwise.
    40 bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast);
     40bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase* in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast);
    4141
    4242////////////////////////////////////////////////////////////////////////////////
    4343
    44 bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode)
     44bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase* in, int priority, InputInterfaceBase::ReadingMode mode)
    4545{
    4646    // check connections
  • trunk/src/PacpusSensor/src/main.cpp

    r289 r290  
    1414#include <boost/cstdlib.hpp>
    1515#include <boost/exception/diagnostic_information.hpp>
    16 #include <QApplication>
    17 #include <QThread>
    1816#ifdef WIN32
    19 #       define NOMINMAX
     17#   define NOMINMAX
    2018#   include <windows.h>
    2119#endif
     
    6462    PacpusMainWindow window;
    6563    window.show();
    66     LOG_INFO("Current Thread " << QThread::currentThread());
    6764   
    6865    int exitStatus = boost::exit_exception_failure;
Note: See TracChangeset for help on using the changeset viewer.