4 files changed, 5 insertions, 29 deletions
diff --git a/Swift/QtUI/UserSearch/ContactListModel.cpp b/Swift/QtUI/UserSearch/ContactListModel.cpp
index 6ef85d7..5d8aa6c 100644
--- a/Swift/QtUI/UserSearch/ContactListModel.cpp
+++ b/Swift/QtUI/UserSearch/ContactListModel.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -22,32 +22,6 @@
 
 namespace Swift {
 
-QDataStream& operator >>(QDataStream& in, StatusShow::Type& e){
-    quint32 buffer;
-    in >> buffer;
-    switch(buffer) {
-        case StatusShow::Online:
-            e = StatusShow::Online;
-            break;
-        case StatusShow::Away:
-            e = StatusShow::Away;
-            break;
-        case StatusShow::FFC:
-            e = StatusShow::FFC;
-            break;
-        case StatusShow::XA:
-            e = StatusShow::XA;
-            break;
-        case StatusShow::DND:
-            e = StatusShow::DND;
-            break;
-        default:
-            e = StatusShow::None;
-            break;
-    }
-    return in;
-}
-
 ContactListModel::ContactListModel(bool editable) : QAbstractItemModel(), editable_(editable) {
 }
 
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
index 8c46e38..e55ee80 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
@@ -205,7 +205,7 @@ void QtSuggestingJIDInput::hidePopup() {
 
     // Give focus back to input widget because the hide() call passes the focus to the wrong widget.
     setFocus();
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     // This workaround is needed on OS X, to bring the dialog containing this widget back to the front after
     // the popup is hidden. Ubuntu 16.04 and Windows 8 do not have this issue.
     window()->raise();
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index 8d15739..4489bc0 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -606,6 +606,7 @@ void QtUserSearchWindow::clear() {
             howText = QString(tr("Who do you want to invite to the chat?"));
         }
         firstMultiJIDPage_->howLabel_->setText(howText);
+        firstMultiJIDPage_->groupBox->setEnabled(true);
     }
     clearForm();
     resultsPage_->results_->setModel(nullptr);
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
index d487a91..f67712e 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,6 +8,7 @@
 
 #include <set>
 
+#include <QAbstractItemModel>
 #include <QWizard>
 
 #include <Swift/Controllers/UIInterfaces/UserSearchWindow.h>