Use consistent brace wrapping for class definitions

35 files changed, 84 insertions, 44 deletions

diff --git a/include/ingen/Atom.hpp b/include/ingen/Atom.hpp
index 9c19a741..daaecd81 100644
--- a/include/ingen/Atom.hpp
+++ b/include/ingen/Atom.hpp
@@ -41,7 +41,8 @@ namespace ingen {
    In either case, the data is stored in a binary compatible format to LV2_Atom
    (i.e., if the value is dynamically allocated, the header is repeated there).
 */
-class INGEN_API Atom {
+class INGEN_API Atom
+{
 public:
 	Atom() noexcept = default;
 
diff --git a/include/ingen/AtomSink.hpp b/include/ingen/AtomSink.hpp
index 395eba54..abe1c196 100644
--- a/include/ingen/AtomSink.hpp
+++ b/include/ingen/AtomSink.hpp
@@ -27,7 +27,8 @@ namespace ingen {
 /** A sink for LV2 Atoms.
  * @ingroup IngenShared
  */
-class INGEN_API AtomSink {
+class INGEN_API AtomSink
+{
 public:
 	virtual ~AtomSink() = default;
 
diff --git a/include/ingen/Clock.hpp b/include/ingen/Clock.hpp
index deea0495..9df26969 100644
--- a/include/ingen/Clock.hpp
+++ b/include/ingen/Clock.hpp
@@ -28,7 +28,8 @@
 
 namespace ingen {
 
-class Clock {
+class Clock
+{
 public:
 #ifdef __MACH__
 
diff --git a/include/ingen/ColorContext.hpp b/include/ingen/ColorContext.hpp
index aadb2980..ea2303d2 100644
--- a/include/ingen/ColorContext.hpp
+++ b/include/ingen/ColorContext.hpp
@@ -23,7 +23,8 @@
 
 namespace ingen {
 
-class INGEN_API ColorContext {
+class INGEN_API ColorContext
+{
 public:
 	enum class Color { RED = 31, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE };
 
diff --git a/include/ingen/Configuration.hpp b/include/ingen/Configuration.hpp
index d62f98c6..c27a5063 100644
--- a/include/ingen/Configuration.hpp
+++ b/include/ingen/Configuration.hpp
@@ -37,7 +37,8 @@ class URIMap;
 /** Ingen configuration (command line options and/or configuration file).
  * @ingroup IngenShared
  */
-class INGEN_API Configuration {
+class INGEN_API Configuration
+{
 public:
 	explicit Configuration(Forge& forge);
 
diff --git a/include/ingen/Forge.hpp b/include/ingen/Forge.hpp
index 54f5d3a9..8dc7805c 100644
--- a/include/ingen/Forge.hpp
+++ b/include/ingen/Forge.hpp
@@ -33,7 +33,8 @@ class URI;
 /** Forge for Atoms.
  * @ingroup IngenShared
  */
-class INGEN_API Forge : public LV2_Atom_Forge {
+class INGEN_API Forge : public LV2_Atom_Forge
+{
 public:
 	explicit Forge(URIMap& map);
 
diff --git a/include/ingen/LV2Features.hpp b/include/ingen/LV2Features.hpp
index 61183932..5726feb9 100644
--- a/include/ingen/LV2Features.hpp
+++ b/include/ingen/LV2Features.hpp
@@ -33,11 +33,13 @@ class World;
 /** Features for use by LV2 plugins.
  * @ingroup IngenShared
  */
-class INGEN_API LV2Features {
+class INGEN_API LV2Features
+{
 public:
 	LV2Features() = default;
 
-	class Feature {
+	class Feature
+	{
 	public:
 		virtual ~Feature() = default;
 
@@ -50,7 +52,8 @@ public:
 		static void free_feature(LV2_Feature* feature);
 	};
 
-	class EmptyFeature : public Feature {
+	class EmptyFeature : public Feature
+	{
 	public:
 		explicit EmptyFeature(const char* uri) noexcept : _uri(uri) {}
 
@@ -64,7 +67,8 @@ public:
 		const char* _uri;
 	};
 
-	class FeatureArray : public raul::Noncopyable {
+	class FeatureArray : public raul::Noncopyable
+	{
 	public:
 		using FeatureVector = std::vector<std::shared_ptr<LV2_Feature>>;
 
diff --git a/include/ingen/Library.hpp b/include/ingen/Library.hpp
index fd4f4260..d7d7054a 100644
--- a/include/ingen/Library.hpp
+++ b/include/ingen/Library.hpp
@@ -23,7 +23,8 @@
 namespace ingen {
 
 /** A dynamically loaded library (module, plugin). */
-class INGEN_API Library {
+class INGEN_API Library
+{
 public:
 	Library(const FilePath& path);
 	~Library();
diff --git a/include/ingen/Log.hpp b/include/ingen/Log.hpp
index e6c08c78..c8679087 100644
--- a/include/ingen/Log.hpp
+++ b/include/ingen/Log.hpp
@@ -37,7 +37,8 @@ class Node;
 class URIs;
 class World;
 
-class INGEN_API Log {
+class INGEN_API Log
+{
 public:
 	using Sink = std::function<int(LV2_URID, const char*, va_list)>;
 
diff --git a/include/ingen/Module.hpp b/include/ingen/Module.hpp
index 8fe7b923..90f2f930 100644
--- a/include/ingen/Module.hpp
+++ b/include/ingen/Module.hpp
@@ -31,7 +31,8 @@ class World;
  * All components of Ingen reside in one of these.
  * @ingroup IngenShared
  */
-class INGEN_API Module {
+class INGEN_API Module
+{
 public:
 	Module() noexcept : library(nullptr) {}
 
diff --git a/include/ingen/Parser.hpp b/include/ingen/Parser.hpp
index f2cd951f..b87c5837 100644
--- a/include/ingen/Parser.hpp
+++ b/include/ingen/Parser.hpp
@@ -42,7 +42,8 @@ class World;
 
    @ingroup Ingen
 */
-class INGEN_API Parser {
+class INGEN_API Parser
+{
 public:
 	explicit Parser() = default;
 
diff --git a/include/ingen/Properties.hpp b/include/ingen/Properties.hpp
index 95b7eaf9..9151372b 100644
--- a/include/ingen/Properties.hpp
+++ b/include/ingen/Properties.hpp
@@ -28,7 +28,8 @@
 namespace ingen {
 
 /** A property value (an Atom with a context). */
-class Property : public Atom {
+class Property : public Atom
+{
 public:
 	enum class Graph {
 		DEFAULT,  ///< Default context for "universal" properties
@@ -53,7 +54,8 @@ private:
 	Graph _ctx;
 };
 
-class Properties : public std::multimap<URI, Property> {
+class Properties : public std::multimap<URI, Property>
+{
 public:
 	using Graph = Property::Graph;
 
diff --git a/include/ingen/URIMap.hpp b/include/ingen/URIMap.hpp
index 465f87f1..2df27a93 100644
--- a/include/ingen/URIMap.hpp
+++ b/include/ingen/URIMap.hpp
@@ -40,7 +40,8 @@ class World;
 /** URI to integer map and implementation of LV2 URID extension.
  * @ingroup IngenShared
  */
-class INGEN_API URIMap : public raul::Noncopyable {
+class INGEN_API URIMap : public raul::Noncopyable
+{
 public:
 	URIMap(Log& log, LV2_URID_Map* map, LV2_URID_Unmap* unmap);
 
@@ -48,7 +49,8 @@ public:
 	uint32_t    map_uri(const std::string& uri) { return map_uri(uri.c_str()); }
 	const char* unmap_uri(uint32_t urid) const;
 
-	class Feature : public LV2Features::Feature {
+	class Feature : public LV2Features::Feature
+	{
 	public:
 		Feature(const char* URI, void* data) : _feature{URI, data} {}
 
diff --git a/include/ingen/URIs.hpp b/include/ingen/URIs.hpp
index c6bd6968..f1244ba5 100644
--- a/include/ingen/URIs.hpp
+++ b/include/ingen/URIs.hpp
@@ -37,7 +37,8 @@ class URIMap;
  *
  * @ingroup ingen
  */
-class INGEN_API URIs : public raul::Noncopyable {
+class INGEN_API URIs : public raul::Noncopyable
+{
 public:
 	URIs(ingen::Forge& ingen_forge, URIMap* map, LilvWorld* lworld);
 
diff --git a/include/ingen/World.hpp b/include/ingen/World.hpp
index ecf1d45a..6f8bd83c 100644
--- a/include/ingen/World.hpp
+++ b/include/ingen/World.hpp
@@ -62,7 +62,8 @@ class URIs;
  *
  * @ingroup IngenShared
  */
-class INGEN_API World : public raul::Noncopyable {
+class INGEN_API World : public raul::Noncopyable
+{
 public:
 	/** Construct a new Ingen world.
 	 * @param map LV2 URID map implementation, or null to use internal.
diff --git a/include/ingen/client/PluginUI.hpp b/include/ingen/client/PluginUI.hpp
index 402e4b0f..6e7ea73f 100644
--- a/include/ingen/client/PluginUI.hpp
+++ b/include/ingen/client/PluginUI.hpp
@@ -43,7 +43,8 @@ class BlockModel;
  *
  * @ingroup IngenClient
  */
-class INGEN_API PluginUI {
+class INGEN_API PluginUI
+{
 public:
 	~PluginUI();
 
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 46c5e816..7a9313e2 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -88,7 +88,8 @@ protected:
 
 private:
 	/** Columns for the plugin list */
-	class ModelColumns : public Gtk::TreeModel::ColumnRecord {
+	class ModelColumns : public Gtk::TreeModel::ColumnRecord
+	{
 	public:
 		ModelColumns() {
 			add(_col_name);
@@ -110,7 +111,8 @@ private:
 	};
 
 	/** Column for the filter criteria combo box. */
-	class CriteriaColumns : public Gtk::TreeModel::ColumnRecord {
+	class CriteriaColumns : public Gtk::TreeModel::ColumnRecord
+	{
 	public:
 		enum class Criteria { NAME, TYPE, PROJECT, AUTHOR, URI, };
 
diff --git a/src/gui/URIEntry.hpp b/src/gui/URIEntry.hpp
index cc8f96a3..04dfaa41 100644
--- a/src/gui/URIEntry.hpp
+++ b/src/gui/URIEntry.hpp
@@ -39,7 +39,8 @@ namespace gui {
 
 class App;
 
-class URIEntry : public Gtk::HBox {
+class URIEntry : public Gtk::HBox
+{
 public:
 	/** Create a widget for entering URIs.
 	 *
diff --git a/src/gui/WidgetFactory.hpp b/src/gui/WidgetFactory.hpp
index 11ef71d1..d2f449ee 100644
--- a/src/gui/WidgetFactory.hpp
+++ b/src/gui/WidgetFactory.hpp
@@ -31,7 +31,8 @@ namespace gui {
  *
  * \ingroup GUI
  */
-class WidgetFactory {
+class WidgetFactory
+{
 public:
 	static Glib::RefPtr<Gtk::Builder>
 	create(const std::string& toplevel_widget="");
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index d4fe8d22..4ef79239 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -53,7 +53,8 @@ class RenameWindow;
  * as well as an enumeration of all windows (the goal being to reduce that
  * number as much as possible).
  */
-class WindowFactory {
+class WindowFactory
+{
 public:
 	explicit WindowFactory(App& app);
 	~WindowFactory();
diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp
index 8e9848f4..39acca04 100644
--- a/src/server/Broadcaster.hpp
+++ b/src/server/Broadcaster.hpp
@@ -76,7 +76,8 @@ public:
 	 * This makes doing the right thing in recursive functions that send
 	 * updates simple (e.g. Event::post_process()).
 	 */
-	class Transfer : public raul::Noncopyable {
+	class Transfer : public raul::Noncopyable
+	{
 	public:
 		explicit Transfer(Broadcaster& b) : broadcaster(b) {
 			if (++broadcaster._bundle_depth == 1) {
diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 58c5bba2..44409f3c 100644
--- a/src/server/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -39,7 +39,8 @@ namespace server {
 class Buffer;
 class Engine;
 
-class INGEN_SERVER_API BufferFactory {
+class INGEN_SERVER_API BufferFactory
+{
 public:
 	BufferFactory(Engine& engine, URIs& uris);
 	~BufferFactory();
diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp
index e644d982..103d27a3 100644
--- a/src/server/CompiledGraph.cpp
+++ b/src/server/CompiledGraph.cpp
@@ -43,7 +43,8 @@ namespace ingen {
 namespace server {
 
 /** Graph contains ambiguous feedback with no delay nodes. */
-class FeedbackException : public std::exception {
+class FeedbackException : public std::exception
+{
 public:
 	explicit FeedbackException(const BlockImpl* n)
 	    : node(n)
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index e71befa1..7c5ebb1f 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -51,7 +51,8 @@ class Engine;
 class RunContext;
 class PortImpl;
 
-class ControlBindings {
+class ControlBindings
+{
 public:
 	enum class Type : uint16_t {
 		NULL_CONTROL,
diff --git a/src/server/DirectDriver.hpp b/src/server/DirectDriver.hpp
index 7c683493..48de44f9 100644
--- a/src/server/DirectDriver.hpp
+++ b/src/server/DirectDriver.hpp
@@ -51,7 +51,8 @@ class Buffer;
 /** Driver for running Ingen directly as a library.
  * \ingroup engine
  */
-class DirectDriver : public Driver {
+class DirectDriver : public Driver
+{
 public:
 	DirectDriver(Engine&     engine,
 	             double      sample_rate,
diff --git a/src/server/Driver.hpp b/src/server/Driver.hpp
index 1bc6213d..0580e84d 100644
--- a/src/server/Driver.hpp
+++ b/src/server/Driver.hpp
@@ -44,7 +44,8 @@ class RunContext;
  *
  * \ingroup engine
  */
-class Driver : public raul::Noncopyable {
+class Driver : public raul::Noncopyable
+{
 public:
 	virtual ~Driver() = default;
 
diff --git a/src/server/Event.hpp b/src/server/Event.hpp
index 53d33e89..485badb1 100644
--- a/src/server/Event.hpp
+++ b/src/server/Event.hpp
@@ -63,10 +63,10 @@ public:
 
 	/** Execution mode for events that block and unblock preprocessing. */
 	enum class Execution {
-		NORMAL,  ///< Normal pipelined execution
-		ATOMIC,  ///< Block pre-processing until this event is executed
-		BLOCK,   ///< Begin atomic block of events
-		UNBLOCK  ///< Finish atomic executed block of events
+		NORMAL, ///< Normal pipelined execution
+		ATOMIC, ///< Block pre-processing until this event is executed
+		BLOCK,  ///< Begin atomic block of events
+		UNBLOCK ///< Finish atomic executed block of events
 	};
 
 	/** Claim position in undo stack before pre-processing (non-realtime). */
diff --git a/src/server/LV2Options.hpp b/src/server/LV2Options.hpp
index 2ae1c6d7..50544e01 100644
--- a/src/server/LV2Options.hpp
+++ b/src/server/LV2Options.hpp
@@ -34,7 +34,8 @@ class World;
 
 namespace server {
 
-class LV2Options : public ingen::LV2Features::Feature {
+class LV2Options : public ingen::LV2Features::Feature
+{
 public:
 	explicit LV2Options(const URIs& uris)
 		: _uris(uris)
diff --git a/src/server/PortType.hpp b/src/server/PortType.hpp
index d67429c9..2df3aa9d 100644
--- a/src/server/PortType.hpp
+++ b/src/server/PortType.hpp
@@ -32,7 +32,8 @@ namespace ingen {
  * of its contents).  Ports with different types can contain the same type of
  * data, but may e.g. have different access semantics.
  */
-class PortType {
+class PortType
+{
 public:
 	enum ID {
 		UNKNOWN = 0,
diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp
index d02935a9..88df994c 100644
--- a/src/server/PostProcessor.cpp
+++ b/src/server/PostProcessor.cpp
@@ -26,7 +26,8 @@ namespace server {
 
 class PreProcessContext;
 
-class Sentinel : public Event {
+class Sentinel : public Event
+{
 public:
 	explicit Sentinel(Engine& engine) noexcept : Event(engine) {}
 
diff --git a/src/server/Task.hpp b/src/server/Task.hpp
index 7a50fe8e..83782098 100644
--- a/src/server/Task.hpp
+++ b/src/server/Task.hpp
@@ -32,7 +32,8 @@ namespace server {
 class BlockImpl;
 class RunContext;
 
-class Task {
+class Task
+{
 public:
 	enum class Mode {
 		SINGLE,      ///< Single block to run
diff --git a/src/server/ThreadManager.hpp b/src/server/ThreadManager.hpp
index 4db87c1c..7c895607 100644
--- a/src/server/ThreadManager.hpp
+++ b/src/server/ThreadManager.hpp
@@ -31,7 +31,8 @@ enum ThreadFlag {
 	THREAD_MESSAGE      = 1 << 3,
 };
 
-class INGEN_SERVER_API ThreadManager {
+class INGEN_SERVER_API ThreadManager
+{
 public:
 	static inline void set_flag(ThreadFlag f) {
 #ifndef NDEBUG
diff --git a/src/server/UndoStack.hpp b/src/server/UndoStack.hpp
index 081d3ff4..8195920a 100644
--- a/src/server/UndoStack.hpp
+++ b/src/server/UndoStack.hpp
@@ -39,7 +39,8 @@ class URIs;
 
 namespace server {
 
-class INGEN_SERVER_API UndoStack : public AtomSink {
+class INGEN_SERVER_API UndoStack : public AtomSink
+{
 public:
 	struct Entry {
 		Entry(time_t t = 0) noexcept : time(t) {}
diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp
index c6db44be..5ce635e6 100644
--- a/src/server/events/Disconnect.hpp
+++ b/src/server/events/Disconnect.hpp
@@ -61,7 +61,8 @@ public:
 	void post_process() override;
 	void undo(Interface& target) override;
 
-	class Impl {
+	class Impl
+	{
 	public:
 		Impl(Engine& e, GraphImpl* graph, PortImpl* t, InputPort* h);
 
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 203fc115..8d8a2b75 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -90,7 +90,8 @@ struct LV2Graph : public Parser::ResourceRecord {
 };
 
 /** Ingen LV2 library. */
-class Lib {
+class Lib
+{
 public:
 	explicit Lib(const char* bundle_path);