ScStw/shared-libraries
ScStw/shared-libraries
Archived
2
0
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Dorian Zedler 2020-05-18 11:27:29 +02:00
parent 0738195675 3ae5977752
commit ddc48986ad
Signed by: dorian
GPG key ID: 989DE36109AFA354
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ScStwLibraries/headers/scstwtimer.h
View file

@ -122,7 +122,7 @@ public slots:
* \param timeOfStart the point in time (msecs since epoch) when the timer is supposted to be started * \param timeOfStart the point in time (msecs since epoch) when the timer is supposted to be started
* \return false if the timer was not in the required state and therefore not started, true otherwise * \return false if the timer was not in the required state and therefore not started, true otherwise
*/ */
bool start(double timeOfStart); virtual bool start(double timeOfStart);
/*! /*!
* \brief Function to cancel the timer * \brief Function to cancel the timer
@ -169,7 +169,7 @@ public slots:
* *
* \return false if the timer was not in the required state and therefore not reset, true otherwise * \return false if the timer was not in the required state and therefore not reset, true otherwise
*/ */
bool reset(); virtual bool reset();
// -- helper functions -- // -- helper functions --
/*! /*!
@ -274,7 +274,7 @@ protected slots:
* *
* \see ScStwTimer::StopReason * \see ScStwTimer::StopReason
*/ */
bool stop(StopReason reason, double timeOfStop); virtual bool stop(StopReason reason, double timeOfStop);
/*! /*!
* \brief Function to stop the timer * \brief Function to stop the timer

2
ScStwLibraries/sources/scstwtimer.cpp
View file

@ -53,7 +53,7 @@ void ScStwTimer::handleClimberStart(double timeOfStart) {
return; return;
} }
// TODO: check if necessary: emit this->reactionTimeChanged(); emit this->reactionTimeChanged();
} }
bool ScStwTimer::cancel() { bool ScStwTimer::cancel() {