From 4b0f77528d38c630b68cb193e4832289efc46531 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 10 Mar 2012 03:27:04 +0000 Subject: Delete trailing whitespace. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4041 a436a847-0d15-0410-975c-d299462d15a1 --- include/ingen/client/PluginUI.hpp | 2 +- include/ingen/client/PortModel.hpp | 2 +- include/ingen/shared/World.hpp | 2 +- src/client/ObjectModel.cpp | 2 +- src/client/PluginModel.cpp | 2 +- src/gui/PatchCanvas.cpp | 4 ++-- src/gui/PatchWindow.cpp | 2 +- src/serialisation/Parser.cpp | 32 ++++++++++++++++---------------- src/serialisation/Serialiser.cpp | 1 - src/server/EngineStore.hpp | 2 +- src/server/Event.hpp | 2 +- src/server/PatchImpl.hpp | 2 +- src/server/PostProcessor.cpp | 2 +- src/server/ServerInterfaceImpl.cpp | 2 +- src/server/events/Connect.cpp | 2 +- src/server/ingen_jack.cpp | 2 +- src/server/ingen_lv2.cpp | 4 ++-- src/shared/World.cpp | 2 +- 18 files changed, 34 insertions(+), 35 deletions(-) diff --git a/include/ingen/client/PluginUI.hpp b/include/ingen/client/PluginUI.hpp index ed5dc5a6..501db260 100644 --- a/include/ingen/client/PluginUI.hpp +++ b/include/ingen/client/PluginUI.hpp @@ -28,7 +28,7 @@ namespace Ingen { -class ServerInterface; +class ServerInterface; namespace Shared { class World; } diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp index 50219739..eadfac63 100644 --- a/include/ingen/client/PortModel.hpp +++ b/include/ingen/client/PortModel.hpp @@ -57,7 +57,7 @@ public: bool is_toggle() const { return port_property("http://lv2plug.in/ns/lv2core#toggled"); } bool has_context(const Raul::URI& context) const; - + inline bool operator==(const PortModel& pm) const { return (path() == pm.path()); } diff --git a/include/ingen/shared/World.hpp b/include/ingen/shared/World.hpp index e35b9248..ef67c30b 100644 --- a/include/ingen/shared/World.hpp +++ b/include/ingen/shared/World.hpp @@ -92,7 +92,7 @@ public: virtual SharedPtr store(); virtual Sord::World* rdf_world(); - + virtual SharedPtr uris(); virtual SharedPtr lv2_uri_map(); diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index 984cd11c..81c0039b 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -52,7 +52,7 @@ ObjectModel::is_a(const Raul::URI& type) const { return has_property(_uris.rdf_type, type); } - + const Raul::Atom& ObjectModel::set_property(const Raul::URI& key, const Raul::Atom& value, Resource::Graph ctx) diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index 3bb37e03..72326dd0 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -258,7 +258,7 @@ PluginModel::documentation(bool* html) const } lilv_node_free(rdfs_comment); lilv_node_free(lv2_documentation); - + lilv_nodes_free(vals); return doc; diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 47cd552b..8b2660c6 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -621,11 +621,11 @@ destroy_module(GanvNode* node, void* data) if (!GANV_IS_MODULE(node)) { return; } - + App* app = (App*)data; Ganv::Module* module = Glib::wrap(GANV_MODULE(node)); NodeModule* node_module = dynamic_cast(module); - + if (node_module) { app->engine()->del(node_module->node()->path()); } else { diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp index da0fe769..bdda7b54 100644 --- a/src/gui/PatchWindow.cpp +++ b/src/gui/PatchWindow.cpp @@ -336,7 +336,7 @@ PatchWindow::hide_documentation() _doc_scrolledwindow->remove(); _doc_scrolledwindow->hide(); } - + void PatchWindow::show_status(const ObjectModel* model) { diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp index 2ef387e8..dfd5bdf6 100644 --- a/src/serialisation/Parser.cpp +++ b/src/serialisation/Parser.cpp @@ -61,21 +61,21 @@ relative_uri(Glib::ustring base, const Glib::ustring uri, bool leading_slash) { Glib::ustring ret; if (uri != base) { - SerdURI base_uri; - serd_uri_parse((const uint8_t*)base.c_str(), &base_uri); - - SerdURI normal_base_uri; - SerdNode normal_base_uri_node = serd_node_new_uri_from_string( - (const uint8_t*)".", &base_uri, &normal_base_uri); - - Glib::ustring normal_base_str((const char*)normal_base_uri_node.buf); - - ret = uri; - if (uri.length() >= normal_base_str.length() - && uri.substr(0, normal_base_str.length()) == normal_base_str) { + SerdURI base_uri; + serd_uri_parse((const uint8_t*)base.c_str(), &base_uri); + + SerdURI normal_base_uri; + SerdNode normal_base_uri_node = serd_node_new_uri_from_string( + (const uint8_t*)".", &base_uri, &normal_base_uri); + + Glib::ustring normal_base_str((const char*)normal_base_uri_node.buf); + + ret = uri; + if (uri.length() >= normal_base_str.length() + && uri.substr(0, normal_base_str.length()) == normal_base_str) { ret = uri.substr(normal_base_str.length()); - if (leading_slash && ret[0] != '/') - ret = Glib::ustring("/") + ret; + if (leading_slash && ret[0] != '/') + ret = Glib::ustring("/") + ret; } } @@ -588,9 +588,9 @@ Parser::parse_file(Ingen::Shared::World* world, std::string uri; try { uri = Glib::filename_to_uri(path, ""); - } catch (const Glib::ConvertError& e) { + } catch (const Glib::ConvertError& e) { LOG(error) << "Path to URI conversion error: " << e.what() << endl; - return false; + return false; } const uint8_t* uri_c_str = (const uint8_t*)uri.c_str(); diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index 8ff1887f..6e6db3ed 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -200,7 +200,6 @@ void Serialiser::Impl::write_bundle(SharedPtr patch, const std::string& a_path) { - std::string path = Glib::filename_from_uri(a_path); if (Glib::file_test(path, Glib::FILE_TEST_EXISTS) && !Glib::file_test(path, Glib::FILE_TEST_IS_DIR)) { diff --git a/src/server/EngineStore.hpp b/src/server/EngineStore.hpp index 7cf9f9e0..704b084d 100644 --- a/src/server/EngineStore.hpp +++ b/src/server/EngineStore.hpp @@ -69,7 +69,7 @@ private: here refer to it, so the BufferFactory may only be deleted after the EngineStore is emptied and deleted. */ - + SharedPtr _factory; }; diff --git a/src/server/Event.hpp b/src/server/Event.hpp index f887ce66..5f9234bd 100644 --- a/src/server/Event.hpp +++ b/src/server/Event.hpp @@ -81,7 +81,7 @@ public: /** Respond to the originating client with an error. */ void respond_error(const std::string& msg); - + protected: Event(Engine& engine, ClientInterface* client, int32_t id, FrameTime time) : _engine(engine) diff --git a/src/server/PatchImpl.hpp b/src/server/PatchImpl.hpp index 4dfdba61..004eb0cb 100644 --- a/src/server/PatchImpl.hpp +++ b/src/server/PatchImpl.hpp @@ -121,7 +121,7 @@ public: ThreadManager::assert_thread(THREAD_PRE_PROCESS); _inputs.push_back(port); } - + void add_output(Ports::Node* port) { ThreadManager::assert_thread(THREAD_PRE_PROCESS); _outputs.push_back(port); diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp index 473bcbd1..d77c35ec 100644 --- a/src/server/PostProcessor.cpp +++ b/src/server/PostProcessor.cpp @@ -88,7 +88,7 @@ PostProcessor::process() if (!ev) { return; } - + Event* const tail = _tail.get(); _head = (Event*)tail->next(); while (ev && ev->time() <= end_time) { diff --git a/src/server/ServerInterfaceImpl.cpp b/src/server/ServerInterfaceImpl.cpp index 9cc48aa9..7715019f 100644 --- a/src/server/ServerInterfaceImpl.cpp +++ b/src/server/ServerInterfaceImpl.cpp @@ -160,7 +160,7 @@ ServerInterfaceImpl::disconnect(const URI& src, std::cerr << "Bad disconnect request " << src << " => " << dst << std::endl; return; } - + push_queued(new Events::Disconnect(_engine, _request_client, _request_id, now(), Path(src.str()), Path(dst.str()))); } diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index aae84b39..90a338dd 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -63,7 +63,7 @@ void Connect::pre_process() { Glib::RWLock::ReaderLock rlock(_engine.engine_store()->lock()); - + PortImpl* src_port = _engine.engine_store()->find_port(_src_port_path); PortImpl* dst_port = _engine.engine_store()->find_port(_dst_port_path); if (!src_port || !dst_port) { diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp index 23ece9ab..267b13aa 100644 --- a/src/server/ingen_jack.cpp +++ b/src/server/ingen_jack.cpp @@ -31,7 +31,7 @@ struct IngenJackModule : public Ingen::Shared::Module { Raul::warn << "Engine already has a driver" << std::endl; return; } - + Server::JackDriver* driver = new Server::JackDriver( *(Server::Engine*)world->local_engine().get()); driver->attach(world->conf()->option("jack-server").get_string(), diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index ac84c268..74bffd53 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -241,7 +241,7 @@ private: SharedPtr _engine; }; - + struct IngenPlugin { Ingen::Shared::World* world; MainThread* main; @@ -292,7 +292,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor, // FIXME: fixed (or at least maximum) buffer size LV2Driver* driver = new LV2Driver(*engine.get(), rate, 4096); engine->set_driver(SharedPtr(driver)); - + engine->activate(); Server::ThreadManager::single_threaded = true; diff --git a/src/shared/World.cpp b/src/shared/World.cpp index 554c5af2..59207939 100644 --- a/src/shared/World.cpp +++ b/src/shared/World.cpp @@ -243,7 +243,7 @@ World::run_module(const char* name) i->second->run(this); return true; } - + /** Unload all loaded Ingen modules. */ void -- cgit v1.2.1