diff options
| -rw-r--r-- | src/engine/Engine.hpp | 2 | ||||
| -rw-r--r-- | src/engine/LV2Info.hpp | 1 | ||||
| -rw-r--r-- | src/engine/NodeFactory.hpp | 4 | ||||
| -rw-r--r-- | src/gui/App.cpp | 1 | ||||
| -rw-r--r-- | src/gui/LoadRemotePatchWindow.cpp | 1 | ||||
| -rw-r--r-- | src/gui/PatchCanvas.cpp | 1 | ||||
| -rw-r--r-- | src/gui/ThreadedLoader.cpp | 1 | ||||
| -rw-r--r-- | src/gui/UploadPatchWindow.cpp | 1 | ||||
| -rw-r--r-- | src/gui/gui.hpp | 6 | ||||
| -rw-r--r-- | src/ingen/main.cpp | 2 | ||||
| -rw-r--r-- | src/module/ingen_module.cpp (renamed from src/module/global.cpp) | 2 | ||||
| -rw-r--r-- | src/module/ingen_module.hpp (renamed from src/module/global.hpp) | 0 | ||||
| -rw-r--r-- | src/module/wscript | 2 |
13 files changed, 7 insertions, 17 deletions
diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp index 479a4832..16635561 100644 --- a/src/engine/Engine.hpp +++ b/src/engine/Engine.hpp @@ -23,7 +23,7 @@ #include <set> #include <boost/utility.hpp> #include "raul/SharedPtr.hpp" -#include "module/global.hpp" +#include "module/World.hpp" #include "interface/DataType.hpp" #include "interface/EventType.hpp" diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp index 63b1b9c2..f689e45f 100644 --- a/src/engine/LV2Info.hpp +++ b/src/engine/LV2Info.hpp @@ -26,7 +26,6 @@ #include <map> #include <string> #include "slv2/slv2.h" -#include "module/global.hpp" #include "module/World.hpp" #include "shared/LV2URIMap.hpp" #include "shared/LV2Features.hpp" diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp index fe443424..1c8299b2 100644 --- a/src/engine/NodeFactory.hpp +++ b/src/engine/NodeFactory.hpp @@ -24,9 +24,9 @@ #include <pthread.h> #include <glibmm/module.h> #include "raul/SharedPtr.hpp" -#include "ingen-config.h" -#include "module/global.hpp" #include "raul/URI.hpp" +#include "module/World.hpp" +#include "ingen-config.h" namespace Ingen { diff --git a/src/gui/App.cpp b/src/gui/App.cpp index fd9a947f..29b00283 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -26,7 +26,6 @@ #include <sys/time.h> #include "raul/Path.hpp" #include "flowcanvas/Connection.hpp" -#include "module/global.hpp" #include "module/Module.hpp" #include "module/World.hpp" #include "engine/Engine.hpp" diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp index 0f57fbf9..149648c8 100644 --- a/src/gui/LoadRemotePatchWindow.cpp +++ b/src/gui/LoadRemotePatchWindow.cpp @@ -22,7 +22,6 @@ #include "client/PatchModel.hpp" #include "interface/EngineInterface.hpp" #include "module/World.hpp" -#include "module/global.hpp" #include "App.hpp" #include "Configuration.hpp" #include "LoadRemotePatchWindow.hpp" diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index bbe3d2c8..d25095e3 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -16,7 +16,6 @@ */ #include "ingen-config.h" -#include "module/global.hpp" #include "module/World.hpp" #include <cassert> diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 7664ffc7..1a2a209e 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -17,7 +17,6 @@ #include <iostream> #include <string> -#include "module/global.hpp" #include "module/World.hpp" #include "module/Module.hpp" #include "App.hpp" diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp index 1d930cb5..c24de34c 100644 --- a/src/gui/UploadPatchWindow.cpp +++ b/src/gui/UploadPatchWindow.cpp @@ -22,7 +22,6 @@ #include <boost/optional/optional.hpp> #include <curl/curl.h> #include "redlandmm/Query.hpp" -#include "module/global.hpp" #include "module/World.hpp" #include "client/ClientStore.hpp" #include "interface/EngineInterface.hpp" diff --git a/src/gui/gui.hpp b/src/gui/gui.hpp index 343bc618..19eabe0b 100644 --- a/src/gui/gui.hpp +++ b/src/gui/gui.hpp @@ -18,13 +18,9 @@ #ifndef INGEN_GUI_H #define INGEN_GUI_H -#include "module/global.hpp" - namespace Ingen { -class Engine; - -namespace Shared { class EngineInterface; } +namespace Shared { class World; } namespace GUI { diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 3ead6146..caf65e78 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -29,7 +29,7 @@ #include "raul/SharedPtr.hpp" #include "redlandmm/World.hpp" #include "shared/runtime_paths.hpp" -#include "module/global.hpp" +#include "module/ingen_module.hpp" #include "module/Module.hpp" #include "module/World.hpp" #include "engine/tuning.hpp" diff --git a/src/module/global.cpp b/src/module/ingen_module.cpp index 2415f6ef..c9a6d9d4 100644 --- a/src/module/global.cpp +++ b/src/module/ingen_module.cpp @@ -18,7 +18,7 @@ #include <iostream> #include "redlandmm/World.hpp" #include "shared/LV2Features.hpp" -#include "global.hpp" +#include "ingen_module.hpp" #include "World.hpp" #include "ingen-config.h" diff --git a/src/module/global.hpp b/src/module/ingen_module.hpp index ef373430..ef373430 100644 --- a/src/module/global.hpp +++ b/src/module/ingen_module.hpp diff --git a/src/module/wscript b/src/module/wscript index 50103f7e..6c7e726e 100644 --- a/src/module/wscript +++ b/src/module/wscript @@ -5,7 +5,7 @@ def build(bld): obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' Module.cpp - global.cpp + ingen_module.cpp ''' obj.export_incdirs = ['.'] obj.includes = ['.', '..', '../..', '../common'] |