summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Buhr <andreas.buhr@qt.io>2021-06-24 10:40:18 +0200
committerAndreas Buhr <andreas.buhr@qt.io>2021-06-24 19:35:29 +0200
commit4b850065b1631437b65542b3cb1c16077d2f0230 (patch)
treef88f79b9a647dc9bacbe406039f61aa03bb3ab20
parent1cb63fcc97e2b114996e25e679b167cb5d392c60 (diff)
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 <edward.welbourne@qt.io>
-rw-r--r--src/corelib/animation/qpropertyanimation.h4
-rw-r--r--src/corelib/animation/qsequentialanimationgroup.h4
-rw-r--r--src/corelib/itemmodels/qabstractproxymodel.h4
-rw-r--r--src/corelib/itemmodels/qitemselectionmodel.h15
-rw-r--r--src/corelib/kernel/qobject.h2
-rw-r--r--src/corelib/tools/qtimeline.h4
-rw-r--r--src/network/socket/qlocalserver.h3
-rw-r--r--src/network/socket/qlocalsocket.h3
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp9
9 files changed, 29 insertions, 19 deletions
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,
diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h
index 5da07653cb..f4ae63e6c4 100644
--- a/src/network/socket/qlocalserver.h
+++ b/src/network/socket/qlocalserver.h
@@ -56,7 +56,8 @@ class Q_NETWORK_EXPORT QLocalServer : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QLocalServer)
- Q_PROPERTY(SocketOptions socketOptions READ socketOptions WRITE setSocketOptions BINDABLE bindableSocketOptions)
+ Q_PROPERTY(SocketOptions socketOptions READ socketOptions WRITE setSocketOptions
+ BINDABLE bindableSocketOptions)
Q_SIGNALS:
void newConnection();
diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h
index 2516c539f3..2a578dd10b 100644
--- a/src/network/socket/qlocalsocket.h
+++ b/src/network/socket/qlocalsocket.h
@@ -58,7 +58,8 @@ class Q_NETWORK_EXPORT QLocalSocket : public QIODevice
{
Q_OBJECT
Q_DECLARE_PRIVATE(QLocalSocket)
- Q_PROPERTY(SocketOptions socketOptions READ socketOptions WRITE setSocketOptions BINDABLE bindableSocketOptions)
+ Q_PROPERTY(SocketOptions socketOptions READ socketOptions WRITE setSocketOptions
+ BINDABLE bindableSocketOptions)
public:
enum LocalSocketError
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 85630bd38b..752c539964 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -4116,7 +4116,8 @@ void tst_Moc::requiredProperties()
class ClassWithQPropertyMembers : public QObject
{
Q_OBJECT
- Q_PROPERTY(int publicProperty MEMBER publicProperty BINDABLE bindablePublicProperty NOTIFY publicPropertyChanged)
+ Q_PROPERTY(int publicProperty MEMBER publicProperty BINDABLE bindablePublicProperty
+ NOTIFY publicPropertyChanged)
Q_PROPERTY(int privateExposedProperty MEMBER privateExposedProperty)
public:
@@ -4223,8 +4224,10 @@ class ClassWithPrivateQPropertyShim :public QObject
{
Q_OBJECT
public:
- Q_PROPERTY(int testProperty READ testProperty WRITE setTestProperty BINDABLE bindableTestProperty NOTIFY testPropertyChanged)
- Q_PROPERTY(int testProperty2 READ testProperty2 WRITE setTestProperty2 BINDABLE bindableTestProperty2)
+ Q_PROPERTY(int testProperty READ testProperty WRITE setTestProperty
+ BINDABLE bindableTestProperty NOTIFY testPropertyChanged)
+ Q_PROPERTY(int testProperty2 READ testProperty2 WRITE setTestProperty2
+ BINDABLE bindableTestProperty2)
//Q_PROPERTY(d_func(), int, lazyTestProperty, setLazyTestProperty, NOTIFY lazyTestPropertyChanged)
signals: