Index: sources/maintimer.cpp =================================================================== diff -u -rfee7fabf49befb065c89248c19e15efc9ca194e4 -rfeb3423b373dc2a2c4267ef9fcb4d924d738423d --- sources/maintimer.cpp (.../maintimer.cpp) (revision fee7fabf49befb065c89248c19e15efc9ca194e4) +++ sources/maintimer.cpp (.../maintimer.cpp) (revision feb3423b373dc2a2c4267ef9fcb4d924d738423d) @@ -14,9 +14,9 @@ #include "maintimer.h" //Qt -#include //Project +#include "logger.h" // Singleton SINGLETON_INIT(MainTimer) @@ -25,27 +25,18 @@ * \brief MainTimer Constructor * \param parent */ -MainTimer::MainTimer(QObject *parent) : QObject(parent) -{ - _timer = new QTimer(this); -} +MainTimer::MainTimer(QObject *parent) : QObject(parent) { } -void MainTimer::init() +bool MainTimer::init() { - connect(_timer, SIGNAL(timeout()), this, SLOT( onTimeout())); - connect(_timer, SIGNAL(timeout()), this, SIGNAL(didTimeout())); - _timer->start(_timeout); + startTimer(_interval); + LOG_EVENT(QObject::tr("Main Timer Initialized")); + return true; } -void MainTimer::quit() -{ - _timer->stop(); - delete _timer; - _timer = nullptr; -} +void MainTimer::quit() { } -void MainTimer::onTimeout() +void MainTimer::timerEvent(QTimerEvent *) { - // no op yet + emit didTimeout(); } -