From e02ad953806dfae4c5a788bb41f3ea08a50264c5 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 26 Jun 2015 16:00:43 +0200 Subject: [PATCH] Fix whitespace --- source/modules/lilv/custom-patches.diff | 52 +++++++++---------- .../modules/lilv/lilv-0.21.3/lilv/lilvmm.hpp | 52 +++++++++---------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/source/modules/lilv/custom-patches.diff b/source/modules/lilv/custom-patches.diff index 39a9fdcd6..605ce31d0 100644 --- a/source/modules/lilv/custom-patches.diff +++ b/source/modules/lilv/custom-patches.diff @@ -133,7 +133,7 @@ index b9b3a69..367b8d8 100644 inline RT name() { return lilv_ ## prefix ## _ ## name (me); } +#define LILV_WRAP0_CONST(RT, prefix, name) \ -+ inline RT name() const { return lilv_ ## prefix ## _ ## name (me); } ++ inline RT name() const { return lilv_ ## prefix ## _ ## name (me); } + #define LILV_WRAP0_VOID(prefix, name) \ inline void name() { lilv_ ## prefix ## _ ## name(me); } @@ -142,7 +142,7 @@ index b9b3a69..367b8d8 100644 #endif struct Node { -+ inline Node(LilvNode* node) : me(node) {} ++ inline Node(LilvNode* node) : me(node) {} inline Node(const LilvNode* node) : me(lilv_node_duplicate(node)) {} inline Node(const Node& copy) : me(lilv_node_duplicate(copy.me)) {} @@ -179,11 +179,11 @@ index b9b3a69..367b8d8 100644 + LILV_WRAP0_CONST(bool, node, is_bool); + LILV_WRAP0_CONST(bool, node, as_bool); + -+ Node& operator=(const Node& copy) { -+ lilv_node_free(me); -+ me = lilv_node_duplicate(copy.me); -+ return *this; -+ } ++ Node& operator=(const Node& copy) { ++ lilv_node_free(me); ++ me = lilv_node_duplicate(copy.me); ++ return *this; ++ } LilvNode* me; }; @@ -202,9 +202,9 @@ index b9b3a69..367b8d8 100644 LILV_WRAP1(bool, nodes, contains, const Node, node); - LILV_WRAP0(Node, nodes, get_first); + -+ inline Node get_first() const { -+ return Node((const LilvNode*)lilv_nodes_get_first(me)); -+ } ++ inline Node get_first() const { ++ return Node((const LilvNode*)lilv_nodes_get_first(me)); ++ } }; struct UI { @@ -220,14 +220,14 @@ index b9b3a69..367b8d8 100644 - const LilvNode*, container_type, - const LilvNode**, ui_type);*/ - LILV_WRAP1(bool, ui, is_a, const LilvNode*, class_uri); -+ LILV_WRAP0(Node, ui, get_uri); -+ LILV_WRAP1(bool, ui, is_a, LilvNode*, ui_class); -+ LILV_WRAP0(Node, ui, get_bundle_uri); -+ LILV_WRAP0(Node, ui, get_binary_uri); -+ LILV_WRAP0(Nodes, ui, get_supported_features); -+ LILV_WRAP0(Nodes, ui, get_required_features); -+ LILV_WRAP0(Nodes, ui, get_optional_features); -+ LILV_WRAP0(Nodes, ui, get_extension_data); ++ LILV_WRAP0(Node, ui, get_uri); ++ LILV_WRAP1(bool, ui, is_a, LilvNode*, ui_class); ++ LILV_WRAP0(Node, ui, get_bundle_uri); ++ LILV_WRAP0(Node, ui, get_binary_uri); ++ LILV_WRAP0(Nodes, ui, get_supported_features); ++ LILV_WRAP0(Nodes, ui, get_required_features); ++ LILV_WRAP0(Nodes, ui, get_optional_features); ++ LILV_WRAP0(Nodes, ui, get_extension_data); const LilvUI* me; }; @@ -253,19 +253,19 @@ index b9b3a69..367b8d8 100644 - inline Instance(Plugin plugin, double sample_rate) { - me = lilv_plugin_instantiate(plugin, sample_rate, NULL); - } -+ LILV_DEPRECATED -+ inline Instance(Plugin plugin, double sample_rate) -+ : me(lilv_plugin_instantiate(plugin, sample_rate, NULL)) {} ++ LILV_DEPRECATED ++ inline Instance(Plugin plugin, double sample_rate) ++ : me(lilv_plugin_instantiate(plugin, sample_rate, NULL)) {} - LILV_DEPRECATED inline Instance(Plugin plugin, - double sample_rate, - LV2_Feature* const* features) { - me = lilv_plugin_instantiate(plugin, sample_rate, features); - } -+ LILV_DEPRECATED inline Instance(Plugin plugin, -+ double sample_rate, -+ LV2_Feature* const* features) -+ : me(lilv_plugin_instantiate(plugin, sample_rate, features)) {} ++ LILV_DEPRECATED inline Instance(Plugin plugin, ++ double sample_rate, ++ LV2_Feature* const* features) ++ : me(lilv_plugin_instantiate(plugin, sample_rate, features)) {} static inline Instance* create(Plugin plugin, double sample_rate, @@ -313,7 +313,7 @@ index b9b3a69..367b8d8 100644 LilvWorld* me; + -+ CARLA_DECLARE_NON_COPY_STRUCT(World) ++ CARLA_DECLARE_NON_COPY_STRUCT(World) }; } /* namespace Lilv */ diff --git a/source/modules/lilv/lilv-0.21.3/lilv/lilvmm.hpp b/source/modules/lilv/lilv-0.21.3/lilv/lilvmm.hpp index 367b8d8a6..c3aa82240 100644 --- a/source/modules/lilv/lilv-0.21.3/lilv/lilvmm.hpp +++ b/source/modules/lilv/lilv-0.21.3/lilv/lilvmm.hpp @@ -38,7 +38,7 @@ uri_to_path(const char* uri) { inline RT name() { return lilv_ ## prefix ## _ ## name (me); } #define LILV_WRAP0_CONST(RT, prefix, name) \ - inline RT name() const { return lilv_ ## prefix ## _ ## name (me); } + inline RT name() const { return lilv_ ## prefix ## _ ## name (me); } #define LILV_WRAP0_VOID(prefix, name) \ inline void name() { lilv_ ## prefix ## _ ## name(me); } @@ -70,7 +70,7 @@ uri_to_path(const char* uri) { #endif struct Node { - inline Node(LilvNode* node) : me(node) {} + inline Node(LilvNode* node) : me(node) {} inline Node(const LilvNode* node) : me(lilv_node_duplicate(node)) {} inline Node(const Node& copy) : me(lilv_node_duplicate(copy.me)) {} @@ -99,11 +99,11 @@ struct Node { LILV_WRAP0_CONST(bool, node, is_bool); LILV_WRAP0_CONST(bool, node, as_bool); - Node& operator=(const Node& copy) { - lilv_node_free(me); - me = lilv_node_duplicate(copy.me); - return *this; - } + Node& operator=(const Node& copy) { + lilv_node_free(me); + me = lilv_node_duplicate(copy.me); + return *this; + } LilvNode* me; }; @@ -154,23 +154,23 @@ struct Nodes { LILV_WRAP_COLL(Nodes, Node, nodes); LILV_WRAP1(bool, nodes, contains, const Node, node); - inline Node get_first() const { - return Node((const LilvNode*)lilv_nodes_get_first(me)); - } + inline Node get_first() const { + return Node((const LilvNode*)lilv_nodes_get_first(me)); + } }; struct UI { inline UI(const LilvUI* c_obj) : me(c_obj) {} LILV_WRAP_CONVERSION(const LilvUI); - LILV_WRAP0(Node, ui, get_uri); - LILV_WRAP1(bool, ui, is_a, LilvNode*, ui_class); - LILV_WRAP0(Node, ui, get_bundle_uri); - LILV_WRAP0(Node, ui, get_binary_uri); - LILV_WRAP0(Nodes, ui, get_supported_features); - LILV_WRAP0(Nodes, ui, get_required_features); - LILV_WRAP0(Nodes, ui, get_optional_features); - LILV_WRAP0(Nodes, ui, get_extension_data); + LILV_WRAP0(Node, ui, get_uri); + LILV_WRAP1(bool, ui, is_a, LilvNode*, ui_class); + LILV_WRAP0(Node, ui, get_bundle_uri); + LILV_WRAP0(Node, ui, get_binary_uri); + LILV_WRAP0(Nodes, ui, get_supported_features); + LILV_WRAP0(Nodes, ui, get_required_features); + LILV_WRAP0(Nodes, ui, get_optional_features); + LILV_WRAP0(Nodes, ui, get_extension_data); const LilvUI* me; }; @@ -279,14 +279,14 @@ struct Plugins { struct Instance { inline Instance(LilvInstance* instance) : me(instance) {} - LILV_DEPRECATED - inline Instance(Plugin plugin, double sample_rate) - : me(lilv_plugin_instantiate(plugin, sample_rate, NULL)) {} + LILV_DEPRECATED + inline Instance(Plugin plugin, double sample_rate) + : me(lilv_plugin_instantiate(plugin, sample_rate, NULL)) {} - LILV_DEPRECATED inline Instance(Plugin plugin, - double sample_rate, - LV2_Feature* const* features) - : me(lilv_plugin_instantiate(plugin, sample_rate, features)) {} + LILV_DEPRECATED inline Instance(Plugin plugin, + double sample_rate, + LV2_Feature* const* features) + : me(lilv_plugin_instantiate(plugin, sample_rate, features)) {} static inline Instance* create(Plugin plugin, double sample_rate, @@ -357,7 +357,7 @@ struct World { LilvWorld* me; - CARLA_DECLARE_NON_COPY_STRUCT(World) + CARLA_DECLARE_NON_COPY_STRUCT(World) }; } /* namespace Lilv */