From 629fb50716083c71146340de97eb8651679ca9fb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 31 Jul 2012 00:14:50 +0000 Subject: Merge Ingen::Shared namespace into Ingen namespace and core libingen library. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/App.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/gui/App.cpp') diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 1d6381fb..2c561dfc 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -29,8 +29,8 @@ #include "ingen/client/ObjectModel.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/SigClientInterface.hpp" -#include "ingen/shared/World.hpp" -#include "ingen/shared/runtime_paths.hpp" +#include "ingen/World.hpp" +#include "ingen/runtime_paths.hpp" #include "lilv/lilv.h" #include "raul/Path.hpp" #include "raul/log.hpp" @@ -62,7 +62,6 @@ namespace Ingen { namespace Client { class PluginModel; } using namespace Client; -using namespace Shared; namespace GUI { @@ -70,7 +69,7 @@ class Port; Gtk::Main* App::_main = 0; -App::App(Ingen::Shared::World* world) +App::App(Ingen::World* world) : _configuration(new Configuration(*this)) , _about_dialog(NULL) , _window_factory(new WindowFactory(*this)) @@ -102,7 +101,7 @@ App::~App() } SharedPtr -App::create(Ingen::Shared::World* world) +App::create(Ingen::World* world) { _main = new Gtk::Main(&world->argc(), &world->argv()); -- cgit v1.2.1