diff options
author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-04-28 15:52:04 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-04-29 20:12:48 +0000 |
commit | 63103377e1beccee3ddeccd93452964afc32326c (patch) | |
tree | b1c41e056abe13a09bb1298317ee2ad6b1421b4e | |
parent | 0fc5813c72222693540d5f234a99235a6d2f8c08 (diff) | |
download | qtivi-5.8.tar.gz |
Fully qualify all enums used from QML5.8
Task-number: AUTOSUITE-53
Change-Id: Ib2779b586edfad5e37d219ade31a6fe1a13cc372
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
-rw-r--r-- | src/ivicore/qiviabstractfeature.h | 4 | ||||
-rw-r--r-- | src/ivicore/qivisearchandbrowsemodel.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ivicore/qiviabstractfeature.h b/src/ivicore/qiviabstractfeature.h index 8c80faa..ee4d0b3 100644 --- a/src/ivicore/qiviabstractfeature.h +++ b/src/ivicore/qiviabstractfeature.h @@ -57,8 +57,8 @@ class Q_QTIVICORE_EXPORT QIviAbstractFeature : public QObject, public QQmlParser Q_OBJECT Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged) - Q_PROPERTY(DiscoveryResult discoveryResult READ discoveryResult NOTIFY discoveryResultChanged) + Q_PROPERTY(QIviAbstractFeature::DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged) + Q_PROPERTY(QIviAbstractFeature::DiscoveryResult discoveryResult READ discoveryResult NOTIFY discoveryResultChanged) Q_PROPERTY(QIviServiceObject *serviceObject READ serviceObject WRITE setServiceObject NOTIFY serviceObjectChanged) Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged) Q_PROPERTY(QString error READ errorMessage NOTIFY errorChanged) diff --git a/src/ivicore/qivisearchandbrowsemodel.h b/src/ivicore/qivisearchandbrowsemodel.h index ef11a5c..cea275f 100644 --- a/src/ivicore/qivisearchandbrowsemodel.h +++ b/src/ivicore/qivisearchandbrowsemodel.h @@ -54,7 +54,7 @@ class Q_QTIVICORE_EXPORT QIviSearchAndBrowseModel : public QIviAbstractFeatureLi { Q_OBJECT - Q_PROPERTY(Capabilities capabilities READ capabilities NOTIFY capabilitiesChanged) + Q_PROPERTY(QIviSearchAndBrowseModel::Capabilities capabilities READ capabilities NOTIFY capabilitiesChanged) Q_PROPERTY(QString query READ query WRITE setQuery NOTIFY queryChanged) Q_PROPERTY(QString contentType READ contentType WRITE setContentType NOTIFY contentTypeChanged) Q_PROPERTY(QStringList availableContentTypes READ availableContentTypes NOTIFY availableContentTypesChanged) @@ -108,7 +108,7 @@ public: QIviSearchAndBrowseModel(QObject *parent = Q_NULLPTR); virtual ~QIviSearchAndBrowseModel(); - Capabilities capabilities() const; + QIviSearchAndBrowseModel::Capabilities capabilities() const; QString query() const; void setQuery(const QString &query); @@ -140,7 +140,7 @@ public: Q_INVOKABLE QVariant get(int index) const; Q_INVOKABLE void goBack(); Q_INVOKABLE bool canGoForward(int index) const; - Q_INVOKABLE QIviSearchAndBrowseModel *goForward(int index, NavigationType navigationType); + Q_INVOKABLE QIviSearchAndBrowseModel *goForward(int index, QIviSearchAndBrowseModel::NavigationType navigationType); Q_INVOKABLE void insert(int index, const QVariant &variant); Q_INVOKABLE void remove(int index); Q_INVOKABLE void move(int cur_index, int new_index); @@ -152,7 +152,7 @@ public: } Q_SIGNALS: - void capabilitiesChanged(Capabilities capabilities); + void capabilitiesChanged(QIviSearchAndBrowseModel::Capabilities capabilities); void queryChanged(const QString &query); void chunkSizeChanged(int chunkSize); void countChanged(); |