Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-12-26 15:41:42 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-02-03 11:07:33 (GMT) |
| commit | bda5e6672ae7f458316665ecf9564a5bf9f51238 (patch) | |
| tree | 443d2105fe93b56bc07c2d4d17172385aa76625a | |
| parent | d7842c20dd3da47ca15fc102191881465fd23a91 (diff) | |
| download | swift-bda5e6672ae7f458316665ecf9564a5bf9f51238.zip swift-bda5e6672ae7f458316665ecf9564a5bf9f51238.tar.bz2 | |
Stlye fix and declaring EventLoop implementations' dtors as virtual.
Test-Information:
Unit tests run successfully.
Change-Id: I5df196c8bc642eeff4997558c3c56c6fa03bef16
| -rw-r--r-- | Swiften/Base/BoostRandomGenerator.h | 4 | ||||
| -rw-r--r-- | Swiften/EventLoop/DummyEventLoop.h | 4 | ||||
| -rw-r--r-- | Swiften/EventLoop/Qt/QtEventLoop.h | 4 | ||||
| -rw-r--r-- | Swiften/EventLoop/SimpleEventLoop.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/Base/BoostRandomGenerator.h b/Swiften/Base/BoostRandomGenerator.h index cf6dd06..60d56af 100644 --- a/Swiften/Base/BoostRandomGenerator.h +++ b/Swiften/Base/BoostRandomGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Isode Limited. + * Copyright (c) 2012-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -12,7 +12,7 @@ #include <boost/random/mersenne_twister.hpp> namespace Swift { - class BoostRandomGenerator : public RandomGenerator{ + class BoostRandomGenerator : public RandomGenerator { public: BoostRandomGenerator(); diff --git a/Swiften/EventLoop/DummyEventLoop.h b/Swiften/EventLoop/DummyEventLoop.h index 088dac8..6ee1b77 100644 --- a/Swiften/EventLoop/DummyEventLoop.h +++ b/Swiften/EventLoop/DummyEventLoop.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -15,7 +15,7 @@ namespace Swift { class SWIFTEN_API DummyEventLoop : public EventLoop { public: DummyEventLoop(); - ~DummyEventLoop(); + virtual ~DummyEventLoop(); void processEvents() { while (!events_.empty()) { diff --git a/Swiften/EventLoop/Qt/QtEventLoop.h b/Swiften/EventLoop/Qt/QtEventLoop.h index 275ba4b..0e048e5 100644 --- a/Swiften/EventLoop/Qt/QtEventLoop.h +++ b/Swiften/EventLoop/Qt/QtEventLoop.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -16,7 +16,7 @@ namespace Swift { class QtEventLoop : public QObject, public EventLoop { public: QtEventLoop() {} - ~QtEventLoop() { + virtual ~QtEventLoop() { QCoreApplication::removePostedEvents(this); } diff --git a/Swiften/EventLoop/SimpleEventLoop.h b/Swiften/EventLoop/SimpleEventLoop.h index 47f72b4..eedaf88 100644 --- a/Swiften/EventLoop/SimpleEventLoop.h +++ b/Swiften/EventLoop/SimpleEventLoop.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -18,7 +18,7 @@ namespace Swift { class SWIFTEN_API SimpleEventLoop : public EventLoop { public: SimpleEventLoop(); - ~SimpleEventLoop(); + virtual ~SimpleEventLoop(); void run() { doRun(false); |