summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-03-31 14:57:35 (GMT)
committerTobias Markmann <tm@ayena.de>2016-03-31 14:57:35 (GMT)
commitcfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch)
tree18d94153a302445196fc0c18586abf44a1ce4a38 /Sluift/Watchdog.cpp
parent1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff)
downloadswift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip
swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines in the process. Changed CheckTabs.py tool to disallow hard tabs in source files. Test-Information: Manually checked 30 random files that the conversion worked as expected. Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Sluift/Watchdog.cpp')
-rw-r--r--Sluift/Watchdog.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/Sluift/Watchdog.cpp b/Sluift/Watchdog.cpp
index 6494850..a99d63a 100644
--- a/Sluift/Watchdog.cpp
+++ b/Sluift/Watchdog.cpp
@@ -13,38 +13,38 @@ static const int INTERVAL_MS = 500;
using namespace Swift;
-Watchdog::Watchdog(int timeout, TimerFactory* timerFactory) :
- remainingTime(timeout),
- timerFactory(timerFactory),
- timedOut(false) {
- Sluift::globals.interruptRequested = 0;
-
- int nextTimeout = remainingTime >= 0 ? std::min(remainingTime, INTERVAL_MS) : INTERVAL_MS;
-
- timer = timerFactory->createTimer(nextTimeout);
- timer->onTick.connect(boost::bind(&Watchdog::handleTimerTick, this));
- remainingTime -= nextTimeout;
- timer->start();
+Watchdog::Watchdog(int timeout, TimerFactory* timerFactory) :
+ remainingTime(timeout),
+ timerFactory(timerFactory),
+ timedOut(false) {
+ Sluift::globals.interruptRequested = 0;
+
+ int nextTimeout = remainingTime >= 0 ? std::min(remainingTime, INTERVAL_MS) : INTERVAL_MS;
+
+ timer = timerFactory->createTimer(nextTimeout);
+ timer->onTick.connect(boost::bind(&Watchdog::handleTimerTick, this));
+ remainingTime -= nextTimeout;
+ timer->start();
}
Watchdog::~Watchdog() {
- if (timer) {
- timer->stop();
- }
+ if (timer) {
+ timer->stop();
+ }
}
void Watchdog::handleTimerTick() {
- if (Sluift::globals.interruptRequested || remainingTime == 0) {
- timedOut = true;
- }
- else {
- int nextTimeout = remainingTime >= 0 ? std::min(remainingTime, INTERVAL_MS) : INTERVAL_MS;
- if (nextTimeout != INTERVAL_MS) {
- timer->onTick.disconnect(boost::bind(&Watchdog::handleTimerTick, this));
- timer = timerFactory->createTimer(nextTimeout);
- timer->onTick.connect(boost::bind(&Watchdog::handleTimerTick, this));
- }
- remainingTime -= nextTimeout;
- timer->start();
- }
+ if (Sluift::globals.interruptRequested || remainingTime == 0) {
+ timedOut = true;
+ }
+ else {
+ int nextTimeout = remainingTime >= 0 ? std::min(remainingTime, INTERVAL_MS) : INTERVAL_MS;
+ if (nextTimeout != INTERVAL_MS) {
+ timer->onTick.disconnect(boost::bind(&Watchdog::handleTimerTick, this));
+ timer = timerFactory->createTimer(nextTimeout);
+ timer->onTick.connect(boost::bind(&Watchdog::handleTimerTick, this));
+ }
+ remainingTime -= nextTimeout;
+ timer->start();
+ }
}