From 775579ba58a368ab648a61fda797209abfb98339 Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Tue, 3 Dec 2013 12:13:00 -0500 Subject: [PATCH] Reused some br::Object code instead of looping over parameters myself --- openbr/openbr_plugin.cpp | 8 +++----- openbr/plugins/openbr_internal.h | 10 +--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp index 6470fff..4c4dd92 100644 --- a/openbr/openbr_plugin.cpp +++ b/openbr/openbr_plugin.cpp @@ -550,20 +550,18 @@ QStringList Object::parameters() const for (int i = firstAvailablePropertyIdx; i < metaObject()->propertyCount();i++) { QMetaProperty property = metaObject()->property(i); - if (property.isStored(this)) continue; parameters.append(QString("%1 %2 = %3").arg(property.typeName(), property.name(), property.read(this).toString())); } + return parameters; } QStringList Object::arguments() const { QStringList arguments; - for (int i=metaObject()->propertyOffset(); ipropertyCount(); i++) { - QMetaProperty property = metaObject()->property(i); - if (property.isStored(this)) continue; + for (int i=metaObject()->propertyOffset(); ipropertyCount(); i++) arguments.append(argument(i)); - } + return arguments; } diff --git a/openbr/plugins/openbr_internal.h b/openbr/plugins/openbr_internal.h index 262e32e..e21103e 100644 --- a/openbr/plugins/openbr_internal.h +++ b/openbr/plugins/openbr_internal.h @@ -266,15 +266,7 @@ public: name.replace("Transform",""); name += "([],"; - QStringList parameters; - - // Skip name and transforms (handled below) - for (int i = 2; i < metaObject()->propertyCount();i++) { - QMetaProperty property = metaObject()->property(i); - parameters.append(property.read(this).toString()); - } - - name += parameters.join(","); + name += this->arguments().join(","); name += ")"; name.replace("br::",""); -- libgit2 0.21.4