From d64815e24c043ac87b1504c5f02e93b11c4d8285 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 15 Aug 2012 18:23:39 +0000 Subject: Clean up includes. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4704 a436a847-0d15-0410-975c-d299462d15a1 --- src/Forge.cpp | 1 - src/Store.cpp | 1 - src/gui/Edge.hpp | 1 - src/gui/NodeModule.hpp | 2 +- src/gui/ObjectMenu.hpp | 2 -- src/gui/PatchPortModule.hpp | 3 +++ src/gui/PatchView.hpp | 2 -- src/gui/Port.hpp | 2 ++ src/gui/PortMenu.hpp | 2 -- src/gui/PortPropertiesWindow.cpp | 1 - src/gui/PropertiesWindow.cpp | 1 - src/gui/SubpatchModule.hpp | 4 ++-- src/gui/ThreadedLoader.cpp | 8 +++++--- src/gui/ThreadedLoader.hpp | 12 +++++++----- src/server/DuplexPort.cpp | 2 -- src/server/GraphObjectImpl.cpp | 2 -- src/server/GraphObjectImpl.hpp | 1 - src/server/InputPort.hpp | 1 - src/server/InternalPlugin.cpp | 3 ++- src/server/InternalPlugin.hpp | 1 - src/server/LV2Node.cpp | 1 - src/server/LV2Plugin.hpp | 1 - src/server/NodeFactory.cpp | 2 -- src/server/OutputPort.hpp | 1 - src/server/PatchImpl.cpp | 1 - src/server/PluginImpl.hpp | 1 - src/server/PortImpl.hpp | 1 - src/server/internals/Controller.cpp | 2 -- src/server/internals/Controller.hpp | 1 - src/server/internals/Delay.cpp | 1 - src/server/internals/Delay.hpp | 4 ++-- src/server/internals/Note.cpp | 1 - src/server/internals/Note.hpp | 3 +-- src/server/internals/Trigger.cpp | 1 - src/server/internals/Trigger.hpp | 1 - src/server/util.hpp | 1 - src/socket/SocketListener.cpp | 1 - src/socket/ingen_socket_client.cpp | 2 -- 38 files changed, 25 insertions(+), 53 deletions(-) diff --git a/src/Forge.cpp b/src/Forge.cpp index 6495fadc..077bec73 100644 --- a/src/Forge.cpp +++ b/src/Forge.cpp @@ -15,7 +15,6 @@ */ #include -#include #include "ingen/Forge.hpp" #include "ingen/URIMap.hpp" diff --git a/src/Store.cpp b/src/Store.cpp index 3c551f8d..47a9e1a6 100644 --- a/src/Store.cpp +++ b/src/Store.cpp @@ -15,7 +15,6 @@ */ #include -#include #include "ingen/Store.hpp" #include "raul/log.hpp" diff --git a/src/gui/Edge.hpp b/src/gui/Edge.hpp index 99b83cbb..0bc22a79 100644 --- a/src/gui/Edge.hpp +++ b/src/gui/Edge.hpp @@ -18,7 +18,6 @@ #define INGEN_GUI_EDGE_HPP #include -#include #include "ganv/Edge.hpp" #include "raul/SharedPtr.hpp" diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 3ec72f6d..42ad0fc4 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -17,9 +17,9 @@ #ifndef INGEN_GUI_NODEMODULE_HPP #define INGEN_GUI_NODEMODULE_HPP -#include #include "ganv/Module.hpp" #include "raul/SharedPtr.hpp" + #include "Port.hpp" namespace Raul { class Atom; } diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp index 9c720a4a..6cb20e70 100644 --- a/src/gui/ObjectMenu.hpp +++ b/src/gui/ObjectMenu.hpp @@ -17,8 +17,6 @@ #ifndef INGEN_GUI_OBJECTMENU_HPP #define INGEN_GUI_OBJECTMENU_HPP -#include - #include #include #include diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp index 8e3a320c..90f9cd6d 100644 --- a/src/gui/PatchPortModule.hpp +++ b/src/gui/PatchPortModule.hpp @@ -18,9 +18,12 @@ #define INGEN_GUI_PATCHPORTMODULE_HPP #include + #include + #include "ganv/Module.hpp" #include "raul/URI.hpp" + #include "Port.hpp" namespace Raul { class Atom; } diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp index 6782d311..14183a89 100644 --- a/src/gui/PatchView.hpp +++ b/src/gui/PatchView.hpp @@ -17,8 +17,6 @@ #ifndef INGEN_GUI_PATCHVIEW_HPP #define INGEN_GUI_PATCHVIEW_HPP -#include - #include #include #include diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index d94f9511..6552ba8d 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -19,7 +19,9 @@ #include #include + #include + #include "ganv/Port.hpp" #include "raul/SharedPtr.hpp" #include "raul/WeakPtr.hpp" diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp index cc33efb0..598afaa5 100644 --- a/src/gui/PortMenu.hpp +++ b/src/gui/PortMenu.hpp @@ -17,8 +17,6 @@ #ifndef INGEN_GUI_PORTMENU_HPP #define INGEN_GUI_PORTMENU_HPP -#include - #include #include #include diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp index e0e95a67..4ef6d89b 100644 --- a/src/gui/PortPropertiesWindow.cpp +++ b/src/gui/PortPropertiesWindow.cpp @@ -16,7 +16,6 @@ #include #include -#include #include "ingen/Interface.hpp" #include "ingen/client/NodeModel.hpp" diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp index 8fdb8f78..c12aefd5 100644 --- a/src/gui/PropertiesWindow.cpp +++ b/src/gui/PropertiesWindow.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp index e71dbe63..727f681d 100644 --- a/src/gui/SubpatchModule.hpp +++ b/src/gui/SubpatchModule.hpp @@ -17,10 +17,10 @@ #ifndef INGEN_GUI_SUBPATCHMODULE_HPP #define INGEN_GUI_SUBPATCHMODULE_HPP -#include #include "raul/SharedPtr.hpp" -#include "PatchPortModule.hpp" + #include "NodeModule.hpp" +#include "PatchPortModule.hpp" namespace Ingen { namespace Client { class PatchModel; diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 961ed340..f7c77c99 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -15,12 +15,14 @@ */ #include -#include "raul/log.hpp" -#include "ingen/World.hpp" + #include "ingen/Module.hpp" +#include "ingen/World.hpp" +#include "ingen/client/PatchModel.hpp" +#include "raul/log.hpp" + #include "App.hpp" #include "ThreadedLoader.hpp" -#include "ingen/client/PatchModel.hpp" using namespace Raul; using namespace boost; diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index b9b613b8..e7815eeb 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -17,16 +17,18 @@ #ifndef INGEN_GUI_THREADEDLOADER_HPP #define INGEN_GUI_THREADEDLOADER_HPP -#include -#include #include +#include +#include + #include -#include "raul/Thread.hpp" -#include "raul/Slave.hpp" #include + #include "ingen/Interface.hpp" -#include "ingen/serialisation/Serialiser.hpp" #include "ingen/serialisation/Parser.hpp" +#include "ingen/serialisation/Serialiser.hpp" +#include "raul/Slave.hpp" +#include "raul/Thread.hpp" namespace Ingen { namespace GUI { diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp index f4bf6915..f28831ff 100644 --- a/src/server/DuplexPort.cpp +++ b/src/server/DuplexPort.cpp @@ -14,8 +14,6 @@ along with Ingen. If not, see . */ -#include - #include "ingen/URIs.hpp" #include "Buffer.hpp" diff --git a/src/server/GraphObjectImpl.cpp b/src/server/GraphObjectImpl.cpp index cdb299ee..447e859c 100644 --- a/src/server/GraphObjectImpl.cpp +++ b/src/server/GraphObjectImpl.cpp @@ -14,8 +14,6 @@ along with Ingen. If not, see . */ -#include - #include "raul/log.hpp" #include "GraphObjectImpl.hpp" diff --git a/src/server/GraphObjectImpl.hpp b/src/server/GraphObjectImpl.hpp index 4f2dcbc2..bfc97fb1 100644 --- a/src/server/GraphObjectImpl.hpp +++ b/src/server/GraphObjectImpl.hpp @@ -20,7 +20,6 @@ #include #include #include -#include #include "ingen/GraphObject.hpp" #include "ingen/Resource.hpp" diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp index f26ad78e..d4d565af 100644 --- a/src/server/InputPort.hpp +++ b/src/server/InputPort.hpp @@ -19,7 +19,6 @@ #include #include -#include #include diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp index db43558c..60a5699c 100644 --- a/src/server/InternalPlugin.cpp +++ b/src/server/InternalPlugin.cpp @@ -15,12 +15,13 @@ */ #include -#include + #include "ingen/URIs.hpp" #include "internals/Controller.hpp" #include "internals/Delay.hpp" #include "internals/Note.hpp" #include "internals/Trigger.hpp" + #include "Driver.hpp" #include "Engine.hpp" #include "InternalPlugin.hpp" diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp index 59ba6d5a..bb90f5e6 100644 --- a/src/server/InternalPlugin.hpp +++ b/src/server/InternalPlugin.hpp @@ -18,7 +18,6 @@ #define INGEN_ENGINE_INTERNALPLUGIN_HPP #include -#include #include #include diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp index 16890e6f..c1951baa 100644 --- a/src/server/LV2Node.cpp +++ b/src/server/LV2Node.cpp @@ -18,7 +18,6 @@ #include #include -#include #include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h" #include "lv2/lv2plug.in/ns/ext/morph/morph.h" diff --git a/src/server/LV2Plugin.hpp b/src/server/LV2Plugin.hpp index 8e8effab..226d61ab 100644 --- a/src/server/LV2Plugin.hpp +++ b/src/server/LV2Plugin.hpp @@ -18,7 +18,6 @@ #define INGEN_ENGINE_LV2PLUGIN_HPP #include -#include #include "lilv/lilv.h" #include "raul/SharedPtr.hpp" diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp index 17c0bb79..5f525434 100644 --- a/src/server/NodeFactory.cpp +++ b/src/server/NodeFactory.cpp @@ -16,8 +16,6 @@ #include -#include - #include "lilv/lilv.h" #include "internals/Controller.hpp" diff --git a/src/server/OutputPort.hpp b/src/server/OutputPort.hpp index d2e6672e..2156c2ab 100644 --- a/src/server/OutputPort.hpp +++ b/src/server/OutputPort.hpp @@ -18,7 +18,6 @@ #define INGEN_ENGINE_OUTPUTPORT_HPP #include -#include #include "PortImpl.hpp" diff --git a/src/server/PatchImpl.cpp b/src/server/PatchImpl.cpp index da27657a..5ea3b93b 100644 --- a/src/server/PatchImpl.cpp +++ b/src/server/PatchImpl.cpp @@ -15,7 +15,6 @@ */ #include -#include #include "ingen/URIs.hpp" #include "ingen/World.hpp" diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp index 8aa741e0..13e78b1f 100644 --- a/src/server/PluginImpl.hpp +++ b/src/server/PluginImpl.hpp @@ -18,7 +18,6 @@ #define INGEN_ENGINE_PLUGINIMPL_HPP #include -#include #include diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp index 8a38e261..68787db8 100644 --- a/src/server/PortImpl.hpp +++ b/src/server/PortImpl.hpp @@ -18,7 +18,6 @@ #define INGEN_ENGINE_PORTIMPL_HPP #include -#include #include "raul/Array.hpp" #include "raul/Atom.hpp" diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index 7b18366d..1fb3cf76 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -16,8 +16,6 @@ #include -#include - #include "ingen/URIs.hpp" #include "internals/Controller.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp index 31e5f306..4a366b08 100644 --- a/src/server/internals/Controller.hpp +++ b/src/server/internals/Controller.hpp @@ -17,7 +17,6 @@ #ifndef INGEN_INTERNALS_CONTROLLER_HPP #define INGEN_INTERNALS_CONTROLLER_HPP -#include #include "NodeImpl.hpp" namespace Ingen { diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp index 0ee0e56d..d64f7a8f 100644 --- a/src/server/internals/Delay.cpp +++ b/src/server/internals/Delay.cpp @@ -17,7 +17,6 @@ #include #include -#include #include "ingen/URIs.hpp" #include "raul/Array.hpp" diff --git a/src/server/internals/Delay.hpp b/src/server/internals/Delay.hpp index 047fa41e..3c512d2c 100644 --- a/src/server/internals/Delay.hpp +++ b/src/server/internals/Delay.hpp @@ -17,10 +17,10 @@ #ifndef INGEN_INTERNALS_DELAY_HPP #define INGEN_INTERNALS_DELAY_HPP -#include #include -#include "types.hpp" + #include "NodeImpl.hpp" +#include "types.hpp" namespace Ingen { namespace Server { diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index 5f509859..81562f83 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -15,7 +15,6 @@ */ #include -#include #include "ingen/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp index 9cf07a05..6c7d9a13 100644 --- a/src/server/internals/Note.hpp +++ b/src/server/internals/Note.hpp @@ -17,9 +17,8 @@ #ifndef INGEN_INTERNALS_NOTE_HPP #define INGEN_INTERNALS_NOTE_HPP -#include -#include "types.hpp" #include "NodeImpl.hpp" +#include "types.hpp" namespace Ingen { namespace Server { diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index f938718f..81361bb8 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -15,7 +15,6 @@ */ #include -#include #include "ingen/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp index f9953718..59badc70 100644 --- a/src/server/internals/Trigger.hpp +++ b/src/server/internals/Trigger.hpp @@ -17,7 +17,6 @@ #ifndef INGEN_INTERNALS_TRIGGER_HPP #define INGEN_INTERNALS_TRIGGER_HPP -#include #include "NodeImpl.hpp" namespace Ingen { diff --git a/src/server/util.hpp b/src/server/util.hpp index cae43c35..8f5a39ee 100644 --- a/src/server/util.hpp +++ b/src/server/util.hpp @@ -18,7 +18,6 @@ #define INGEN_ENGINE_UTIL_HPP #include -#include #include "raul/log.hpp" #include "raul/Path.hpp" diff --git a/src/socket/SocketListener.cpp b/src/socket/SocketListener.cpp index 6b68c36c..936dd0e0 100644 --- a/src/socket/SocketListener.cpp +++ b/src/socket/SocketListener.cpp @@ -18,7 +18,6 @@ #include #include -#include #include "ingen/Interface.hpp" #include "ingen/AtomReader.hpp" diff --git a/src/socket/ingen_socket_client.cpp b/src/socket/ingen_socket_client.cpp index 148f2b2a..0e8c95bf 100644 --- a/src/socket/ingen_socket_client.cpp +++ b/src/socket/ingen_socket_client.cpp @@ -14,8 +14,6 @@ along with Ingen. If not, see . */ -#include - #include "ingen/Module.hpp" #include "ingen/World.hpp" #include "raul/log.hpp" -- cgit v1.2.1