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
@@ -19,6 +19,4 @@ class Client;
 class MUCs;
 
-using namespace Swift;
-
 class Users {
 	public:
@@ -27,5 +25,5 @@ class Users {
 				/* 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_;}
@@ -36,12 +34,12 @@ 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_;
 };