1 files changed, 9 insertions, 11 deletions
diff --git a/Swiftob/MUCs.h b/Swiftob/MUCs.h
index 8f56182..ecbb7a6 100644
--- a/Swiftob/MUCs.h
+++ b/Swiftob/MUCs.h
@@ -21,27 +21,25 @@ class MUC;
 
 class Storage;
 
-using namespace Swift;
-
 class MUCs {
 	public:
-		MUCs(Client* client, Storage* storage);
-		void join(const JID& room, boost::signal<void (const std::string&)>::slot_type successCallback, boost::function<void(const std::string& /*reason*/)> failureCallback);
-		void part(const JID& room);
-		bool contains(const JID& room);
-		MUC::ref getMUC(const JID& room);
+		MUCs(Swift::Client* client, Storage* storage);
+		void join(const Swift::JID& room, boost::signal<void (const std::string&)>::slot_type successCallback, boost::function<void(const std::string& /*reason*/)> failureCallback);
+		void part(const Swift::JID& room);
+		bool contains(const Swift::JID& room);
+		Swift::MUC::ref getMUC(const Swift::JID& room);
 		const std::string& getDefaultNick() const {return defaultNick_;}
 		bool setDefaultNick(const std::string& nick);
 	private:
 		void handleConnected();
-		void handleJoinFailed(const JID& room, ErrorPayload::ref error, boost::function<void(const std::string& /*reason*/)> failureCallback);
+		void handleJoinFailed(const Swift::JID& room, Swift::ErrorPayload::ref error, boost::function<void(const std::string& /*reason*/)> failureCallback);
 		void handleInitialJoinSuccess();
 		void handleInitialJoinFailure(const std::string&);
 		void save();
 	private:
-		MUCRegistry registry_;
-		std::map<JID, MUC::ref> mucs_;
-		Client* client_;
+		Swift::MUCRegistry registry_;
+		std::map<Swift::JID, Swift::MUC::ref> mucs_;
+		Swift::Client* client_;
 		Storage* storage_;
 		std::string defaultNick_;
 };