Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-09-14 21:05:58 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-09-22 15:00:47 (GMT) |
| commit | 74116593461c0c7b233dad96034768264e7a59ec (patch) | |
| tree | 0794a0076d54a49e99f046508fc57f07ca56b921 /Swift/Controllers | |
| parent | 9b48a737db5237ecdec062a64b65e6a90c1f9cde (diff) | |
| download | swift-74116593461c0c7b233dad96034768264e7a59ec.zip swift-74116593461c0c7b233dad96034768264e7a59ec.tar.bz2 | |
Fix 'unused' member/parameter compiler warnings reported for Swift
Test-Information:
Still compiles, the menitoned warnings in Swift are gone and unit
tests pass.
Change-Id: I8e113e7faf2e9273b4741f18c19e35e1b7bc7661
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/HistoryController.cpp | 11 | ||||
| -rw-r--r-- | Swift/Controllers/HistoryController.h | 13 |
2 files changed, 16 insertions, 8 deletions
diff --git a/Swift/Controllers/HistoryController.cpp b/Swift/Controllers/HistoryController.cpp index cce139b..f439429 100644 --- a/Swift/Controllers/HistoryController.cpp +++ b/Swift/Controllers/HistoryController.cpp | |||
| @@ -3,24 +3,27 @@ | |||
| 3 | * Licensed under the simplified BSD license. | 3 | * Licensed under the simplified BSD license. |
| 4 | * See Documentation/Licenses/BSD-simplified.txt for more information. | 4 | * See Documentation/Licenses/BSD-simplified.txt for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (c) 2014 Isode Limited. | 8 | * Copyright (c) 2014-2015 Isode Limited. |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * See the COPYING file for more information. | 10 | * See the COPYING file for more information. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | #include <Swift/Controllers/HistoryController.h> | 14 | #include <Swift/Controllers/HistoryController.h> |
| 15 | #include <Swiften/History/HistoryStorage.h> | 15 | |
| 16 | #include <Swiften/History/HistoryMessage.h> | ||
| 17 | #include <boost/date_time/c_local_time_adjustor.hpp> | 16 | #include <boost/date_time/c_local_time_adjustor.hpp> |
| 18 | 17 | ||
| 18 | #include <Swiften/History/HistoryMessage.h> | ||
| 19 | #include <Swiften/History/HistoryStorage.h> | ||
| 20 | #include <Swiften/JID/JID.h> | ||
| 21 | |||
| 19 | namespace Swift { | 22 | namespace Swift { |
| 20 | 23 | ||
| 21 | HistoryController::HistoryController(HistoryStorage* localHistoryStorage) : localHistory_(localHistoryStorage), remoteArchiveSupported_(false) { | 24 | HistoryController::HistoryController(HistoryStorage* localHistoryStorage) : localHistory_(localHistoryStorage) { |
| 22 | } | 25 | } |
| 23 | 26 | ||
| 24 | HistoryController::~HistoryController() { | 27 | HistoryController::~HistoryController() { |
| 25 | } | 28 | } |
| 26 | 29 | ||
diff --git a/Swift/Controllers/HistoryController.h b/Swift/Controllers/HistoryController.h index 8c86409..0bdbb35 100644 --- a/Swift/Controllers/HistoryController.h +++ b/Swift/Controllers/HistoryController.h | |||
| @@ -2,16 +2,22 @@ | |||
| 2 | * Copyright (c) 2012 Catalin Badea | 2 | * Copyright (c) 2012 Catalin Badea |
| 3 | * Licensed under the simplified BSD license. | 3 | * Licensed under the simplified BSD license. |
| 4 | * See Documentation/Licenses/BSD-simplified.txt for more information. | 4 | * See Documentation/Licenses/BSD-simplified.txt for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | ||
| 8 | * Copyright (c) 2015 Isode Limited. | ||
| 9 | * All rights reserved. | ||
| 10 | * See the COPYING file for more information. | ||
| 11 | */ | ||
| 12 | |||
| 7 | #pragma once | 13 | #pragma once |
| 8 | 14 | ||
| 9 | #include <Swiften/JID/JID.h> | ||
| 10 | #include <boost/date_time/posix_time/posix_time.hpp> | ||
| 11 | #include <vector> | 15 | #include <vector> |
| 12 | #include <set> | 16 | |
| 17 | #include <boost/date_time/posix_time/posix_time.hpp> | ||
| 18 | |||
| 13 | #include <Swiften/Base/boost_bsignals.h> | 19 | #include <Swiften/Base/boost_bsignals.h> |
| 14 | #include <Swiften/History/HistoryMessage.h> | 20 | #include <Swiften/History/HistoryMessage.h> |
| 15 | #include <Swiften/History/HistoryStorage.h> | 21 | #include <Swiften/History/HistoryStorage.h> |
| 16 | 22 | ||
| 17 | namespace Swift { | 23 | namespace Swift { |
| @@ -33,8 +39,7 @@ namespace Swift { | |||
| 33 | 39 | ||
| 34 | boost::signal<void (const HistoryMessage&)> onNewMessage; | 40 | boost::signal<void (const HistoryMessage&)> onNewMessage; |
| 35 | 41 | ||
| 36 | private: | 42 | private: |
| 37 | HistoryStorage* localHistory_; | 43 | HistoryStorage* localHistory_; |
| 38 | bool remoteArchiveSupported_; | ||
| 39 | }; | 44 | }; |
| 40 | } | 45 | } |