diff options
author | David Robillard <d@drobilla.net> | 2013-01-12 18:51:29 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2013-01-12 18:51:29 +0000 |
commit | 1630b3fd62c57e01468a03a9d4dde397f903ef37 (patch) | |
tree | 12f48c2d3377ba7537f3d359421af761eb58b33d | |
parent | 4e3f4a2a0fdca75352265ba8490fbe9f397e264a (diff) | |
download | ingen-1630b3fd62c57e01468a03a9d4dde397f903ef37.tar.gz ingen-1630b3fd62c57e01468a03a9d4dde397f903ef37.tar.bz2 ingen-1630b3fd62c57e01468a03a9d4dde397f903ef37.zip |
Lint.
Fix test suite compilation.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4937 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r-- | ingen/Configuration.hpp | 2 | ||||
-rw-r--r-- | src/client/PluginModel.cpp | 2 | ||||
-rw-r--r-- | src/gui/NodeModule.cpp | 4 | ||||
-rw-r--r-- | src/gui/Port.cpp | 2 | ||||
-rw-r--r-- | src/gui/PropertiesWindow.cpp | 2 | ||||
-rw-r--r-- | src/server/Broadcaster.hpp | 2 | ||||
-rw-r--r-- | src/server/LV2Options.hpp | 2 | ||||
-rw-r--r-- | src/server/PortType.hpp | 4 | ||||
-rw-r--r-- | src/server/ProcessContext.hpp | 4 | ||||
-rw-r--r-- | tests/ingen_test.cpp | 6 | ||||
-rw-r--r-- | wscript | 2 |
11 files changed, 14 insertions, 18 deletions
diff --git a/ingen/Configuration.hpp b/ingen/Configuration.hpp index c7d9e49c..6002a178 100644 --- a/ingen/Configuration.hpp +++ b/ingen/Configuration.hpp @@ -38,7 +38,7 @@ namespace Ingen { */ class Configuration { public: - Configuration(Forge& forge); + explicit Configuration(Forge& forge); /** The scope of a configuration option. * diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index 8bf7aead..5dc6ec2a 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -280,7 +280,7 @@ heading(const std::string& text, bool html) return text + ":\n\n"; } } - + std::string PluginModel::documentation(bool html) const { diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 3a73e67e..46588e6e 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -115,8 +115,8 @@ NodeModule::create(GraphCanvas& canvas, for (const auto& p : block->properties()) ret->property_changed(p.first, p.second); - - for (const auto& p : block->ports()) + + for (const auto& p : block->ports()) ret->new_port_view(p); ret->set_stacked(block->polyphonic()); diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 6bb96b78..0b85b286 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -236,7 +236,7 @@ Port::build_uri_menu() LilvNode* rdfs_range = lilv_new_uri( world->lilv_world(), LILV_NS_RDFS "range"); - // Get every class in the range of the port's property + // Get every class in the range of the port's property RDFS::URISet ranges; LilvNodes* range = lilv_world_find_nodes( world->lilv_world(), designation, rdfs_range, NULL); diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp index 548fe8ec..44d84d70 100644 --- a/src/gui/PropertiesWindow.cpp +++ b/src/gui/PropertiesWindow.cpp @@ -375,7 +375,7 @@ PropertiesWindow::key_changed() if (!iter) { return; } - + const Gtk::ListStore::Row row = *iter; Glib::ustring prop_uri = row[_combo_columns.uri_col]; if (prop_uri.empty()) { diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp index 559bf709..33b438e5 100644 --- a/src/server/Broadcaster.hpp +++ b/src/server/Broadcaster.hpp @@ -55,7 +55,7 @@ public: * updates simple (e.g. Event::post_process()). */ struct Transfer : public Raul::Noncopyable { - Transfer(Broadcaster& b) : broadcaster(b) { + explicit Transfer(Broadcaster& b) : broadcaster(b) { if (++broadcaster._bundle_depth == 1) { broadcaster.bundle_begin(); } diff --git a/src/server/LV2Options.hpp b/src/server/LV2Options.hpp index 5f100f2a..19ddfd4b 100644 --- a/src/server/LV2Options.hpp +++ b/src/server/LV2Options.hpp @@ -29,7 +29,7 @@ namespace Ingen { namespace Server { struct LV2Options : public Ingen::LV2Features::Feature { - LV2Options(Engine& engine) + explicit LV2Options(Engine& engine) : _block_length(0) , _seq_size(0) { diff --git a/src/server/PortType.hpp b/src/server/PortType.hpp index 5445d907..0fd61156 100644 --- a/src/server/PortType.hpp +++ b/src/server/PortType.hpp @@ -56,9 +56,7 @@ public: } } - PortType(ID id) - : _id(id) - {} + PortType(ID id) : _id(id) {} inline const Raul::URI& uri() const { return type_uri(_id); } inline ID id() const { return _id; } diff --git a/src/server/ProcessContext.hpp b/src/server/ProcessContext.hpp index ca98babf..729bf4c4 100644 --- a/src/server/ProcessContext.hpp +++ b/src/server/ProcessContext.hpp @@ -32,9 +32,7 @@ namespace Server { class ProcessContext : public Context { public: - ProcessContext(Engine& engine) - : Context(engine, ID::AUDIO) - {} + explicit ProcessContext(Engine& engine) : Context(engine, ID::AUDIO) {} }; } // namespace Server diff --git a/tests/ingen_test.cpp b/tests/ingen_test.cpp index ade41aa7..8608b447 100644 --- a/tests/ingen_test.cpp +++ b/tests/ingen_test.cpp @@ -66,7 +66,7 @@ class TestClient : public AtomSink { class TestClient : public Interface { public: - TestClient(Log& log) : _log(log) {} + explicit TestClient(Log& log) : _log(log) {} ~TestClient() {} Raul::URI uri() const { return Raul::URI("ingen:testClient"); } @@ -77,7 +77,7 @@ public: void put(const Raul::URI& uri, const Resource::Properties& properties, - Resource::Graph ctx = Resource::DEFAULT) {} + Resource::Graph ctx = Resource::Graph::DEFAULT) {} void delta(const Raul::URI& uri, const Resource::Properties& remove, @@ -106,7 +106,7 @@ public: void get(const Raul::URI& uri) {} void response(int32_t id, Status status, const std::string& subject) { - if (status) { + if (status != Status::SUCCESS) { _log.error(Raul::fmt("error on message %1%: %2% (%3%)\n") % id % ingen_status_string(status) % subject); exit(EXIT_FAILURE); @@ -197,7 +197,7 @@ def build(bld): bld.add_post_fun(autowaf.run_ldconfig) def lint(ctx): - subprocess.call('cpplint.py --filter=-whitespace/comments,-whitespace/tab,-whitespace/braces,-whitespace/labels,-build/header_guard,-readability/casting,-readability/todo,-build/namespaces,-whitespace/line_length,-runtime/rtti,-runtime/references,-whitespace/blank_line,-runtime/sizeof,-readability/streams,-whitespace/operators,-whitespace/parens,-build/include `find -name *.cpp -or -name *.hpp`', shell=True) + subprocess.call('cpplint.py --filter=-whitespace/comments,-whitespace/tab,-whitespace/braces,-whitespace/labels,-build/header_guard,-readability/casting,-readability/todo,-build/namespaces,-whitespace/line_length,-runtime/rtti,-runtime/references,-whitespace/blank_line,-runtime/sizeof,-readability/streams,-whitespace/operators,-whitespace/parens,-build/include,-build/storage_class `find -name *.cpp -or -name *.hpp`', shell=True) def test(ctx): os.environ['PATH'] = 'tests' + os.pathsep + os.getenv('PATH') |