diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick/items/qquicklistview_p.h | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquicklistview_p.h')
-rw-r--r-- | src/quick/items/qquicklistview_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h index bffd935616..239647a954 100644 --- a/src/quick/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,7 +44,7 @@ #include "qquickitemview_p.h" -#include <private/qdeclarativeguard_p.h> +#include <private/qqmlguard_p.h> QT_BEGIN_HEADER @@ -57,7 +57,7 @@ class Q_AUTOTEST_EXPORT QQuickViewSection : public QObject Q_OBJECT Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) Q_PROPERTY(SectionCriteria criteria READ criteria WRITE setCriteria NOTIFY criteriaChanged) - Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) + Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) Q_PROPERTY(int labelPositioning READ labelPositioning WRITE setLabelPositioning NOTIFY labelPositioningChanged) Q_ENUMS(SectionCriteria) Q_ENUMS(LabelPositioning) @@ -71,8 +71,8 @@ public: SectionCriteria criteria() const { return m_criteria; } void setCriteria(SectionCriteria); - QDeclarativeComponent *delegate() const { return m_delegate; } - void setDelegate(QDeclarativeComponent *delegate); + QQmlComponent *delegate() const { return m_delegate; } + void setDelegate(QQmlComponent *delegate); QString sectionString(const QString &value); @@ -89,7 +89,7 @@ Q_SIGNALS: private: QString m_property; SectionCriteria m_criteria; - QDeclarativeComponent *m_delegate; + QQmlComponent *m_delegate; int m_labelPositioning; QQuickListViewPrivate *m_view; }; @@ -197,7 +197,7 @@ Q_SIGNALS: void viewChanged(); public: - QDeclarativeGuard<QQuickListView> m_view; + QQmlGuard<QQuickListView> m_view; }; |