1 files changed, 49 insertions, 48 deletions
diff --git a/Swift/QtUI/Roster/QtOccupantListWidget.cpp b/Swift/QtUI/Roster/QtOccupantListWidget.cpp
index 12dc1e4..a12863d 100644
--- a/Swift/QtUI/Roster/QtOccupantListWidget.cpp
+++ b/Swift/QtUI/Roster/QtOccupantListWidget.cpp
@@ -1,25 +1,26 @@
 /*
- * Copyright (c) 2011-2012 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2011-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 
-#include "Roster/QtOccupantListWidget.h"
+#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>
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
 
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
-#include "Swift/Controllers/Roster/GroupRosterItem.h"
-#include "Swift/Controllers/UIEvents/UIEventStream.h"
-#include "QtSwiftUtil.h"
+#include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
-QtOccupantListWidget::QtOccupantListWidget(UIEventStream* eventStream, SettingsProvider* settings, QWidget* parent) : QtTreeWidget(eventStream, settings, parent) {
+QtOccupantListWidget::QtOccupantListWidget(UIEventStream* eventStream, SettingsProvider* settings, MessageTarget privateMessageTarget, QWidget* parent) : QtTreeWidget(eventStream, settings, privateMessageTarget, parent) {
 
 }
 
@@ -28,47 +29,47 @@ QtOccupantListWidget::~QtOccupantListWidget() {
 }
 
 void QtOccupantListWidget::setAvailableOccupantActions(const std::vector<ChatWindow::OccupantAction>& actions) {
-	availableOccupantActions_ = actions;
+    availableOccupantActions_ = actions;
 }
 
 void QtOccupantListWidget::contextMenuEvent(QContextMenuEvent* event) {
-	QModelIndex index = indexAt(event->pos());
-	if (!index.isValid()) {
-		return;
-	}
+    QModelIndex index = indexAt(event->pos());
+    if (!index.isValid()) {
+        return;
+    }
 
-	RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
-	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
-	if (contact) {
-		onSomethingSelectedChanged(contact);
-		QMenu contextMenu;
-		if (availableOccupantActions_.empty()) {
-			QAction* noAction = contextMenu.addAction(tr("No actions for this user"));
-			noAction->setEnabled(false);
-			contextMenu.exec(event->globalPos());
-		}
-		else {
-			std::map<QAction*, ChatWindow::OccupantAction> actions;
-			foreach (ChatWindow::OccupantAction availableAction, availableOccupantActions_) {
-				QString text = "Error: missing string";
-				switch (availableAction) {
-					case ChatWindow::Kick: text = tr("Kick user"); break;
-					case ChatWindow::Ban: text = tr("Kick and ban user"); break;
-					case ChatWindow::MakeModerator: text = tr("Make moderator"); break;
-					case ChatWindow::MakeParticipant: text = tr("Make participant"); break;
-					case ChatWindow::MakeVisitor: text = tr("Remove voice"); break;
-					case ChatWindow::AddContact: text = tr("Add to contacts"); break;
-					case ChatWindow::ShowProfile: text = tr("Show profile"); break;
-				}
-				QAction* action = contextMenu.addAction(text);
-				actions[action] = availableAction;
-			}
-			QAction* result = contextMenu.exec(event->globalPos());
-			if (result) {
-				onOccupantActionSelected(actions[result], contact);
-			}
-		}
-	}
+    RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
+    ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
+    if (contact) {
+        onSomethingSelectedChanged(contact);
+        QMenu contextMenu;
+        if (availableOccupantActions_.empty()) {
+            QAction* noAction = contextMenu.addAction(tr("No actions for this user"));
+            noAction->setEnabled(false);
+            contextMenu.exec(event->globalPos());
+        }
+        else {
+            std::map<QAction*, ChatWindow::OccupantAction> actions;
+            for (const auto& availableAction : availableOccupantActions_) {
+                QString text = "Error: missing string";
+                switch (availableAction) {
+                    case ChatWindow::Kick: text = tr("Kick user"); break;
+                    case ChatWindow::Ban: text = tr("Kick and ban user"); break;
+                    case ChatWindow::MakeModerator: text = tr("Make moderator"); break;
+                    case ChatWindow::MakeParticipant: text = tr("Make participant"); break;
+                    case ChatWindow::MakeVisitor: text = tr("Remove voice"); break;
+                    case ChatWindow::AddContact: text = tr("Add to contacts"); break;
+                    case ChatWindow::ShowProfile: text = tr("Show profile"); break;
+                }
+                QAction* action = contextMenu.addAction(text);
+                actions[action] = availableAction;
+            }
+            QAction* result = contextMenu.exec(event->globalPos());
+            if (result) {
+                onOccupantActionSelected(actions[result], contact);
+            }
+        }
+    }
 }
 
 }