Moved Store into LibOmClient namespace

git-svn-id: http://svn.drobilla.net/lad/grauph@27 a436a847-0d15-0410-975c-d299462d15a1

3 files changed, 9 insertions, 16 deletions

diff --git a/src/progs/gtk/Makefile.am b/src/progs/gtk/Makefile.am
index 42d66b05..71b5c477 100644
--- a/src/progs/gtk/Makefile.am
+++ b/src/progs/gtk/Makefile.am
@@ -21,8 +21,6 @@ om_gtk_SOURCES = \
 	ConnectWindow.cpp \
 	App.h \
 	App.cpp \
-	Store.h \
-	Store.cpp \
 	Configuration.h \
 	Configuration.cpp \
 	GladeFactory.h \
diff --git a/src/progs/gtk/Store.cpp b/src/progs/gtk/Store.cpp
index 8f74e3c7..ae285305 100644
--- a/src/progs/gtk/Store.cpp
+++ b/src/progs/gtk/Store.cpp
@@ -23,7 +23,7 @@
 #include "PatchModel.h"
 #include "SigClientInterface.h"
 
-namespace OmGtk {
+namespace LibOmClient {
 
 Store::Store(SigClientInterface& emitter)
 {
@@ -259,5 +259,5 @@ Store::new_port_event(const string& path, const string& type, bool is_output)
 }
 
 
-} // namespace OmGtk
+} // namespace LibOmClient
 
diff --git a/src/progs/gtk/Store.h b/src/progs/gtk/Store.h
index c3e465c0..2b32dde6 100644
--- a/src/progs/gtk/Store.h
+++ b/src/progs/gtk/Store.h
@@ -27,18 +27,13 @@
 using std::string; using std::map;
 
 namespace LibOmClient {
-	class SigClientInterface;
-	class ObjectModel;
-	class PluginModel;
-	class PatchModel;
-	class NodeModel;
-	class PortModel;
-}
-using namespace LibOmClient;
-
-namespace OmGtk {
-
 
+class SigClientInterface;
+class ObjectModel;
+class PluginModel;
+class PatchModel;
+class NodeModel;
+class PortModel;
 
 /** Singeton which holds all "Om Objects" for easy/fast lookup
  *
@@ -84,6 +79,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace LibOmClient
 
 #endif // STORE_H