From 4b850065b1631437b65542b3cb1c16077d2f0230 Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Thu, 24 Jun 2021 10:40:18 +0200 Subject: Consistent indentation for BINDABLE properties Triggered by API review in Gerrit patch 355960. Task-number: QTBUG-94407 Pick-to: 6.2 Change-Id: I7cafc1cc9d4b929040b53c6bf92c91d73c3b39f2 Reviewed-by: Edward Welbourne --- src/corelib/animation/qpropertyanimation.h | 4 ++-- src/corelib/animation/qsequentialanimationgroup.h | 4 ++-- src/corelib/itemmodels/qabstractproxymodel.h | 4 ++-- src/corelib/itemmodels/qitemselectionmodel.h | 15 ++++++++++----- src/corelib/kernel/qobject.h | 2 +- src/corelib/tools/qtimeline.h | 4 ++-- 6 files changed, 19 insertions(+), 14 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h index 5768ec6f01..0edd4d9b72 100644 --- a/src/corelib/animation/qpropertyanimation.h +++ b/src/corelib/animation/qpropertyanimation.h @@ -51,9 +51,9 @@ class Q_CORE_EXPORT QPropertyAnimation : public QVariantAnimation { Q_OBJECT Q_PROPERTY(QByteArray propertyName READ propertyName WRITE setPropertyName - BINDABLE bindablePropertyName) + BINDABLE bindablePropertyName) Q_PROPERTY(QObject* targetObject READ targetObject WRITE setTargetObject - BINDABLE bindableTargetObject) + BINDABLE bindableTargetObject) public: QPropertyAnimation(QObject *parent = nullptr); diff --git a/src/corelib/animation/qsequentialanimationgroup.h b/src/corelib/animation/qsequentialanimationgroup.h index 1dab299a85..4b222069cf 100644 --- a/src/corelib/animation/qsequentialanimationgroup.h +++ b/src/corelib/animation/qsequentialanimationgroup.h @@ -52,8 +52,8 @@ class QSequentialAnimationGroupPrivate; class Q_CORE_EXPORT QSequentialAnimationGroup : public QAnimationGroup { Q_OBJECT - Q_PROPERTY(QAbstractAnimation *currentAnimation READ currentAnimation NOTIFY - currentAnimationChanged BINDABLE bindableCurrentAnimation) + Q_PROPERTY(QAbstractAnimation *currentAnimation READ currentAnimation + NOTIFY currentAnimationChanged BINDABLE bindableCurrentAnimation) public: QSequentialAnimationGroup(QObject *parent = nullptr); diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h index 0bc59e4a63..bb8c5400dc 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.h +++ b/src/corelib/itemmodels/qabstractproxymodel.h @@ -52,8 +52,8 @@ class QItemSelection; class Q_CORE_EXPORT QAbstractProxyModel : public QAbstractItemModel { Q_OBJECT - Q_PROPERTY(QAbstractItemModel *sourceModel READ sourceModel WRITE setSourceModel NOTIFY - sourceModelChanged BINDABLE bindableSourceModel) + Q_PROPERTY(QAbstractItemModel *sourceModel READ sourceModel WRITE setSourceModel + NOTIFY sourceModelChanged BINDABLE bindableSourceModel) public: explicit QAbstractProxyModel(QObject *parent = nullptr); diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index 512bb04861..580b9866fc 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -120,11 +120,16 @@ class QItemSelectionModelPrivate; class Q_CORE_EXPORT QItemSelectionModel : public QObject { Q_OBJECT - Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged BINDABLE bindableModel) - Q_PROPERTY(bool hasSelection READ hasSelection NOTIFY selectionChanged STORED false DESIGNABLE false) - Q_PROPERTY(QModelIndex currentIndex READ currentIndex NOTIFY currentChanged STORED false DESIGNABLE false) - Q_PROPERTY(QItemSelection selection READ selection NOTIFY selectionChanged STORED false DESIGNABLE false) - Q_PROPERTY(QModelIndexList selectedIndexes READ selectedIndexes NOTIFY selectionChanged STORED false DESIGNABLE false) + Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged + BINDABLE bindableModel) + Q_PROPERTY(bool hasSelection READ hasSelection NOTIFY selectionChanged STORED false + DESIGNABLE false) + Q_PROPERTY(QModelIndex currentIndex READ currentIndex NOTIFY currentChanged STORED false + DESIGNABLE false) + Q_PROPERTY(QItemSelection selection READ selection NOTIFY selectionChanged STORED false + DESIGNABLE false) + Q_PROPERTY(QModelIndexList selectedIndexes READ selectedIndexes NOTIFY selectionChanged + STORED false DESIGNABLE false) Q_DECLARE_PRIVATE(QItemSelectionModel) diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index c59518367d..6f5d574f70 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -121,7 +121,7 @@ class Q_CORE_EXPORT QObject Q_OBJECT Q_PROPERTY(QString objectName READ objectName WRITE setObjectName NOTIFY objectNameChanged - BINDABLE bindableObjectName) + BINDABLE bindableObjectName) Q_DECLARE_PRIVATE(QObject) public: diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h index 48a06f06df..464c4a8836 100644 --- a/src/corelib/tools/qtimeline.h +++ b/src/corelib/tools/qtimeline.h @@ -56,12 +56,12 @@ class Q_CORE_EXPORT QTimeLine : public QObject Q_OBJECT Q_PROPERTY(int duration READ duration WRITE setDuration BINDABLE bindableDuration) Q_PROPERTY(int updateInterval READ updateInterval WRITE setUpdateInterval - BINDABLE bindableUpdateInterval) + BINDABLE bindableUpdateInterval) Q_PROPERTY(int currentTime READ currentTime WRITE setCurrentTime BINDABLE bindableCurrentTime) Q_PROPERTY(Direction direction READ direction WRITE setDirection BINDABLE bindableDirection) Q_PROPERTY(int loopCount READ loopCount WRITE setLoopCount BINDABLE bindableLoopCount) Q_PROPERTY(QEasingCurve easingCurve READ easingCurve WRITE setEasingCurve - BINDABLE bindableEasingCurve) + BINDABLE bindableEasingCurve) public: enum State { NotRunning, -- cgit v1.2.3