From 81ee19819c8698054279557090c94280c43ea41d Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Tue, 26 May 2020 17:57:32 +0200 Subject: [PATCH] fixed cancel function naming --- ScStwLibraries/headers/scstwrace.h | 2 +- ScStwLibraries/headers/scstwremotemonitorrace.h | 2 +- ScStwLibraries/sources/scstwremotemonitorrace.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ScStwLibraries/headers/scstwrace.h b/ScStwLibraries/headers/scstwrace.h index 9e225ca..62ab2ed 100644 --- a/ScStwLibraries/headers/scstwrace.h +++ b/ScStwLibraries/headers/scstwrace.h @@ -101,7 +101,7 @@ public slots: * \return */ virtual int reset(); - int cancel(); + virtual int cancel(); // setters bool writeStartActionSetting(StartAction action, bool enabled, int delay); diff --git a/ScStwLibraries/headers/scstwremotemonitorrace.h b/ScStwLibraries/headers/scstwremotemonitorrace.h index 065e94f..95e87e5 100644 --- a/ScStwLibraries/headers/scstwremotemonitorrace.h +++ b/ScStwLibraries/headers/scstwremotemonitorrace.h @@ -20,7 +20,7 @@ private: public slots: int start(); - void cancelStart(); + int cancel(); int stop(); int reset(); bool addTimer(ScStwTimer *timer); diff --git a/ScStwLibraries/sources/scstwremotemonitorrace.cpp b/ScStwLibraries/sources/scstwremotemonitorrace.cpp index e21cacf..8c769da 100644 --- a/ScStwLibraries/sources/scstwremotemonitorrace.cpp +++ b/ScStwLibraries/sources/scstwremotemonitorrace.cpp @@ -38,9 +38,9 @@ int ScStwRemoteMonitorRace::start() { return returnCode; } -void ScStwRemoteMonitorRace::cancelStart() { - this->stop(); - return; +int ScStwRemoteMonitorRace::cancel() { + return this->stop(); + } int ScStwRemoteMonitorRace::stop() {