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>
bb10
Andreas Buhr 2021-06-24 10:40:18 +02:00
parent 1cb63fcc97
commit 4b850065b1
9 changed files with 29 additions and 19 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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)

View File

@ -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:

View File

@ -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,

View File

@ -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();

View File

@ -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

View File

@ -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: