1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalize signal/slot signatures [1/2]: non-QPair

Browse Source 
This is the result of running util/normalize, dropped some false
positives:

- it removed the space after "d, " in Q_PRIVATE_SLOT(d, foo())

- it removed spaces in moc text streaming of "SLOT(" << ... << ")"

In addition, the tool replaces QPair with std::pair. This is
surprising and therefore performed in a separate commit.

Pick-to: 6.6
Change-Id: If4e3815d7c0840defc1b82bcbf41a8265acda0d8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2023-07-11 08:33:19 +02:00
parent 97ec1d7d8e
commit 25f5983ea8
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
View File

@ -446,10 +446,10 @@ void QConcatenateTablesProxyModel::addSourceModel(QAbstractItemModel *sourceMode
connect(sourceModel, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(_q_slotColumnsAboutToBeInserted(QModelIndex,int,int))); connect(sourceModel, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(_q_slotColumnsAboutToBeInserted(QModelIndex,int,int)));
connect(sourceModel, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(_q_slotColumnsAboutToBeRemoved(QModelIndex,int,int))); connect(sourceModel, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(_q_slotColumnsAboutToBeRemoved(QModelIndex,int,int)));
connect(sourceModel, SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)), connect(sourceModel, SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
this, SLOT(_q_slotSourceLayoutAboutToBeChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint))); this, SLOT(_q_slotSourceLayoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
connect(sourceModel, SIGNAL(layoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)), connect(sourceModel, SIGNAL(layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
this, SLOT(_q_slotSourceLayoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint))); this, SLOT(_q_slotSourceLayoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
connect(sourceModel, SIGNAL(modelAboutToBeReset()), this, SLOT(_q_slotModelAboutToBeReset())); connect(sourceModel, SIGNAL(modelAboutToBeReset()), this, SLOT(_q_slotModelAboutToBeReset()));
connect(sourceModel, SIGNAL(modelReset()), this, SLOT(_q_slotModelReset())); connect(sourceModel, SIGNAL(modelReset()), this, SLOT(_q_slotModelReset()));

4
src/corelib/kernel/qobjectcleanuphandler.cpp
View File

@ -60,7 +60,7 @@ QObject *QObjectCleanupHandler::add(QObject *object)
if (!object) if (!object)
return nullptr; return nullptr;
connect(object, SIGNAL(destroyed(QObject *)), this, SLOT(objectDestroyed(QObject *))); connect(object, SIGNAL(destroyed(QObject*)), this, SLOT(objectDestroyed(QObject*)));
cleanupObjects.insert(0, object); cleanupObjects.insert(0, object);
return object; return object;
} }
@ -76,7 +76,7 @@ void QObjectCleanupHandler::remove(QObject *object)
int index; int index;
if ((index = cleanupObjects.indexOf(object)) != -1) { if ((index = cleanupObjects.indexOf(object)) != -1) {
cleanupObjects.removeAt(index); cleanupObjects.removeAt(index);
disconnect(object, SIGNAL(destroyed(QObject *)), this, SLOT(objectDestroyed(QObject *))); disconnect(object, SIGNAL(destroyed(QObject*)), this, SLOT(objectDestroyed(QObject*)));
} }
} }

4
src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp
View File

@ -59,14 +59,14 @@ QNetworkManagerInterface::QNetworkManagerInterface(QObject *parent)
QDBusConnection::systemBus().connect(NM_DBUS_SERVICE ""_L1, NM_DBUS_PATH ""_L1, QDBusConnection::systemBus().connect(NM_DBUS_SERVICE ""_L1, NM_DBUS_PATH ""_L1,
DBUS_PROPERTIES_INTERFACE""_L1, "PropertiesChanged"_L1, this, DBUS_PROPERTIES_INTERFACE""_L1, "PropertiesChanged"_L1, this,
SLOT(setProperties(QString, QMap<QString, QVariant>, QList<QString>))); SLOT(setProperties(QString,QMap<QString,QVariant>,QList<QString>)));
} }
QNetworkManagerInterface::~QNetworkManagerInterface() QNetworkManagerInterface::~QNetworkManagerInterface()
{ {
QDBusConnection::systemBus().disconnect(NM_DBUS_SERVICE ""_L1, NM_DBUS_PATH ""_L1, QDBusConnection::systemBus().disconnect(NM_DBUS_SERVICE ""_L1, NM_DBUS_PATH ""_L1,
DBUS_PROPERTIES_INTERFACE ""_L1, "PropertiesChanged"_L1, this, DBUS_PROPERTIES_INTERFACE ""_L1, "PropertiesChanged"_L1, this,
SLOT(setProperties(QString, QMap<QString, QVariant>, QList<QString>))); SLOT(setProperties(QString,QMap<QString,QVariant>,QList<QString>)));
} }
QNetworkManagerInterface::NMState QNetworkManagerInterface::state() const QNetworkManagerInterface::NMState QNetworkManagerInterface::state() const

