diff options
author | Mathias Hasselmann <mathias.hasselmann@kdab.com> | 2013-11-13 23:03:29 +0100 |
---|---|---|
committer | Mathias Hasselmann <mathias.hasselmann@kdab.com> | 2013-11-13 23:07:02 +0100 |
commit | 1242fbb5f9eba7e7965ece5006672468374b5747 (patch) | |
tree | c210bee027b6a2d8bce8ddd281614421222b497a | |
parent | 30f9bd3d57b673b9962264d14f8087c5381abb75 (diff) | |
download | qtquickstreamer-1242fbb5f9eba7e7965ece5006672468374b5747.tar.gz qtquickstreamer-1242fbb5f9eba7e7965ece5006672468374b5747.tar.xz |
Rename PropertyInfo into PropertyDelegate
-rw-r--r-- | src/QuickStreamer/item.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/QuickStreamer/item.cpp b/src/QuickStreamer/item.cpp index fe17aae..9a716fd 100644 --- a/src/QuickStreamer/item.cpp +++ b/src/QuickStreamer/item.cpp @@ -61,7 +61,7 @@ private: GstObject *const m_object; }; -struct PropertyInfo +struct PropertyDelegate { typedef std::function<void(Item *item, void *value)> ReadDelegate; typedef std::function<void(Item *item, const void *value)> WriteDelegate; @@ -548,7 +548,7 @@ struct TypeInfo { } - void addProperty(const PropertyInfo &propertyInfo, + void addProperty(const PropertyDelegate &delegate, const QByteArray &propertyName, const QByteArray &propertyType, QMetaObjectBuilder *objectBuilder) @@ -556,9 +556,9 @@ struct TypeInfo auto notifierBuilder = objectBuilder->addSignal(propertyName + QByteArrayLiteral("Changed()")); auto propertyBuilder = objectBuilder->addProperty(propertyName, propertyType, notifierBuilder.index()); - propertyBuilder.setReadable(propertyInfo.read != Q_NULLPTR); - propertyBuilder.setWritable(propertyInfo.write != Q_NULLPTR); - propertyBuilder.setResettable(propertyInfo.reset != Q_NULLPTR); + propertyBuilder.setReadable(delegate.read != Q_NULLPTR); + propertyBuilder.setWritable(delegate.write != Q_NULLPTR); + propertyBuilder.setResettable(delegate.reset != Q_NULLPTR); if (propertyType.endsWith(ENUMERATOR_TYPE_SUFFIX)) { // FIXME propertyBuilder.setEnumOrFlag(true); @@ -568,7 +568,7 @@ struct TypeInfo objectBuilder->addRelatedMetaObject(QMetaType::metaObjectForType(scopeId)); } - properties.append(propertyInfo); + propertyDelegates.append(delegate); } static const TypeInfo *create(GType type, const MetaTypePads &metaTypePads) @@ -633,9 +633,9 @@ struct TypeInfo using namespace std::placeholders; - PropertyInfo::ReadDelegate readDelegate; - PropertyInfo::WriteDelegate writeDelegate; - PropertyInfo::ResetDelegate resetDelegate; + PropertyDelegate::ReadDelegate readDelegate; + PropertyDelegate::WriteDelegate writeDelegate; + PropertyDelegate::ResetDelegate resetDelegate; if (spec->flags & G_PARAM_READABLE) readDelegate = std::bind(&readGObjectProperty, _1, spec, _2); @@ -753,10 +753,10 @@ struct TypeInfo if (id < 0) return id; - if (id < properties.size()) - properties.at(id).read(item, value); + if (id < propertyDelegates.size()) + propertyDelegates.at(id).read(item, value); - return id - properties.size(); + return id - propertyDelegates.size(); } int writeProperty(Item *item, int id, const void *value) const @@ -766,10 +766,10 @@ struct TypeInfo if (id < 0) return id; - if (id < properties.size()) - properties.at(id).write(item, value); + if (id < propertyDelegates.size()) + propertyDelegates.at(id).write(item, value); - return id - properties.size(); + return id - propertyDelegates.size(); } int resetProperty(Item *item, int id) const @@ -779,16 +779,16 @@ struct TypeInfo if (id < 0) return id; - if (id < properties.size()) - properties.at(id).reset(item); + if (id < propertyDelegates.size()) + propertyDelegates.at(id).reset(item); - return id - properties.size(); + return id - propertyDelegates.size(); } void emitPropertyChanged(Item *object, const GParamSpec *pspec) const { - for (int i = 0; i < properties.size(); ++i) { - auto const &p = properties.at(i); + for (int i = 0; i < propertyDelegates.size(); ++i) { + auto const &p = propertyDelegates.at(i); // can compare by pointer because GParamSpec::name is interned if (p.spec && pspec->name == p.spec->name) { @@ -805,7 +805,7 @@ struct TypeInfo const QMetaObject *metaObject; QByteArray elementName; - QVector<PropertyInfo> properties; + QVector<PropertyDelegate> propertyDelegates; static QHash<GType, TypeInfo *> cache; }; |