From 5268059f5d4ca9325a78da688a7622898354215a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 13 May 2009 04:44:01 +0000 Subject: Remove 'using' declarations from headers. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1993 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/events/AllNotesOffEvent.cpp | 2 ++ src/engine/events/ClearPatchEvent.cpp | 5 +++++ src/engine/events/ClearPatchEvent.hpp | 2 +- src/engine/events/ConnectionEvent.cpp | 6 +++++- src/engine/events/CreateNodeEvent.cpp | 3 +++ src/engine/events/CreatePatchEvent.cpp | 3 +++ src/engine/events/CreatePortEvent.cpp | 4 ++++ src/engine/events/CreatePortEvent.hpp | 2 +- src/engine/events/DestroyEvent.cpp | 4 ++++ src/engine/events/DestroyEvent.hpp | 2 +- src/engine/events/DisconnectAllEvent.cpp | 3 +++ src/engine/events/DisconnectionEvent.cpp | 2 ++ src/engine/events/MidiLearnEvent.cpp | 4 +++- src/engine/events/NoteEvent.cpp | 4 +++- src/engine/events/RegisterClientEvent.cpp | 12 +++++++----- src/engine/events/RenameEvent.cpp | 3 +++ src/engine/events/RequestMetadataEvent.cpp | 3 +++ src/engine/events/RequestObjectEvent.cpp | 2 ++ src/engine/events/RequestPluginEvent.cpp | 2 ++ src/engine/events/RequestPortValueEvent.cpp | 5 +++++ src/engine/events/SetMetadataEvent.cpp | 3 ++- src/engine/events/SetPortValueEvent.cpp | 3 +++ src/engine/events/UnregisterClientEvent.cpp | 2 ++ 23 files changed, 69 insertions(+), 12 deletions(-) (limited to 'src/engine/events') diff --git a/src/engine/events/AllNotesOffEvent.cpp b/src/engine/events/AllNotesOffEvent.cpp index 8e009760..0057c456 100644 --- a/src/engine/events/AllNotesOffEvent.cpp +++ b/src/engine/events/AllNotesOffEvent.cpp @@ -22,6 +22,8 @@ #include "module/World.hpp" #include "shared/Store.hpp" +using namespace Raul; + namespace Ingen { diff --git a/src/engine/events/ClearPatchEvent.cpp b/src/engine/events/ClearPatchEvent.cpp index e3632e08..e68ee271 100644 --- a/src/engine/events/ClearPatchEvent.cpp +++ b/src/engine/events/ClearPatchEvent.cpp @@ -30,8 +30,13 @@ #include "AudioDriver.hpp" #include "MidiDriver.hpp" +using namespace std; +using namespace Raul; + namespace Ingen { +using namespace Shared; + ClearPatchEvent::ClearPatchEvent(Engine& engine, SharedPtr responder, FrameTime time, QueuedEventSource* source, const Path& patch_path) : QueuedEvent(engine, responder, time, true, source) diff --git a/src/engine/events/ClearPatchEvent.hpp b/src/engine/events/ClearPatchEvent.hpp index b5fcf716..42b06658 100644 --- a/src/engine/events/ClearPatchEvent.hpp +++ b/src/engine/events/ClearPatchEvent.hpp @@ -54,7 +54,7 @@ private: typedef Raul::Array::Node*> DriverPorts; DriverPorts* _driver_ports; - SharedPtr< Table > > _removed_table; + SharedPtr< Raul::Table > > _removed_table; }; diff --git a/src/engine/events/ConnectionEvent.cpp b/src/engine/events/ConnectionEvent.cpp index 13e160c9..6a55f35b 100644 --- a/src/engine/events/ConnectionEvent.cpp +++ b/src/engine/events/ConnectionEvent.cpp @@ -31,9 +31,13 @@ #include "Responder.hpp" #include "types.hpp" -using std::string; +using namespace std; +using namespace Raul; + namespace Ingen { +using namespace Shared; + ConnectionEvent::ConnectionEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& src_port_path, const Path& dst_port_path) : QueuedEvent(engine, responder, timestamp) diff --git a/src/engine/events/CreateNodeEvent.cpp b/src/engine/events/CreateNodeEvent.cpp index f34f75c3..e4663799 100644 --- a/src/engine/events/CreateNodeEvent.cpp +++ b/src/engine/events/CreateNodeEvent.cpp @@ -33,6 +33,9 @@ #include "PortImpl.hpp" #include "AudioDriver.hpp" +using namespace std; +using namespace Raul; + namespace Ingen { diff --git a/src/engine/events/CreatePatchEvent.cpp b/src/engine/events/CreatePatchEvent.cpp index 392a1cc2..0b85dd89 100644 --- a/src/engine/events/CreatePatchEvent.cpp +++ b/src/engine/events/CreatePatchEvent.cpp @@ -27,6 +27,9 @@ #include "AudioDriver.hpp" #include "EngineStore.hpp" +using namespace std; +using namespace Raul; + namespace Ingen { diff --git a/src/engine/events/CreatePortEvent.cpp b/src/engine/events/CreatePortEvent.cpp index 870a190c..8e2230eb 100644 --- a/src/engine/events/CreatePortEvent.cpp +++ b/src/engine/events/CreatePortEvent.cpp @@ -34,8 +34,12 @@ #include "OSCDriver.hpp" #include "DuplexPort.hpp" +using namespace std; + namespace Ingen { +using namespace Shared; + CreatePortEvent::CreatePortEvent(Engine& engine, SharedPtr responder, diff --git a/src/engine/events/CreatePortEvent.hpp b/src/engine/events/CreatePortEvent.hpp index 2587f2f0..1fe9b962 100644 --- a/src/engine/events/CreatePortEvent.hpp +++ b/src/engine/events/CreatePortEvent.hpp @@ -57,7 +57,7 @@ private: Raul::Path _path; Raul::URI _type; bool _is_output; - DataType _data_type; + Shared::DataType _data_type; PatchImpl* _patch; PortImpl* _patch_port; Raul::Array* _ports_array; ///< New (external) ports array for Patch diff --git a/src/engine/events/DestroyEvent.cpp b/src/engine/events/DestroyEvent.cpp index 469d73f1..d5611f03 100644 --- a/src/engine/events/DestroyEvent.cpp +++ b/src/engine/events/DestroyEvent.cpp @@ -31,8 +31,12 @@ #include "QueuedEventSource.hpp" #include "PortImpl.hpp" +using namespace std; + namespace Ingen { +using namespace Shared; + DestroyEvent::DestroyEvent(Engine& engine, SharedPtr responder, FrameTime time, QueuedEventSource* source, const Raul::Path& path) : QueuedEvent(engine, responder, time, true, source) diff --git a/src/engine/events/DestroyEvent.hpp b/src/engine/events/DestroyEvent.hpp index a3ed4bee..791a74ae 100644 --- a/src/engine/events/DestroyEvent.hpp +++ b/src/engine/events/DestroyEvent.hpp @@ -63,7 +63,7 @@ private: CompiledPatch* _compiled_patch; ///< Patch's new process order DisconnectAllEvent* _disconnect_event; - SharedPtr< Table > > _removed_table; + SharedPtr< Raul::Table > > _removed_table; }; diff --git a/src/engine/events/DisconnectAllEvent.cpp b/src/engine/events/DisconnectAllEvent.cpp index 2a8a2b4f..190ed878 100644 --- a/src/engine/events/DisconnectAllEvent.cpp +++ b/src/engine/events/DisconnectAllEvent.cpp @@ -34,6 +34,9 @@ #include "Responder.hpp" #include "util.hpp" +using namespace std; +using namespace Raul; + namespace Ingen { diff --git a/src/engine/events/DisconnectionEvent.cpp b/src/engine/events/DisconnectionEvent.cpp index 3e7d41a0..ec90480f 100644 --- a/src/engine/events/DisconnectionEvent.cpp +++ b/src/engine/events/DisconnectionEvent.cpp @@ -28,6 +28,8 @@ #include "PortImpl.hpp" #include "EngineStore.hpp" +using namespace std; + namespace Ingen { diff --git a/src/engine/events/MidiLearnEvent.cpp b/src/engine/events/MidiLearnEvent.cpp index d098c59c..337acca3 100644 --- a/src/engine/events/MidiLearnEvent.cpp +++ b/src/engine/events/MidiLearnEvent.cpp @@ -24,6 +24,8 @@ #include "ClientBroadcaster.hpp" #include "PluginImpl.hpp" +using namespace std; + namespace Ingen { @@ -51,7 +53,7 @@ MidiLearnEvent::execute(ProcessContext& context) QueuedEvent::execute(context); if (_node != NULL) { - if (_node->plugin_impl()->type() == Plugin::Internal) { + if (_node->plugin_impl()->type() == Shared::Plugin::Internal) { ((NodeBase*)_node)->learn(); } else { _error = INVALID_NODE_TYPE; diff --git a/src/engine/events/NoteEvent.cpp b/src/engine/events/NoteEvent.cpp index 589e8462..62fdff13 100644 --- a/src/engine/events/NoteEvent.cpp +++ b/src/engine/events/NoteEvent.cpp @@ -26,6 +26,8 @@ #include "InternalPlugin.hpp" #include "ProcessContext.hpp" +using namespace Raul; + namespace Ingen { @@ -70,7 +72,7 @@ NoteEvent::execute(ProcessContext& context) // FIXME: barf - if (_node != NULL && _node->plugin()->type() == Plugin::Internal) { + if (_node != NULL && _node->plugin()->type() == Shared::Plugin::Internal) { if (_on) { if (_node->plugin_impl()->uri().str() == NS_INTERNALS "Note") ((NoteNode*)_node)->note_on(context, _note_num, _velocity, _time); diff --git a/src/engine/events/RegisterClientEvent.cpp b/src/engine/events/RegisterClientEvent.cpp index 80281dc3..e78d0577 100644 --- a/src/engine/events/RegisterClientEvent.cpp +++ b/src/engine/events/RegisterClientEvent.cpp @@ -20,14 +20,16 @@ #include "Engine.hpp" #include "ClientBroadcaster.hpp" +using namespace Raul; + namespace Ingen { -RegisterClientEvent::RegisterClientEvent(Engine& engine, - SharedPtr responder, - SampleCount timestamp, - const URI& uri, - ClientInterface* client) +RegisterClientEvent::RegisterClientEvent(Engine& engine, + SharedPtr responder, + SampleCount timestamp, + const URI& uri, + Shared::ClientInterface* client) : QueuedEvent(engine, responder, timestamp) , _uri(uri) , _client(client) diff --git a/src/engine/events/RenameEvent.cpp b/src/engine/events/RenameEvent.cpp index b2116cc4..3ff5d254 100644 --- a/src/engine/events/RenameEvent.cpp +++ b/src/engine/events/RenameEvent.cpp @@ -27,9 +27,12 @@ #include "MidiDriver.hpp" using namespace std; +using namespace Raul; namespace Ingen { +using namespace Shared; + RenameEvent::RenameEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& path, const Path& new_path) : QueuedEvent(engine, responder, timestamp) diff --git a/src/engine/events/RequestMetadataEvent.cpp b/src/engine/events/RequestMetadataEvent.cpp index 75ff2a65..685108f4 100644 --- a/src/engine/events/RequestMetadataEvent.cpp +++ b/src/engine/events/RequestMetadataEvent.cpp @@ -23,6 +23,9 @@ #include "EngineStore.hpp" #include "ClientBroadcaster.hpp" +using namespace std; +using namespace Raul; + namespace Ingen { diff --git a/src/engine/events/RequestObjectEvent.cpp b/src/engine/events/RequestObjectEvent.cpp index 6ee97388..7cce6588 100644 --- a/src/engine/events/RequestObjectEvent.cpp +++ b/src/engine/events/RequestObjectEvent.cpp @@ -27,6 +27,8 @@ #include "ObjectSender.hpp" #include "ProcessContext.hpp" +using namespace Raul; + namespace Ingen { diff --git a/src/engine/events/RequestPluginEvent.cpp b/src/engine/events/RequestPluginEvent.cpp index 98e70f2f..89371a8b 100644 --- a/src/engine/events/RequestPluginEvent.cpp +++ b/src/engine/events/RequestPluginEvent.cpp @@ -26,6 +26,8 @@ #include "PluginImpl.hpp" #include "ProcessContext.hpp" +using namespace Raul; + namespace Ingen { diff --git a/src/engine/events/RequestPortValueEvent.cpp b/src/engine/events/RequestPortValueEvent.cpp index b4502ae2..5f3a33a7 100644 --- a/src/engine/events/RequestPortValueEvent.cpp +++ b/src/engine/events/RequestPortValueEvent.cpp @@ -25,8 +25,13 @@ #include "AudioBuffer.hpp" #include "ProcessContext.hpp" +using namespace std; +using namespace Raul; + namespace Ingen { +using namespace Shared; + RequestPortValueEvent::RequestPortValueEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& port_path) : QueuedEvent(engine, responder, timestamp) diff --git a/src/engine/events/SetMetadataEvent.cpp b/src/engine/events/SetMetadataEvent.cpp index 679433a9..a41b866e 100644 --- a/src/engine/events/SetMetadataEvent.cpp +++ b/src/engine/events/SetMetadataEvent.cpp @@ -26,7 +26,8 @@ #include "PatchImpl.hpp" #include "EngineStore.hpp" -using std::string; +using namespace std; +using namespace Raul; namespace Ingen { diff --git a/src/engine/events/SetPortValueEvent.cpp b/src/engine/events/SetPortValueEvent.cpp index b6318d48..1c07af95 100644 --- a/src/engine/events/SetPortValueEvent.cpp +++ b/src/engine/events/SetPortValueEvent.cpp @@ -33,9 +33,12 @@ #include "MessageContext.hpp" using namespace std; +using namespace Raul; namespace Ingen { +using namespace Shared; + /** Omni (all voices) control setting */ SetPortValueEvent::SetPortValueEvent(Engine& engine, diff --git a/src/engine/events/UnregisterClientEvent.cpp b/src/engine/events/UnregisterClientEvent.cpp index 02296ec9..3a79adc1 100644 --- a/src/engine/events/UnregisterClientEvent.cpp +++ b/src/engine/events/UnregisterClientEvent.cpp @@ -21,6 +21,8 @@ #include "Engine.hpp" #include "ClientBroadcaster.hpp" +using namespace Raul; + namespace Ingen { -- cgit v1.2.1