summaryrefslogtreecommitdiffstats
path: root/src/progs/demolition
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/demolition')
-rw-r--r--src/progs/demolition/DemolitionClientInterface.h2
-rw-r--r--src/progs/demolition/DemolitionModel.h3
-rw-r--r--src/progs/demolition/demolition.cpp7
3 files changed, 5 insertions, 7 deletions
diff --git a/src/progs/demolition/DemolitionClientInterface.h b/src/progs/demolition/DemolitionClientInterface.h
index 16a67ce9..1cd85ec2 100644
--- a/src/progs/demolition/DemolitionClientInterface.h
+++ b/src/progs/demolition/DemolitionClientInterface.h
@@ -25,7 +25,7 @@
#include "PluginModel.h"
using std::string;
-using namespace LibOmClient;
+using namespace Ingen::Client;
/** ModelClientInterface implementation for the Gtk client.
diff --git a/src/progs/demolition/DemolitionModel.h b/src/progs/demolition/DemolitionModel.h
index 952d41cb..67eb1005 100644
--- a/src/progs/demolition/DemolitionModel.h
+++ b/src/progs/demolition/DemolitionModel.h
@@ -20,10 +20,9 @@
#include <vector>
#include "PatchModel.h"
#include "util/Path.h"
-using Om::Path;
using std::vector;
-using namespace LibOmClient;
+using namespace Ingen::Client;
class DemolitionModel {
public:
diff --git a/src/progs/demolition/demolition.cpp b/src/progs/demolition/demolition.cpp
index cc2de60c..e5ffded0 100644
--- a/src/progs/demolition/demolition.cpp
+++ b/src/progs/demolition/demolition.cpp
@@ -14,12 +14,11 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "interface/ClientInterface.h"
+#include "interface/ClientKey.h"
#include "OSCModelEngineInterface.h"
-#include "OSCModelEngineInterface.h" // FIXME: make conditional
#include "PatchLibrarian.h"
#include "DemolitionClientInterface.h"
-#include "interface/ClientInterface.h"
-#include "interface/ClientKey.h"
#include "util/CountedPtr.h"
#include <iostream>
#include <unistd.h>
@@ -29,7 +28,7 @@
using std::cout;
using std::endl;
-using namespace LibOmClient;
+using namespace Ingen::Client;
void do_something();