Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-04-12 09:05:33 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-04-12 09:05:33 (GMT) |
| commit | 4024517891d3a222e71e6632c3609fcda08c875e (patch) | |
| tree | 690020d1a9c1a4c3fd8bff0f59d196ee23b05d60 /Swift/Controllers/UIInterfaces/UserSearchWindow.h | |
| parent | 43b85e93c7acd865be2de009651e146e9faece96 (diff) | |
| download | swift-4024517891d3a222e71e6632c3609fcda08c875e.zip swift-4024517891d3a222e71e6632c3609fcda08c875e.tar.bz2 | |
Assert first page in QtUserSearchWindow wizard based on type
Converted enum to C++11 enum class in process.
Coverity raised this issue.
Test-Information:
All unit tests pass. Using the “Add Contact…” and “Start Chat…”
dialogs did not crash.
Tested on macOS 10.12.4 with Qt 5.4.2.
Change-Id: I0409688b001d1eaaf5fa77a25b1158ce9e611c77
Diffstat (limited to 'Swift/Controllers/UIInterfaces/UserSearchWindow.h')
| -rw-r--r-- | Swift/Controllers/UIInterfaces/UserSearchWindow.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/UIInterfaces/UserSearchWindow.h b/Swift/Controllers/UIInterfaces/UserSearchWindow.h index 279f4f3..c13e376 100644 --- a/Swift/Controllers/UIInterfaces/UserSearchWindow.h +++ b/Swift/Controllers/UIInterfaces/UserSearchWindow.h @@ -1,53 +1,53 @@ /* - * Copyright (c) 2010-2016 Isode Limited. + * Copyright (c) 2010-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <string> #include <vector> #include <boost/signals2.hpp> #include <Swiften/JID/JID.h> #include <Swift/Controllers/Chat/UserSearchController.h> #include <Swift/Controllers/Contact.h> namespace Swift { class UserSearchWindow { public: - enum Type {AddContact, ChatToContact, InviteToChat}; + enum class Type {AddContact, ChatToContact, InviteToChat}; virtual ~UserSearchWindow() {} virtual void clear() = 0; virtual void setResults(const std::vector<UserSearchResult>& results) = 0; virtual void setResultsForm(const Form::ref results) = 0; virtual void addSavedServices(const std::vector<JID>& services) = 0; virtual void setSelectedService(const JID& service) = 0; virtual void setServerSupportsSearch(bool support) = 0; virtual void setSearchError(bool support) = 0; virtual void setSearchFields(std::shared_ptr<SearchPayload> fields) = 0; virtual void setNameSuggestions(const std::vector<std::string>& suggestions) = 0; virtual void prepopulateJIDAndName(const JID& jid, const std::string& name) = 0; virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions) = 0; virtual void setJIDs(const std::vector<JID>&) = 0; virtual void setOriginator(const JID& originator) = 0; virtual void setRoomJID(const JID& roomJID) = 0; virtual std::string getReason() const = 0; virtual std::vector<JID> getJIDs() const = 0; virtual void setCanStartImpromptuChats(bool supportsImpromptu) = 0; virtual void updateContacts(const std::vector<Contact::ref>& contacts) = 0; virtual void addContacts(const std::vector<Contact::ref>& contacts) = 0; virtual void setCanSupplyDescription(bool allowed) = 0; virtual void setWarning(const boost::optional<std::string>& message) = 0; virtual void show() = 0; boost::signals2::signal<void (const JID&)> onFormRequested; boost::signals2::signal<void (std::shared_ptr<SearchPayload>, const JID&)> onSearchRequested; boost::signals2::signal<void (const JID&)> onNameSuggestionRequested; boost::signals2::signal<void (const std::string&)> onContactSuggestionsRequested; |