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 | |
| 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
| -rw-r--r-- | Swift/Controllers/HistoryController.cpp | 11 | ||||
| -rw-r--r-- | Swift/Controllers/HistoryController.h | 13 | ||||
| -rw-r--r-- | Swift/QtUI/QtAdHocCommandWithJIDWindow.cpp | 17 | ||||
| -rw-r--r-- | Swift/QtUI/QtPlainChatView.cpp | 2 |
4 files changed, 27 insertions, 16 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 @@ -5,20 +5,23 @@ */ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swift/Controllers/HistoryController.h> -#include <Swiften/History/HistoryStorage.h> -#include <Swiften/History/HistoryMessage.h> + #include <boost/date_time/c_local_time_adjustor.hpp> +#include <Swiften/History/HistoryMessage.h> +#include <Swiften/History/HistoryStorage.h> +#include <Swiften/JID/JID.h> + namespace Swift { -HistoryController::HistoryController(HistoryStorage* localHistoryStorage) : localHistory_(localHistoryStorage), remoteArchiveSupported_(false) { +HistoryController::HistoryController(HistoryStorage* localHistoryStorage) : localHistory_(localHistoryStorage) { } HistoryController::~HistoryController() { 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 @@ -4,12 +4,18 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2015 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #pragma once -#include <Swiften/JID/JID.h> -#include <boost/date_time/posix_time/posix_time.hpp> #include <vector> -#include <set> + +#include <boost/date_time/posix_time/posix_time.hpp> + #include <Swiften/Base/boost_bsignals.h> #include <Swiften/History/HistoryMessage.h> #include <Swiften/History/HistoryStorage.h> @@ -35,6 +41,5 @@ namespace Swift { private: HistoryStorage* localHistory_; - bool remoteArchiveSupported_; }; } diff --git a/Swift/QtUI/QtAdHocCommandWithJIDWindow.cpp b/Swift/QtUI/QtAdHocCommandWithJIDWindow.cpp index 4a28bbd..ac2a603 100644 --- a/Swift/QtUI/QtAdHocCommandWithJIDWindow.cpp +++ b/Swift/QtUI/QtAdHocCommandWithJIDWindow.cpp @@ -1,23 +1,26 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ +#include <Swift/QtUI/QtAdHocCommandWithJIDWindow.h> + #include <boost/bind.hpp> -#include <QLabel> -#include <QPushButton> + #include <QBoxLayout> #include <QDialogButtonBox> +#include <QLabel> +#include <QPushButton> + #include <Swiften/Elements/Command.h> -#include <Swift/Controllers/UIEvents/UIEventStream.h> + #include <Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h> -#include <Swift/QtUI/QtAdHocCommandWithJIDWindow.h> +#include <Swift/Controllers/UIEvents/UIEventStream.h> + #include <Swift/QtUI/QtFormWidget.h> #include <Swift/QtUI/QtSwiftUtil.h> -const int FormLayoutIndex = 1; - namespace Swift { QtAdHocCommandWithJIDWindow::QtAdHocCommandWithJIDWindow(UIEventStream* uiEventStream) : uiEventStream_(uiEventStream) { QVBoxLayout* hlayout = new QVBoxLayout(this); diff --git a/Swift/QtUI/QtPlainChatView.cpp b/Swift/QtUI/QtPlainChatView.cpp index eabf35f..e062efc 100644 --- a/Swift/QtUI/QtPlainChatView.cpp +++ b/Swift/QtUI/QtPlainChatView.cpp @@ -163,7 +163,7 @@ void QtPlainChatView::replaceLastMessage(const ChatWindow::ChatMessage& message, log_->append(text); } -void QtPlainChatView::replaceSystemMessage(const ChatWindow::ChatMessage& message, const std::string& id, const ChatWindow::TimestampBehaviour timestampBehaviour) { +void QtPlainChatView::replaceSystemMessage(const ChatWindow::ChatMessage& message, const std::string& /*id*/, const ChatWindow::TimestampBehaviour /*timestampBehaviour*/) { QString text = "<p><i>"; text += chatMessageToString(message); text += "</i></p>"; |