Commit e93ea97d62db02e7bbace4d4c79abfb3267c0247

Authored by Charles Otto
1 parent dd92d1eb

renameACoupleMemberVariables

sdk/openbr_plugin.cpp
@@ -495,7 +495,7 @@ QStringList Object::parameters() const @@ -495,7 +495,7 @@ QStringList Object::parameters() const
495 { 495 {
496 QStringList parameters; 496 QStringList parameters;
497 497
498 - for (int i = first_available_property_idx; i < metaObject()->propertyCount();i++) { 498 + for (int i = firstAvailablePropertyIdx; i < metaObject()->propertyCount();i++) {
499 QMetaProperty property = metaObject()->property(i); 499 QMetaProperty property = metaObject()->property(i);
500 if (property.isStored(this)) continue; 500 if (property.isStored(this)) continue;
501 parameters.append(QString("%1 %2 = %3").arg(property.typeName(), property.name(), property.read(this).toString())); 501 parameters.append(QString("%1 %2 = %3").arg(property.typeName(), property.name(), property.read(this).toString()));
@@ -715,7 +715,7 @@ void Object::init(const File &amp;file_) @@ -715,7 +715,7 @@ void Object::init(const File &amp;file_)
715 QString name = metaObject()->className(); 715 QString name = metaObject()->className();
716 if (name.startsWith("br::")) name = name.right(name.size()-4); 716 if (name.startsWith("br::")) name = name.right(name.size()-4);
717 717
718 - first_available_property_idx = metaObject()->propertyCount(); 718 + firstAvailablePropertyIdx = metaObject()->propertyCount();
719 719
720 const QMetaObject * baseClass = metaObject(); 720 const QMetaObject * baseClass = metaObject();
721 const QMetaObject * superClass = metaObject()->superClass(); 721 const QMetaObject * superClass = metaObject()->superClass();
@@ -726,7 +726,7 @@ void Object::init(const File &amp;file_) @@ -726,7 +726,7 @@ void Object::init(const File &amp;file_)
726 // baseClass <- something <- br::Object 726 // baseClass <- something <- br::Object
727 // baseClass is the highest class whose properties we can set via positional arguments 727 // baseClass is the highest class whose properties we can set via positional arguments
728 if (nextClass && !strcmp(nextClass->className(),"br::Object")) { 728 if (nextClass && !strcmp(nextClass->className(),"br::Object")) {
729 - first_available_property_idx = baseClass->propertyOffset(); 729 + firstAvailablePropertyIdx = baseClass->propertyOffset();
730 } 730 }
731 731
732 QString superClassName = superClass->className(); 732 QString superClassName = superClass->className();
@@ -757,7 +757,7 @@ void Object::init(const File &amp;file_) @@ -757,7 +757,7 @@ void Object::init(const File &amp;file_)
757 757
758 if (key.startsWith(("_Arg"))) { 758 if (key.startsWith(("_Arg"))) {
759 int argument_number = key.mid(4).toInt(); 759 int argument_number = key.mid(4).toInt();
760 - int target_idx = argument_number + first_available_property_idx; 760 + int target_idx = argument_number + firstAvailablePropertyIdx;
761 761
762 if (target_idx >= metaObject()->propertyCount()) { 762 if (target_idx >= metaObject()->propertyCount()) {
763 qWarning("too many arguments for transform, ignoring %s\n", qPrintable(value)); 763 qWarning("too many arguments for transform, ignoring %s\n", qPrintable(value));
sdk/openbr_plugin.h
@@ -422,7 +422,7 @@ class BR_EXPORT Object : public QObject @@ -422,7 +422,7 @@ class BR_EXPORT Object : public QObject
422 Q_OBJECT 422 Q_OBJECT
423 423
424 // Index of the first property that can be set via command line arguments 424 // Index of the first property that can be set via command line arguments
425 - int first_available_property_idx; 425 + int firstAvailablePropertyIdx;
426 426
427 public: 427 public:
428 File file; /*!< \brief The file used to construct the plugin. */ 428 File file; /*!< \brief The file used to construct the plugin. */
@@ -1159,16 +1159,16 @@ public: @@ -1159,16 +1159,16 @@ public:
1159 1159
1160 bool timeVarying() const 1160 bool timeVarying() const
1161 { 1161 {
1162 - return time_varying; 1162 + return isTimeVarying;
1163 } 1163 }
1164 1164
1165 void init() 1165 void init()
1166 { 1166 {
1167 - time_varying = false; 1167 + isTimeVarying = false;
1168 foreach(const br::Transform * transform, transforms) 1168 foreach(const br::Transform * transform, transforms)
1169 { 1169 {
1170 if (transform->timeVarying()) { 1170 if (transform->timeVarying()) {
1171 - time_varying = true; 1171 + isTimeVarying = true;
1172 break; 1172 break;
1173 } 1173 }
1174 } 1174 }
@@ -1176,7 +1176,7 @@ public: @@ -1176,7 +1176,7 @@ public:
1176 1176
1177 1177
1178 protected: 1178 protected:
1179 - bool time_varying; 1179 + bool isTimeVarying;
1180 1180
1181 virtual void _project(const Template & src, Template & dst) const = 0; 1181 virtual void _project(const Template & src, Template & dst) const = 0;
1182 virtual void _project(const TemplateList & src, TemplateList & dst) const = 0; 1182 virtual void _project(const TemplateList & src, TemplateList & dst) const = 0;