Commit 775579ba58a368ab648a61fda797209abfb98339

Authored by Scott Klum
1 parent 324204b5

Reused some br::Object code instead of looping over parameters myself

openbr/openbr_plugin.cpp
... ... @@ -550,20 +550,18 @@ QStringList Object::parameters() const
550 550  
551 551 for (int i = firstAvailablePropertyIdx; i < metaObject()->propertyCount();i++) {
552 552 QMetaProperty property = metaObject()->property(i);
553   - if (property.isStored(this)) continue;
554 553 parameters.append(QString("%1 %2 = %3").arg(property.typeName(), property.name(), property.read(this).toString()));
555 554 }
  555 +
556 556 return parameters;
557 557 }
558 558  
559 559 QStringList Object::arguments() const
560 560 {
561 561 QStringList arguments;
562   - for (int i=metaObject()->propertyOffset(); i<metaObject()->propertyCount(); i++) {
563   - QMetaProperty property = metaObject()->property(i);
564   - if (property.isStored(this)) continue;
  562 + for (int i=metaObject()->propertyOffset(); i<metaObject()->propertyCount(); i++)
565 563 arguments.append(argument(i));
566   - }
  564 +
567 565 return arguments;
568 566 }
569 567  
... ...
openbr/plugins/openbr_internal.h
... ... @@ -266,15 +266,7 @@ public:
266 266 name.replace("Transform","");
267 267 name += "([],";
268 268  
269   - QStringList parameters;
270   -
271   - // Skip name and transforms (handled below)
272   - for (int i = 2; i < metaObject()->propertyCount();i++) {
273   - QMetaProperty property = metaObject()->property(i);
274   - parameters.append(property.read(this).toString());
275   - }
276   -
277   - name += parameters.join(",");
  269 + name += this->arguments().join(",");
278 270  
279 271 name += ")";
280 272 name.replace("br::","");
... ...