2 files changed, 25 insertions, 53 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/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
index fe536ab..f67712e 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
@@ -11,8 +11,6 @@
 #include <QAbstractItemModel>
 #include <QWizard>
 
-#include <Swiften/Base/Override.h>
-
 #include <Swift/Controllers/UIInterfaces/UserSearchWindow.h>
 
 #include <Swift/QtUI/UserSearch/ui_QtUserSearchWizard.h>
@@ -34,34 +32,34 @@ namespace Swift {
         Q_OBJECT
         public:
             QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider);
-            virtual ~QtUserSearchWindow();
+            virtual ~QtUserSearchWindow() override;
 
-            virtual void addSavedServices(const std::vector<JID>& services) SWIFTEN_OVERRIDE;
+            virtual void addSavedServices(const std::vector<JID>& services) override;
 
-            virtual void clear() SWIFTEN_OVERRIDE;
-            virtual void show() SWIFTEN_OVERRIDE;
-            virtual void setResults(const std::vector<UserSearchResult>& results) SWIFTEN_OVERRIDE;
-            virtual void setResultsForm(Form::ref results) SWIFTEN_OVERRIDE;
-            virtual void setSelectedService(const JID& jid) SWIFTEN_OVERRIDE;
-            virtual void setServerSupportsSearch(bool error) SWIFTEN_OVERRIDE;
-            virtual void setSearchError(bool error) SWIFTEN_OVERRIDE;
-            virtual void setSearchFields(std::shared_ptr<SearchPayload> fields) SWIFTEN_OVERRIDE;
-            virtual void setNameSuggestions(const std::vector<std::string>& suggestions) SWIFTEN_OVERRIDE;
-            virtual void prepopulateJIDAndName(const JID& jid, const std::string& name) SWIFTEN_OVERRIDE;
-            virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions) SWIFTEN_OVERRIDE;
-            virtual void setJIDs(const std::vector<JID> &jids) SWIFTEN_OVERRIDE;
-            virtual void setOriginator(const JID& originator) SWIFTEN_OVERRIDE;
-            virtual void setRoomJID(const JID &roomJID) SWIFTEN_OVERRIDE;
-            virtual std::string getReason() const SWIFTEN_OVERRIDE;
-            virtual std::vector<JID> getJIDs() const SWIFTEN_OVERRIDE;
-            virtual void setCanStartImpromptuChats(bool supportsImpromptu) SWIFTEN_OVERRIDE;
-            virtual void updateContacts(const std::vector<Contact::ref> &contacts) SWIFTEN_OVERRIDE;
-            virtual void addContacts(const std::vector<Contact::ref>& contacts) SWIFTEN_OVERRIDE;
-            virtual void setCanSupplyDescription(bool allowed) SWIFTEN_OVERRIDE;
-            virtual void setWarning(const boost::optional<std::string>& message) SWIFTEN_OVERRIDE;
+            virtual void clear() override;
+            virtual void show() override;
+            virtual void setResults(const std::vector<UserSearchResult>& results) override;
+            virtual void setResultsForm(Form::ref results) override;
+            virtual void setSelectedService(const JID& jid) override;
+            virtual void setServerSupportsSearch(bool error) override;
+            virtual void setSearchError(bool error) override;
+            virtual void setSearchFields(std::shared_ptr<SearchPayload> fields) override;
+            virtual void setNameSuggestions(const std::vector<std::string>& suggestions) override;
+            virtual void prepopulateJIDAndName(const JID& jid, const std::string& name) override;
+            virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions) override;
+            virtual void setJIDs(const std::vector<JID> &jids) override;
+            virtual void setOriginator(const JID& originator) override;
+            virtual void setRoomJID(const JID &roomJID) override;
+            virtual std::string getReason() const override;
+            virtual std::vector<JID> getJIDs() const override;
+            virtual void setCanStartImpromptuChats(bool supportsImpromptu) override;
+            virtual void updateContacts(const std::vector<Contact::ref> &contacts) override;
+            virtual void addContacts(const std::vector<Contact::ref>& contacts) override;
+            virtual void setCanSupplyDescription(bool allowed) override;
+            virtual void setWarning(const boost::optional<std::string>& message) override;
 
         protected:
-            virtual int nextId() const SWIFTEN_OVERRIDE;
+            virtual int nextId() const override;
 
         private slots:
             void handleFirstPageRadioChange();