17 files changed, 86 insertions, 68 deletions
diff --git a/Swift/QtUI/Roster/DelegateCommons.cpp b/Swift/QtUI/Roster/DelegateCommons.cpp
index 73cfbb5..f9d732c 100644
--- a/Swift/QtUI/Roster/DelegateCommons.cpp
+++ b/Swift/QtUI/Roster/DelegateCommons.cpp
@@ -1,14 +1,15 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include "DelegateCommons.h"
+#include <Swift/QtUI/Roster/DelegateCommons.h>
 
-#include <QtScaledAvatarCache.h>
 #include <QFileInfo>
 
+#include <Swift/QtUI/QtScaledAvatarCache.h>
+
 namespace Swift {
 
 
diff --git a/Swift/QtUI/Roster/DelegateCommons.h b/Swift/QtUI/Roster/DelegateCommons.h
index 084d41f..5e28ac1 100644
--- a/Swift/QtUI/Roster/DelegateCommons.h
+++ b/Swift/QtUI/Roster/DelegateCommons.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,10 +8,10 @@
 
 #include <QApplication>
 #include <QFont>
+#include <QIcon>
 #include <QPainter>
 #include <QRect>
 #include <QString>
-#include <QIcon>
 #include <QStyleOptionViewItem>
 
 namespace Swift {
diff --git a/Swift/QtUI/Roster/GroupItemDelegate.cpp b/Swift/QtUI/Roster/GroupItemDelegate.cpp
index a9942f8..d91d4ba 100644
--- a/Swift/QtUI/Roster/GroupItemDelegate.cpp
+++ b/Swift/QtUI/Roster/GroupItemDelegate.cpp
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include "GroupItemDelegate.h"
+#include <Swift/QtUI/Roster/GroupItemDelegate.h>
 
 #include <QPainter>
 #include <QPen>
diff --git a/Swift/QtUI/Roster/GroupItemDelegate.h b/Swift/QtUI/Roster/GroupItemDelegate.h
index 859f3ec..c279c79 100644
--- a/Swift/QtUI/Roster/GroupItemDelegate.h
+++ b/Swift/QtUI/Roster/GroupItemDelegate.h
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <QStyledItemDelegate>
 #include <QColor>
 #include <QFont>
+#include <QStyledItemDelegate>
 
-#include "DelegateCommons.h"
+#include <Swift/QtUI/Roster/DelegateCommons.h>
 
 namespace Swift {
 	class QtTreeWidgetItem;
diff --git a/Swift/QtUI/Roster/QtFilterWidget.cpp b/Swift/QtUI/Roster/QtFilterWidget.cpp
index acfd50f..24be214 100644
--- a/Swift/QtUI/Roster/QtFilterWidget.cpp
+++ b/Swift/QtUI/Roster/QtFilterWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -10,6 +10,8 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+#include <Swift/QtUI/Roster/QtFilterWidget.h>
+
 #include <QEvent>
 #include <QKeyEvent>
 #include <QLayout>
@@ -18,9 +20,9 @@
 
 #include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
+
 #include <Swift/QtUI/QtClosableLineEdit.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
-#include <Swift/QtUI/Roster/QtFilterWidget.h>
 
 namespace Swift {
 
diff --git a/Swift/QtUI/Roster/QtFilterWidget.h b/Swift/QtUI/Roster/QtFilterWidget.h
index d0307ea..314aec2 100644
--- a/Swift/QtUI/Roster/QtFilterWidget.h
+++ b/Swift/QtUI/Roster/QtFilterWidget.h
@@ -4,6 +4,12 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <vector>
@@ -11,8 +17,8 @@
 #include <QBoxLayout>
 #include <QWidget>
 
-#include <Swift/Controllers/Roster/RosterFilter.h>
 #include <Swift/Controllers/Roster/FuzzyRosterFilter.h>
+#include <Swift/Controllers/Roster/RosterFilter.h>
 
 #include <Swift/QtUI/Roster/QtTreeWidget.h>
 
diff --git a/Swift/QtUI/Roster/QtOccupantListWidget.cpp b/Swift/QtUI/Roster/QtOccupantListWidget.cpp
index 4d7a543..1eefd56 100644
--- a/Swift/QtUI/Roster/QtOccupantListWidget.cpp
+++ b/Swift/QtUI/Roster/QtOccupantListWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,10 +7,10 @@
 
 #include <Swift/QtUI/Roster/QtOccupantListWidget.h>
 
-#include <QContextMenuEvent>
-#include <QMenu>
 #include <QAction>
+#include <QContextMenuEvent>
 #include <QInputDialog>
+#include <QMenu>
 
 #include <Swift/Controllers/Roster/ContactRosterItem.h>
 #include <Swift/Controllers/Roster/GroupRosterItem.h>
diff --git a/Swift/QtUI/Roster/QtOccupantListWidget.h b/Swift/QtUI/Roster/QtOccupantListWidget.h
index 645c21a..d433d07 100644
--- a/Swift/QtUI/Roster/QtOccupantListWidget.h
+++ b/Swift/QtUI/Roster/QtOccupantListWidget.h
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2011-2014 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swift/QtUI/Roster/QtTreeWidget.h>
-
 #include <Swiften/Base/boost_bsignals.h>
 
 #include <Swift/Controllers/UIInterfaces/ChatWindow.h>
 
+#include <Swift/QtUI/Roster/QtTreeWidget.h>
+
 namespace Swift {
 class SettingsProvider;
 
diff --git a/Swift/QtUI/Roster/QtRosterWidget.cpp b/Swift/QtUI/Roster/QtRosterWidget.cpp
index bef8635..469fa83 100644
--- a/Swift/QtUI/Roster/QtRosterWidget.cpp
+++ b/Swift/QtUI/Roster/QtRosterWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,23 +7,24 @@
 #include <Swift/QtUI/Roster/QtRosterWidget.h>
 
 #include <QContextMenuEvent>
+#include <QFileDialog>
+#include <QInputDialog>
 #include <QMenu>
 #include <QMessageBox>
-#include <QInputDialog>
-#include <QFileDialog>
 #include <QPushButton>
 
-#include <Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h>
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/GroupRosterItem.h>
 #include <Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h>
 #include <Swift/Controllers/UIEvents/RenameGroupUIEvent.h>
-#include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
+#include <Swift/Controllers/UIEvents/RequestChangeBlockStateUIEvent.h>
+#include <Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestWhiteboardUIEvent.h>
+#include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
 #include <Swift/Controllers/UIEvents/ShowProfileForRosterItemUIEvent.h>
-#include <Swift/Controllers/UIEvents/RequestChangeBlockStateUIEvent.h>
-#include <Swift/QtUI/QtContactEditWindow.h>
-#include <Swift/Controllers/Roster/ContactRosterItem.h>
-#include <Swift/Controllers/Roster/GroupRosterItem.h>
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
+
+#include <Swift/QtUI/QtContactEditWindow.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
diff --git a/Swift/QtUI/Roster/QtRosterWidget.h b/Swift/QtUI/Roster/QtRosterWidget.h
index d785af2..de5ee9b 100644
--- a/Swift/QtUI/Roster/QtRosterWidget.h
+++ b/Swift/QtUI/Roster/QtRosterWidget.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include "Swift/QtUI/Roster/QtTreeWidget.h"
+#include <Swift/QtUI/Roster/QtTreeWidget.h>
 
 namespace Swift {
 class QtUIPreferences;
diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp
index 06a76c3..277effb 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidget.cpp
@@ -1,33 +1,33 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/Roster/QtTreeWidget.h>
 
-#include <boost/smart_ptr/make_shared.hpp>
 #include <boost/bind.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
 
-#include <QUrl>
+#include <QLabel>
 #include <QMimeData>
 #include <QObject>
-#include <QLabel>
 #include <QTimer>
 #include <QToolTip>
+#include <QUrl>
 
 #include <Swiften/Base/Platform.h>
 
 #include <Swift/Controllers/Roster/ContactRosterItem.h>
 #include <Swift/Controllers/Roster/GroupRosterItem.h>
-#include <Swift/Controllers/UIEvents/UIEventStream.h>
+#include <Swift/Controllers/Settings/SettingsProvider.h>
 #include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
 #include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
-#include <Swift/Controllers/Settings/SettingsProvider.h>
- 
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
+
+#include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 #include <Swift/QtUI/Roster/RosterModel.h>
-#include <QtSwiftUtil.h>
 
 namespace Swift {
 
diff --git a/Swift/QtUI/Roster/QtTreeWidget.h b/Swift/QtUI/Roster/QtTreeWidget.h
index ff45547..205bc70 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.h
+++ b/Swift/QtUI/Roster/QtTreeWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,16 +7,16 @@
 #pragma once
 
 #include <QDragEnterEvent>
-#include <QDropEvent>
 #include <QDragMoveEvent>
+#include <QDropEvent>
 #include <QModelIndex>
 #include <QTreeView>
- 
-#include <Swift/QtUI/Roster/RosterDelegate.h>
-#include <Swift/QtUI/Roster/RosterModel.h>
 
 #include <Swift/Controllers/UIInterfaces/ChatWindow.h>
 
+#include <Swift/QtUI/Roster/RosterDelegate.h>
+#include <Swift/QtUI/Roster/RosterModel.h>
+
 namespace Swift {
 class UIEventStream;
 class SettingsProvider;
diff --git a/Swift/QtUI/Roster/RosterDelegate.cpp b/Swift/QtUI/Roster/RosterDelegate.cpp
index c5bb290..ff950e5 100644
--- a/Swift/QtUI/Roster/RosterDelegate.cpp
+++ b/Swift/QtUI/Roster/RosterDelegate.cpp
@@ -1,26 +1,26 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include "RosterDelegate.h"
+#include <Swift/QtUI/Roster/RosterDelegate.h>
 
 #include <QApplication>
-#include <QPainter>
-#include <QColor>
+#include <QBitmap>
 #include <QBrush>
+#include <QColor>
+#include <QDebug>
 #include <QFontMetrics>
+#include <QPainter>
 #include <QPainterPath>
 #include <QPolygon>
-#include <qdebug.h>
-#include <QBitmap>
 
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
-#include "Swift/Controllers/Roster/GroupRosterItem.h"
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/GroupRosterItem.h>
 
-#include "QtTreeWidget.h"
-#include "RosterModel.h"
+#include <Swift/QtUI/Roster/QtTreeWidget.h>
+#include <Swift/QtUI/Roster/RosterModel.h>
 
 namespace Swift {
 
diff --git a/Swift/QtUI/Roster/RosterDelegate.h b/Swift/QtUI/Roster/RosterDelegate.h
index aedb6d6..f17f9b8 100644
--- a/Swift/QtUI/Roster/RosterDelegate.h
+++ b/Swift/QtUI/Roster/RosterDelegate.h
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <QStyledItemDelegate>
 #include <QColor>
 #include <QFont>
+#include <QStyledItemDelegate>
 
-#include "GroupItemDelegate.h"
-#include "DelegateCommons.h"
+#include <Swift/QtUI/Roster/DelegateCommons.h>
+#include <Swift/QtUI/Roster/GroupItemDelegate.h>
 
 namespace Swift {
 	class QtTreeWidget;
diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index b7a1d0a..60e4aca 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,19 +11,20 @@
 #include <QColor>
 #include <QIcon>
 #include <QMimeData>
+
 #include <qdebug.h>
 
-#include <Swiften/Elements/StatusShow.h>
 #include <Swiften/Base/Path.h>
+#include <Swiften/Elements/StatusShow.h>
 
 #include <Swift/Controllers/Roster/ContactRosterItem.h>
 #include <Swift/Controllers/Roster/GroupRosterItem.h>
 #include <Swift/Controllers/StatusUtil.h>
 
-#include <Swift/QtUI/Roster/QtTreeWidget.h>
-#include <Swift/QtUI/Roster/RosterTooltip.h>
 #include <Swift/QtUI/QtResourceHelper.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swift/QtUI/Roster/QtTreeWidget.h>
+#include <Swift/QtUI/Roster/RosterTooltip.h>
 
 namespace Swift {
 
diff --git a/Swift/QtUI/Roster/RosterTooltip.cpp b/Swift/QtUI/Roster/RosterTooltip.cpp
index 86f175d..e4a5626 100644
--- a/Swift/QtUI/Roster/RosterTooltip.cpp
+++ b/Swift/QtUI/Roster/RosterTooltip.cpp
@@ -4,21 +4,27 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #include <Swift/QtUI/Roster/RosterTooltip.h>
 
+#include <QApplication>
 #include <QObject>
 #include <QString>
-#include <QApplication>
 
 #include <Swiften/Base/Path.h>
 
 #include <Swift/Controllers/Roster/ContactRosterItem.h>
 #include <Swift/Controllers/StatusUtil.h>
 
-#include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swift/QtUI/QtResourceHelper.h>
 #include <Swift/QtUI/QtScaledAvatarCache.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtUtilities.h>
-#include <Swift/QtUI/QtResourceHelper.h>
 
 using namespace QtUtilities;
 
diff --git a/Swift/QtUI/Roster/main.cpp b/Swift/QtUI/Roster/main.cpp
index c2fecb5..078fcaf 100644
--- a/Swift/QtUI/Roster/main.cpp
+++ b/Swift/QtUI/Roster/main.cpp
@@ -1,14 +1,15 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <QtGui>
-#include "QtTreeWidget.h"
-#include "QtTreeWidgetFactory.h"
 
-#include "Swiften/Elements/StatusShow.h"
+#include <Swiften/Elements/StatusShow.h>
+
+#include <Swift/QtUI/Roster/QtTreeWidget.h>
+#include <Swift/QtUI/Roster/QtTreeWidgetFactory.h>
 
 int main(int argc, char *argv[])
 {