Killed the 'commands' namespace.

1 files changed, 20 insertions, 22 deletions

diff --git a/commands.h b/commands.h
index ae5dc84..084dd02 100644
--- a/commands.h
+++ b/commands.h
@@ -11,35 +11,33 @@
 #include <map>
 #include <stdexcept>
 
-namespace commands {
-	class Commands;
+class Commands;
 
-	class CommandException : public std::runtime_error {
-		public:
-			CommandException(const char *s) : std::runtime_error(s) {};
-			CommandException(std::string s) : std::runtime_error(s.c_str()) {};
-	};
+class CommandException : public std::runtime_error {
+	public:
+		CommandException(const char *s) : std::runtime_error(s) {};
+		CommandException(std::string s) : std::runtime_error(s.c_str()) {};
+};
 
-	class Commands {
-		private:
-			typedef boost::function<std::vector<std::string> (Commands*)> Handler;
-			std::map<std::string, Handler> handlers;
+class Commands {
+	private:
+		typedef boost::function<std::vector<std::string> (Commands*)> Handler;
+		std::map<std::string, Handler> handlers;
 
-			typedef boost::function<std::vector<MusicListing::p> (const std::string artist)> FindFunction;
-			std::map<std::string, FindFunction> find_handlers;
+		typedef boost::function<std::vector<MusicListing::p> (const std::string artist)> FindFunction;
+		std::map<std::string, FindFunction> find_handlers;
 
-			boost::asio::io_service& io_service;
-			std::vector<std::string>& args;
+		boost::asio::io_service& io_service;
+		std::vector<std::string>& args;
 
-			std::vector<std::string> ls();
-			std::vector<std::string> find();
-			std::vector<std::string> update();
+		std::vector<std::string> ls();
+		std::vector<std::string> find();
+		std::vector<std::string> update();
 
-		public:
-			Commands(boost::asio::io_service& io_service, std::vector<std::string>& args);
-			std::vector<std::string> operator()();
+	public:
+		Commands(boost::asio::io_service& io_service, std::vector<std::string>& args);
+		std::vector<std::string> operator()();
 
-	};
 };
 
 #endif