2 files changed, 11 insertions, 8 deletions
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>";