1 files changed, 56 insertions, 56 deletions
diff --git a/Swift/QtUI/QtSubscriptionRequestWindow.cpp b/Swift/QtUI/QtSubscriptionRequestWindow.cpp
index 2ea7305..c8c4178 100644
--- a/Swift/QtUI/QtSubscriptionRequestWindow.cpp
+++ b/Swift/QtUI/QtSubscriptionRequestWindow.cpp
@@ -1,90 +1,90 @@
 /*
- * 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/QtSubscriptionRequestWindow.h"
+#include <Swift/QtUI/QtSubscriptionRequestWindow.h>
 
-#include <QPushButton>
 #include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <QLabel>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 #include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
-QtSubscriptionRequestWindow::QtSubscriptionRequestWindow(boost::shared_ptr<SubscriptionRequestEvent> event, QWidget* parent) : QDialog(parent), event_(event) {
-	QString text = QString(tr("%1 would like to add you to their contact list.")).arg(P2QSTRING(event->getJID().toString()));
-	QVBoxLayout* layout = new QVBoxLayout();
-	QLabel* label = new QLabel(text, this);
-	layout->addWidget(label);
-	label = new QLabel(tr("Would you like to add them to your contact list and share your status when you're online?"));
-	//layout->addWidget(new QLabel);
-	layout->addWidget(label);
+QtSubscriptionRequestWindow::QtSubscriptionRequestWindow(std::shared_ptr<SubscriptionRequestEvent> event, QWidget* parent) : QDialog(parent), event_(event) {
+    QString text = QString(tr("%1 would like to add you to their contact list.")).arg(P2QSTRING(event->getJID().toString()));
+    QVBoxLayout* layout = new QVBoxLayout();
+    QLabel* label = new QLabel(text, this);
+    layout->addWidget(label);
+    label = new QLabel(tr("Would you like to add them to your contact list and share your status when you're online?"));
+    //layout->addWidget(new QLabel);
+    layout->addWidget(label);
 
-	if (event_->getConcluded()) {
-		QLabel* doneLabel = new QLabel(tr("You have already replied to this request"));
-		QPushButton* okButton = new QPushButton(tr("OK"), this);
-		connect(okButton, SIGNAL(clicked()), this, SLOT(handleDefer()));
-		layout->addWidget(doneLabel);
-		layout->addWidget(okButton);
-	} else {
-		QPushButton* yesButton = new QPushButton(tr("Accept"), this);
-		yesButton->setDefault(true);
-		connect(yesButton, SIGNAL(clicked()), this, SLOT(handleYes()));
-		QPushButton* noButton = new QPushButton(tr("Reject"), this);
-		connect(noButton, SIGNAL(clicked()), this, SLOT(handleNo()));
-		QPushButton* deferButton = new QPushButton(tr("Defer"), this);
-		deferButton->setShortcut(QKeySequence(Qt::Key_Escape));
-		connect(deferButton, SIGNAL(clicked()), this, SLOT(handleDefer()));
+    if (event_->getConcluded()) {
+        QLabel* doneLabel = new QLabel(tr("You have already replied to this request"));
+        QPushButton* okButton = new QPushButton(tr("OK"), this);
+        connect(okButton, SIGNAL(clicked()), this, SLOT(handleDefer()));
+        layout->addWidget(doneLabel);
+        layout->addWidget(okButton);
+    } else {
+        QPushButton* yesButton = new QPushButton(tr("Accept"), this);
+        yesButton->setDefault(true);
+        connect(yesButton, SIGNAL(clicked()), this, SLOT(handleYes()));
+        QPushButton* noButton = new QPushButton(tr("Reject"), this);
+        connect(noButton, SIGNAL(clicked()), this, SLOT(handleNo()));
+        QPushButton* deferButton = new QPushButton(tr("Defer"), this);
+        deferButton->setShortcut(QKeySequence(Qt::Key_Escape));
+        connect(deferButton, SIGNAL(clicked()), this, SLOT(handleDefer()));
 
-		QHBoxLayout* buttonLayout = new QHBoxLayout();
-		buttonLayout->addWidget(yesButton);
-		buttonLayout->addWidget(noButton);
-		buttonLayout->addWidget(deferButton);
-		layout->addWidget(new QLabel);
-		layout->addLayout(buttonLayout);
-		layout->addWidget(new QLabel);
-		QLabel* footer = new QLabel(tr("(If you choose to defer this choice, you will be asked again when you next login.)"));
-		layout->addWidget(footer);
-	}
+        QHBoxLayout* buttonLayout = new QHBoxLayout();
+        buttonLayout->addWidget(yesButton);
+        buttonLayout->addWidget(noButton);
+        buttonLayout->addWidget(deferButton);
+        layout->addWidget(new QLabel);
+        layout->addLayout(buttonLayout);
+        layout->addWidget(new QLabel);
+        QLabel* footer = new QLabel(tr("(If you choose to defer this choice, you will be asked again when you next login.)"));
+        layout->addWidget(footer);
+    }
 
-	setLayout(layout);
+    setLayout(layout);
 }
 
 void QtSubscriptionRequestWindow::handleYes() {
-	event_->accept();
-	delete this;
+    event_->accept();
+    delete this;
 }
 
 void QtSubscriptionRequestWindow::handleNo() {
-	event_->decline();
-	delete this;
+    event_->decline();
+    delete this;
 }
 
 void QtSubscriptionRequestWindow::handleDefer() {
-	event_->defer();
-	delete this;
+    event_->defer();
+    delete this;
 }
 
 QtSubscriptionRequestWindow::~QtSubscriptionRequestWindow() {
-	windows_.removeOne(this);
+    windows_.removeOne(this);
 }
 
-QtSubscriptionRequestWindow* QtSubscriptionRequestWindow::getWindow(boost::shared_ptr<SubscriptionRequestEvent> event, QWidget* parent) {
-	foreach (QtSubscriptionRequestWindow* window, windows_) {
-		if (window->getEvent() == event) {
-			return window;
-		}
-	}
-	QtSubscriptionRequestWindow* window = new QtSubscriptionRequestWindow(event, parent);
-	windows_.append(window);
-	return window;
+QtSubscriptionRequestWindow* QtSubscriptionRequestWindow::getWindow(std::shared_ptr<SubscriptionRequestEvent> event, QWidget* parent) {
+    for (auto window : windows_) {
+        if (window->getEvent() == event) {
+            return window;
+        }
+    }
+    QtSubscriptionRequestWindow* window = new QtSubscriptionRequestWindow(event, parent);
+    windows_.append(window);
+    return window;
 }
 
-boost::shared_ptr<SubscriptionRequestEvent> QtSubscriptionRequestWindow::getEvent() {
-	return event_;
+std::shared_ptr<SubscriptionRequestEvent> QtSubscriptionRequestWindow::getEvent() {
+    return event_;
 }
 
 QList<QtSubscriptionRequestWindow*> QtSubscriptionRequestWindow::windows_;