8
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -661,8 +661,8 @@ void QAbstractItemView::setModel(QAbstractItemModel *model)
if (d->model && d->model != QAbstractItemModelPrivate::staticEmptyModel()) { if (d->model && d->model != QAbstractItemModelPrivate::staticEmptyModel()) {
disconnect(d->model, SIGNAL(destroyed()), disconnect(d->model, SIGNAL(destroyed()),
this, SLOT(_q_modelDestroyed())); this, SLOT(_q_modelDestroyed()));
disconnect(d->model, SIGNAL(dataChanged(QModelIndex, QModelIndex, QList<int>)), this, disconnect(d->model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)), this,
SLOT(dataChanged(QModelIndex, QModelIndex, QList<int>))); SLOT(dataChanged(QModelIndex,QModelIndex,QList<int>)));
disconnect(d->model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), disconnect(d->model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
this, SLOT(_q_headerDataChanged())); this, SLOT(_q_headerDataChanged()));
disconnect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)), disconnect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
@ -692,8 +692,8 @@ void QAbstractItemView::setModel(QAbstractItemModel *model)
if (d->model != QAbstractItemModelPrivate::staticEmptyModel()) { if (d->model != QAbstractItemModelPrivate::staticEmptyModel()) {
connect(d->model, SIGNAL(destroyed()), connect(d->model, SIGNAL(destroyed()),
this, SLOT(_q_modelDestroyed())); this, SLOT(_q_modelDestroyed()));
connect(d->model, SIGNAL(dataChanged(QModelIndex, QModelIndex, QList<int>)), this, connect(d->model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)), this,
SLOT(dataChanged(QModelIndex, QModelIndex, QList<int>))); SLOT(dataChanged(QModelIndex,QModelIndex,QList<int>)));
connect(d->model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), connect(d->model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
this, SLOT(_q_headerDataChanged())); this, SLOT(_q_headerDataChanged()));
connect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)), connect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),

8
src/widgets/itemviews/qdatawidgetmapper.cpp
View File

@ -315,8 +315,8 @@ void QDataWidgetMapper::setModel(QAbstractItemModel *model)
return; return;
if (d->model) { if (d->model) {
disconnect(d->model, SIGNAL(dataChanged(QModelIndex, QModelIndex, QList<int>)), this, disconnect(d->model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)), this,
SLOT(_q_dataChanged(QModelIndex, QModelIndex, QList<int>))); SLOT(_q_dataChanged(QModelIndex,QModelIndex,QList<int>)));
disconnect(d->model, SIGNAL(destroyed()), this, disconnect(d->model, SIGNAL(destroyed()), this,
SLOT(_q_modelDestroyed())); SLOT(_q_modelDestroyed()));
} }
@ -326,8 +326,8 @@ void QDataWidgetMapper::setModel(QAbstractItemModel *model)
d->model = model; d->model = model;
connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex, QList<int>)), connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)),
SLOT(_q_dataChanged(QModelIndex, QModelIndex, QList<int>))); SLOT(_q_dataChanged(QModelIndex,QModelIndex,QList<int>)));
connect(model, SIGNAL(destroyed()), SLOT(_q_modelDestroyed())); connect(model, SIGNAL(destroyed()), SLOT(_q_modelDestroyed()));
} }