summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ingen/client/BlockModel.hpp4
-rw-r--r--ingen/client/ClientStore.hpp6
-rw-r--r--ingen/client/GraphModel.hpp8
-rw-r--r--ingen/client/ObjectModel.hpp12
-rw-r--r--ingen/client/PluginModel.hpp6
-rw-r--r--ingen/client/PluginUI.hpp2
-rw-r--r--ingen/client/PortModel.hpp6
-rw-r--r--src/server/Event.hpp2
-rw-r--r--tests/test_utils.hpp32
-rw-r--r--tests/tst_FilePath.cpp20
-rw-r--r--wscript3
11 files changed, 52 insertions, 49 deletions
diff --git a/ingen/client/BlockModel.hpp b/ingen/client/BlockModel.hpp
index d1f754bd..511e5712 100644
--- a/ingen/client/BlockModel.hpp
+++ b/ingen/client/BlockModel.hpp
@@ -78,8 +78,8 @@ public:
std::string port_label(const SPtr<const PortModel>& port) const;
// Signals
- INGEN_SIGNAL(new_port, void, SPtr<const PortModel>);
- INGEN_SIGNAL(removed_port, void, SPtr<const PortModel>);
+ INGEN_SIGNAL(new_port, void, SPtr<const PortModel>)
+ INGEN_SIGNAL(removed_port, void, SPtr<const PortModel>)
protected:
friend class ClientStore;
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index 7d83e9f6..9576cd3c 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -98,9 +98,9 @@ public:
void operator()(const SetProperty&);
void operator()(const Undo&) {}
- INGEN_SIGNAL(new_object, void, SPtr<ObjectModel>);
- INGEN_SIGNAL(new_plugin, void, SPtr<PluginModel>);
- INGEN_SIGNAL(plugin_deleted, void, URI);
+ INGEN_SIGNAL(new_object, void, SPtr<ObjectModel>)
+ INGEN_SIGNAL(new_plugin, void, SPtr<PluginModel>)
+ INGEN_SIGNAL(plugin_deleted, void, URI)
private:
SPtr<ObjectModel> _object(const Raul::Path& path);
diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp
index c3339048..c11c419e 100644
--- a/ingen/client/GraphModel.hpp
+++ b/ingen/client/GraphModel.hpp
@@ -51,10 +51,10 @@ public:
uint32_t internal_poly() const;
// Signals
- INGEN_SIGNAL(new_block, void, SPtr<BlockModel>);
- INGEN_SIGNAL(removed_block, void, SPtr<BlockModel>);
- INGEN_SIGNAL(new_arc, void, SPtr<ArcModel>);
- INGEN_SIGNAL(removed_arc, void, SPtr<ArcModel>);
+ INGEN_SIGNAL(new_block, void, SPtr<BlockModel>)
+ INGEN_SIGNAL(removed_block, void, SPtr<BlockModel>)
+ INGEN_SIGNAL(new_arc, void, SPtr<ArcModel>)
+ INGEN_SIGNAL(removed_arc, void, SPtr<ArcModel>)
private:
friend class ClientStore;
diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp
index 535bcdd2..39729377 100644
--- a/ingen/client/ObjectModel.hpp
+++ b/ingen/client/ObjectModel.hpp
@@ -66,12 +66,12 @@ public:
Node* graph_parent() const override { return _parent.get(); }
// Signals
- INGEN_SIGNAL(new_child, void, SPtr<ObjectModel>);
- INGEN_SIGNAL(removed_child, void, SPtr<ObjectModel>);
- INGEN_SIGNAL(property, void, const URI&, const Atom&);
- INGEN_SIGNAL(property_removed, void, const URI&, const Atom&);
- INGEN_SIGNAL(destroyed, void);
- INGEN_SIGNAL(moved, void);
+ INGEN_SIGNAL(new_child, void, SPtr<ObjectModel>)
+ INGEN_SIGNAL(removed_child, void, SPtr<ObjectModel>)
+ INGEN_SIGNAL(property, void, const URI&, const Atom&)
+ INGEN_SIGNAL(property_removed, void, const URI&, const Atom&)
+ INGEN_SIGNAL(destroyed, void)
+ INGEN_SIGNAL(moved, void)
protected:
friend class ClientStore;
diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp
index 5f43b3c4..142f28bf 100644
--- a/ingen/client/PluginModel.hpp
+++ b/ingen/client/PluginModel.hpp
@@ -95,9 +95,9 @@ public:
static Sord::World* rdf_world() { return _rdf_world; }
// Signals
- INGEN_SIGNAL(changed, void);
- INGEN_SIGNAL(property, void, const URI&, const Atom&);
- INGEN_SIGNAL(preset, void, const URI&, const std::string&);
+ INGEN_SIGNAL(changed, void)
+ INGEN_SIGNAL(property, void, const URI&, const Atom&)
+ INGEN_SIGNAL(preset, void, const URI&, const std::string&)
bool fetched() const { return _fetched; }
void set_fetched(bool f) { _fetched = f; }
diff --git a/ingen/client/PluginUI.hpp b/ingen/client/PluginUI.hpp
index b80c4527..b5d467ea 100644
--- a/ingen/client/PluginUI.hpp
+++ b/ingen/client/PluginUI.hpp
@@ -84,7 +84,7 @@ public:
const URI&, // Subject
const URI&, // Predicate
const Atom&, // Object
- Resource::Graph); // Context
+ Resource::Graph) // Context
ingen::World& world() const { return _world; }
SPtr<const BlockModel> block() const { return _block; }
diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index 8bdf0398..c386dff0 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -66,9 +66,9 @@ public:
void on_property(const URI& uri, const Atom& value) override;
// Signals
- INGEN_SIGNAL(value_changed, void, const Atom&);
- INGEN_SIGNAL(voice_changed, void, uint32_t, const Atom&);
- INGEN_SIGNAL(activity, void, const Atom&);
+ INGEN_SIGNAL(value_changed, void, const Atom&)
+ INGEN_SIGNAL(voice_changed, void, uint32_t, const Atom&)
+ INGEN_SIGNAL(activity, void, const Atom&)
private:
friend class ClientStore;
diff --git a/src/server/Event.hpp b/src/server/Event.hpp
index b2477ce8..9c284e49 100644
--- a/src/server/Event.hpp
+++ b/src/server/Event.hpp
@@ -63,7 +63,7 @@ public:
};
/** Claim position in undo stack before pre-processing (non-realtime). */
- virtual void mark(PreProcessContext&) {};
+ virtual void mark(PreProcessContext&) {}
/** Pre-process event before execution (non-realtime). */
virtual bool pre_process(PreProcessContext& ctx) = 0;
diff --git a/tests/test_utils.hpp b/tests/test_utils.hpp
index 48e3a588..4951ade1 100644
--- a/tests/test_utils.hpp
+++ b/tests/test_utils.hpp
@@ -19,20 +19,26 @@
#include <iostream>
#define EXPECT_TRUE(value) \
- if (!(value)) { \
- std::cerr << fmt("error: %1%:%2%: !%3%\n", \
- __FILE__, __LINE__, (#value)); \
- }
+ do { \
+ if (!(value)) { \
+ std::cerr << fmt("error: %1%:%2%: !%3%\n", \
+ __FILE__, __LINE__, (#value)); \
+ } \
+ } while (0)
#define EXPECT_FALSE(value) \
- if ((value)) { \
- std::cerr << (fmt("error: %1%:%2%: !%3%\n", \
- __FILE__, __LINE__, (#value))); \
- }
+ do { \
+ if ((value)) { \
+ std::cerr << (fmt("error: %1%:%2%: !%3%\n", \
+ __FILE__, __LINE__, (#value))); \
+ } \
+ } while (0)
#define EXPECT_EQ(value, expected) \
- if (!((value) == (expected))) { \
- std::cerr << fmt("error: %1%:%2%: %3% != %4%\n", \
- __FILE__, __LINE__, (#value), (#expected)); \
- std::cerr << "note: actual value: " << value << std::endl; \
- }
+ do { \
+ if (!((value) == (expected))) { \
+ std::cerr << fmt("error: %1%:%2%: %3% != %4%\n", \
+ __FILE__, __LINE__, (#value), (#expected)); \
+ std::cerr << "note: actual value: " << value << std::endl; \
+ } \
+ } while (0)
diff --git a/tests/tst_FilePath.cpp b/tests/tst_FilePath.cpp
index 768371fe..cfff2760 100644
--- a/tests/tst_FilePath.cpp
+++ b/tests/tst_FilePath.cpp
@@ -31,8 +31,8 @@ main(int, char**)
{
EXPECT_EQ(FilePath("/").parent_path(), FilePath("/"));
- EXPECT_TRUE(FilePath("/abs").is_absolute())
- EXPECT_FALSE(FilePath("/abs").is_relative())
+ EXPECT_TRUE(FilePath("/abs").is_absolute());
+ EXPECT_FALSE(FilePath("/abs").is_relative());
EXPECT_EQ(FilePath("/abs").root_name(), FilePath());
EXPECT_EQ(FilePath("/abs").root_directory(), FilePath("/"));
EXPECT_EQ(FilePath("/abs").root_path(), FilePath("/"));
@@ -42,8 +42,8 @@ main(int, char**)
EXPECT_EQ(FilePath("/abs").stem(), FilePath("abs"));
EXPECT_EQ(FilePath("/abs").extension(), FilePath());
- EXPECT_FALSE(FilePath("rel").is_absolute())
- EXPECT_TRUE(FilePath("rel").is_relative())
+ EXPECT_FALSE(FilePath("rel").is_absolute());
+ EXPECT_TRUE(FilePath("rel").is_relative());
EXPECT_EQ(FilePath("rel").root_name(), FilePath());
EXPECT_EQ(FilePath("rel").root_directory(), FilePath());
EXPECT_EQ(FilePath("rel").root_path(), FilePath());
@@ -53,20 +53,20 @@ main(int, char**)
EXPECT_EQ(FilePath("rel").stem(), "rel");
EXPECT_EQ(FilePath("rel").extension(), FilePath());
- EXPECT_FALSE(FilePath("file.txt").is_absolute())
- EXPECT_TRUE(FilePath("file.txt").is_relative())
+ EXPECT_FALSE(FilePath("file.txt").is_absolute());
+ EXPECT_TRUE(FilePath("file.txt").is_relative());
EXPECT_EQ(FilePath("file.txt").filename(), "file.txt");
EXPECT_EQ(FilePath("file.txt").stem(), "file");
EXPECT_EQ(FilePath("file.txt").extension(), ".txt");
- EXPECT_TRUE(FilePath("/abs/file.txt").is_absolute())
- EXPECT_FALSE(FilePath("/abs/file.txt").is_relative())
+ EXPECT_TRUE(FilePath("/abs/file.txt").is_absolute());
+ EXPECT_FALSE(FilePath("/abs/file.txt").is_relative());
EXPECT_EQ(FilePath("/abs/file.txt").filename(), "file.txt");
EXPECT_EQ(FilePath("/abs/file.txt").stem(), "file");
EXPECT_EQ(FilePath("/abs/file.txt").extension(), ".txt");
- EXPECT_FALSE(FilePath("rel/file.txt").is_absolute())
- EXPECT_TRUE(FilePath("rel/file.txt").is_relative())
+ EXPECT_FALSE(FilePath("rel/file.txt").is_absolute());
+ EXPECT_TRUE(FilePath("rel/file.txt").is_relative());
EXPECT_EQ(FilePath("rel/file.txt").filename(), "file.txt");
EXPECT_EQ(FilePath("rel/file.txt").stem(), "file");
EXPECT_EQ(FilePath("rel/file.txt").extension(), ".txt");
diff --git a/wscript b/wscript
index b0ab2d5f..d8fc3253 100644
--- a/wscript
+++ b/wscript
@@ -62,8 +62,6 @@ def configure(conf):
'-Wno-documentation-unknown-command',
'-Wno-double-promotion',
'-Wno-exit-time-destructors',
- '-Wno-extra-semi',
- '-Wno-extra-semi-stmt',
'-Wno-float-conversion',
'-Wno-float-equal',
'-Wno-format-nonliteral',
@@ -98,7 +96,6 @@ def configure(conf):
'-Wno-deprecated-copy-dtor',
'-Wno-double-promotion',
'-Wno-effc++',
- '-Wno-extra-semi',
'-Wno-float-conversion',
'-Wno-float-equal',
'-Wno-format',
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-20 13:50:00 +0000