3 files changed, 15 insertions, 14 deletions
diff --git a/Swift/QtUI/Roster/QtFilterWidget.cpp b/Swift/QtUI/Roster/QtFilterWidget.cpp
index 3ed23b6..d2e4d09 100644
--- a/Swift/QtUI/Roster/QtFilterWidget.cpp
+++ b/Swift/QtUI/Roster/QtFilterWidget.cpp
@@ -77,7 +77,7 @@ bool QtFilterWidget::eventFilter(QObject*, QEvent* event) {
             } else if (keyEvent->key() == Qt::Key_Return) {
                 JID target = treeView_->selectedJID();
                 if (target.isValid()) {
-                    eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(target)));
+                    eventStream_->send(std::make_shared<RequestChatUIEvent>(target));
                 }
                 filterLineEdit_->setText("");
                 updateRosterFilters();
diff --git a/Swift/QtUI/Roster/QtRosterWidget.cpp b/Swift/QtUI/Roster/QtRosterWidget.cpp
index 92fed86..935d6f6 100644
--- a/Swift/QtUI/Roster/QtRosterWidget.cpp
+++ b/Swift/QtUI/Roster/QtRosterWidget.cpp
@@ -48,7 +48,7 @@ void QtRosterWidget::handleEditUserActionTriggered(bool /*checked*/) {
     }
     RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
     if (ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item)) {
-        eventStream_->send(boost::make_shared<RequestContactEditorUIEvent>(contact->getJID()));
+        eventStream_->send(std::make_shared<RequestContactEditorUIEvent>(contact->getJID()));
     }
 }
 
@@ -95,15 +95,15 @@ void QtRosterWidget::contextMenuEvent(QContextMenuEvent* event) {
 #endif
         QAction* result = contextMenu.exec(event->globalPos());
         if (result == editContact) {
-            eventStream_->send(boost::make_shared<RequestContactEditorUIEvent>(contact->getJID()));
+            eventStream_->send(std::make_shared<RequestContactEditorUIEvent>(contact->getJID()));
         }
         else if (result == removeContact) {
             if (QtContactEditWindow::confirmContactDeletion(contact->getJID())) {
-                eventStream_->send(boost::make_shared<RemoveRosterItemUIEvent>(contact->getJID()));
+                eventStream_->send(std::make_shared<RemoveRosterItemUIEvent>(contact->getJID()));
             }
         }
         else if (result == showProfileForContact) {
-            eventStream_->send(boost::make_shared<ShowProfileForRosterItemUIEvent>(contact->getJID()));
+            eventStream_->send(std::make_shared<ShowProfileForRosterItemUIEvent>(contact->getJID()));
         }
         else if (unblockContact && result == unblockContact) {
             if (contact->blockState() == ContactRosterItem::IsDomainBlocked) {
@@ -113,26 +113,26 @@ void QtRosterWidget::contextMenuEvent(QContextMenuEvent* event) {
 
                 messageBox.exec();
                 if (messageBox.clickedButton() == unblockDomainButton)  {
-                    eventStream_->send(boost::make_shared<RequestChangeBlockStateUIEvent>(RequestChangeBlockStateUIEvent::Unblocked, contact->getJID().getDomain()));
+                    eventStream_->send(std::make_shared<RequestChangeBlockStateUIEvent>(RequestChangeBlockStateUIEvent::Unblocked, contact->getJID().getDomain()));
                 }
             } else {
-                eventStream_->send(boost::make_shared<RequestChangeBlockStateUIEvent>(RequestChangeBlockStateUIEvent::Unblocked, contact->getJID()));
+                eventStream_->send(std::make_shared<RequestChangeBlockStateUIEvent>(RequestChangeBlockStateUIEvent::Unblocked, contact->getJID()));
             }
         }
         else if (blockContact && result == blockContact) {
-            eventStream_->send(boost::make_shared<RequestChangeBlockStateUIEvent>(RequestChangeBlockStateUIEvent::Blocked, contact->getJID()));
+            eventStream_->send(std::make_shared<RequestChangeBlockStateUIEvent>(RequestChangeBlockStateUIEvent::Blocked, contact->getJID()));
         }
 #ifdef SWIFT_EXPERIMENTAL_FT
         else if (sendFile && result == sendFile) {
             QString fileName = QFileDialog::getOpenFileName(this, tr("Send File"), "", tr("All Files (*);;"));
             if (!fileName.isEmpty()) {
-                eventStream_->send(boost::make_shared<SendFileUIEvent>(contact->getJID(), Q2PSTRING(fileName)));
+                eventStream_->send(std::make_shared<SendFileUIEvent>(contact->getJID(), Q2PSTRING(fileName)));
             }
         }
 #endif
 #ifdef SWIFT_EXPERIMENTAL_WB
         else if (startWhiteboardChat && result == startWhiteboardChat) {
-            eventStream_->send(boost::make_shared<RequestWhiteboardUIEvent>(contact->getJID()));
+            eventStream_->send(std::make_shared<RequestWhiteboardUIEvent>(contact->getJID()));
         }
 #endif
     }
@@ -155,7 +155,7 @@ void QtRosterWidget::renameGroup(GroupRosterItem* group) {
     bool ok;
     QString newName = QInputDialog::getText(nullptr, tr("Rename group"), tr("Enter a new name for group '%1':").arg(P2QSTRING(group->getDisplayName())), QLineEdit::Normal, P2QSTRING(group->getDisplayName()), &ok);
     if (ok) {
-        eventStream_->send(boost::make_shared<RenameGroupUIEvent>(group->getDisplayName(), Q2PSTRING(newName)));
+        eventStream_->send(std::make_shared<RenameGroupUIEvent>(group->getDisplayName(), Q2PSTRING(newName)));
     }
 }
 
diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp
index 16a186e..249523c 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidget.cpp
@@ -6,8 +6,9 @@
 
 #include <Swift/QtUI/Roster/QtTreeWidget.h>
 
+#include <memory>
+
 #include <boost/bind.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
 #include <QLabel>
 #include <QMimeData>
@@ -140,7 +141,7 @@ void QtTreeWidget::currentChanged(const QModelIndex& current, const QModelIndex&
 void QtTreeWidget::handleItemActivated(const QModelIndex& index) {
     JID target = jidFromIndex(index);
     if (target.isValid()) {
-        eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(target)));
+        eventStream_->send(std::make_shared<RequestChatUIEvent>(target));
     }
 }
 
@@ -158,7 +159,7 @@ void QtTreeWidget::dropEvent(QDropEvent *event) {
             if (contact->supportsFeature(ContactRosterItem::FileTransferFeature)) {
                 QString filename = event->mimeData()->urls().at(0).toLocalFile();
                 if (!filename.isEmpty()) {
-                    eventStream_->send(boost::make_shared<SendFileUIEvent>(contact->getJID(), Q2PSTRING(filename)));
+                    eventStream_->send(std::make_shared<SendFileUIEvent>(contact->getJID(), Q2PSTRING(filename)));
                 }
             }
         }