Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-30 16:47:37 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-12-30 18:03:54 (GMT) |
| commit | 96b31c598f5c229c3acc0579ddfe22dd503e2b9d (patch) | |
| tree | d73db22e591e49f088f359b9876df232eb99c6a9 /Swiftob/Users.h | |
| parent | b19210aa48e7cea40929593daed997668fe789be (diff) | |
| download | swift-96b31c598f5c229c3acc0579ddfe22dd503e2b9d.zip swift-96b31c598f5c229c3acc0579ddfe22dd503e2b9d.tar.bz2 | |
Enable & fix pedantic CLang warnings.
Change-Id: I70109624b4bd7aab9ba679a3eaabc225dd64a03a
Diffstat (limited to 'Swiftob/Users.h')
| -rw-r--r-- | Swiftob/Users.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Swiftob/Users.h b/Swiftob/Users.h index 0acc330..a78beed 100644 --- a/Swiftob/Users.h +++ b/Swiftob/Users.h @@ -18,15 +18,13 @@ class Client; class MUCs; -using namespace Swift; - class Users { public: class User { public: /* If you add a role here, edit the role lists in Commands.cpp*/ enum Role {Unknown, Owner}; - User(const JID& jid, Role role) : jid_(jid), role_(role) {} + User(const Swift::JID& jid, Role role) : jid_(jid), role_(role) {} Role getRole() {return role_;} Swift::JID getJID() {return jid_;} private: @@ -35,14 +33,14 @@ class Users { }; public: - Users(Client* client, MUCs* mucs); + Users(Swift::Client* client, MUCs* mucs); void clearAll(); void addUser(const User& user); - User::Role getRoleForSender(Message::ref message); + User::Role getRoleForSender(Swift::Message::ref message); private: std::vector<User> users_; - Client* client_; + Swift::Client* client_; MUCs* mucs_; }; |