diff options
| author | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
| commit | 629fb50716083c71146340de97eb8651679ca9fb (patch) | |
| tree | 9c5f25fdfd24f3cdb89924062f291a6647580878 /src/gui/ConnectWindow.cpp | |
| parent | 6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff) | |
| download | ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.gz ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.bz2 ingen-629fb50716083c71146340de97eb8651679ca9fb.zip | |
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
Diffstat (limited to 'src/gui/ConnectWindow.cpp')
| -rw-r--r-- | src/gui/ConnectWindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 0c3dde27..81426620 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -28,8 +28,8 @@ #include "ingen/client/ClientStore.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/ThreadedSigClientInterface.hpp" -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" #include "App.hpp" #include "ConnectWindow.hpp" @@ -72,7 +72,7 @@ ConnectWindow::ConnectWindow(BaseObjectType* cobject, } void -ConnectWindow::start(App& app, Ingen::Shared::World* world) +ConnectWindow::start(App& app, Ingen::World* world) { _app = &app; @@ -160,7 +160,7 @@ ConnectWindow::connect(bool existing) _connect_stage = 0; set_connecting_widget_states(); - Ingen::Shared::World* world = _app->world(); + Ingen::World* world = _app->world(); #ifdef HAVE_SOCKET if (_mode == CONNECT_REMOTE) { |