From b42cb99941882ec96efc469a3f9212e3b1676f26 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 18 Aug 2022 01:42:06 -0400 Subject: Use consistent brace wrapping for class definitions --- include/ingen/Atom.hpp | 3 ++- include/ingen/AtomSink.hpp | 3 ++- include/ingen/Clock.hpp | 3 ++- include/ingen/ColorContext.hpp | 3 ++- include/ingen/Configuration.hpp | 3 ++- include/ingen/Forge.hpp | 3 ++- include/ingen/LV2Features.hpp | 12 ++++++++---- include/ingen/Library.hpp | 3 ++- include/ingen/Log.hpp | 3 ++- include/ingen/Module.hpp | 3 ++- include/ingen/Parser.hpp | 3 ++- include/ingen/Properties.hpp | 6 ++++-- include/ingen/URIMap.hpp | 6 ++++-- include/ingen/URIs.hpp | 3 ++- include/ingen/World.hpp | 3 ++- include/ingen/client/PluginUI.hpp | 3 ++- 16 files changed, 42 insertions(+), 21 deletions(-) (limited to 'include') 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>; 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; 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 { +class Properties : public std::multimap +{ 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(); -- cgit v1.2.1