feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Normalized connect()s

Browse Source 
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Robert Loehning
2012-03-05 22:30:59 +01:00
committed by Robert Löhning
parent 9f05e6495d
commit b41171c847
121 changed files with 388 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/debugger/tst_dumpers.cpp
+23 -23
View File
@@ -1974,18 +1974,18 @@ void tst_Dumpers::dumpQObjectSignal()
// Case 3: QAbstractItemModel with connections to itself and to another
// object, using different connection types.
qRegisterMetaType<QModelIndex>("QModelIndex");
connect(&m, SIGNAL(columnsAboutToBeInserted(const QModelIndex &, int, int)),
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
&o, SLOT(deleteLater()), Qt::DirectConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(revert()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsInserted(const QModelIndex &, int, int)),
connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::BlockingQueuedConnection);
connect(&m, SIGNAL(columnsRemoved(const QModelIndex &, int, int)),
connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)),
&m, SLOT(deleteLater()), Qt::AutoConnection);
#if QT_VERSION >= 0x040600
connect(&m, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
connect(&m, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
&m, SLOT(revert()), Qt::UniqueConnection);
#endif
for (int signalIndex = 0; signalIndex < 17; ++signalIndex)
@@ -2059,15 +2059,15 @@ void tst_Dumpers::dumpQObjectSignalList()
// Case 3: QAbstractItemModel with connections to itself and to another
// object, using different connection types.
qRegisterMetaType<QModelIndex>("QModelIndex");
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
&o, SLOT(deleteLater()), Qt::DirectConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(revert()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::BlockingQueuedConnection);
connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)),
&m, SLOT(deleteLater()), Qt::AutoConnection);
testDumper(expected << "1" << "1" << "2" << "1" << "0" << "0",
@@ -2125,18 +2125,18 @@ void tst_Dumpers::dumpQObjectSlot()
// Case 3: QAbstractItemModel with connections to itself and to another
// o, using different connection types.
qRegisterMetaType<QModelIndex>("QModelIndex");
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
&o, SLOT(deleteLater()), Qt::DirectConnection);
connect(&o, SIGNAL(destroyed(QObject *)),
connect(&o, SIGNAL(destroyed(QObject*)),
&m, SLOT(revert()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::BlockingQueuedConnection);
connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)),
&m, SLOT(deleteLater()), Qt::AutoConnection);
#if QT_VERSION >= 0x040600
connect(&m, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
connect(&m, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
&m, SLOT(revert()), Qt::UniqueConnection);
#endif
expected = QByteArray("addr='$A',numchild='1',type='$T',"
@@ -2175,17 +2175,17 @@ void tst_Dumpers::dumpQObjectSlotList()
// Case 3: QAbstractItemModel with connections to itself and to another
// object, using different connection types.
qRegisterMetaType<QModelIndex>("QModelIndex");
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
&o, SLOT(deleteLater()), Qt::DirectConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(revert()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::BlockingQueuedConnection);
connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)),
&m, SLOT(deleteLater()), Qt::AutoConnection);
connect(&o, SIGNAL(destroyed(QObject *)), &m, SLOT(submit()));
connect(&o, SIGNAL(destroyed(QObject*)), &m, SLOT(submit()));
testDumper("numchild='4',value='<4 items>',type='$T',"
"children=[{name='2',value='deleteLater()',numchild='0',"
"addr='$A',type='" NS "QObjectSlot'},"
tests/auto/debugger/tst_gdb.cpp
+25 -25
View File
@@ -389,8 +389,8 @@ GdbWrapper::GdbWrapper(tst_Gdb *test) : m_test(test)
connect(&m_proc, SIGNAL(error(QProcess::ProcessError)),
this, SLOT(handleGdbError(QProcess::ProcessError)));
connect(&m_proc, SIGNAL(finished(int, QProcess::ExitStatus)),
this, SLOT(handleGdbFinished(int, QProcess::ExitStatus)));
connect(&m_proc, SIGNAL(finished(int,QProcess::ExitStatus)),
this, SLOT(handleGdbFinished(int,QProcess::ExitStatus)));
connect(&m_proc, SIGNAL(started()),
this, SLOT(handleGdbStarted()));
connect(&m_proc, SIGNAL(readyReadStandardOutput()),
@@ -2197,18 +2197,18 @@ void tst_Gdb::dump_QObjectSignal()
// Case 3: QAbstractItemModel with connections to itself and to another
// object, using different connection types.
qRegisterMetaType<QModelIndex>("QModelIndex");
connect(&m, SIGNAL(columnsAboutToBeInserted(const QModelIndex &, int, int)),
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
&o, SLOT(deleteLater()), Qt::DirectConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(revert()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsInserted(const QModelIndex &, int, int)),
connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::BlockingQueuedConnection);
connect(&m, SIGNAL(columnsRemoved(const QModelIndex &, int, int)),
connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)),
&m, SLOT(deleteLater()), Qt::AutoConnection);
#if QT_VERSION >= 0x040600
connect(&m, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
connect(&m, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
&m, SLOT(revert()), Qt::UniqueConnection);
#endif
for (int signalIndex = 0; signalIndex < 17; ++signalIndex)
@@ -2273,15 +2273,15 @@ void tst_Gdb::dump_QObjectSignalList()
// Case 3: QAbstractItemModel with connections to itself and to another
// object, using different connection types.
qRegisterMetaType<QModelIndex>("QModelIndex");
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
&o, SLOT(deleteLater()), Qt::DirectConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(revert()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::BlockingQueuedConnection);
connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)),
&m, SLOT(deleteLater()), Qt::AutoConnection);
testDumper(expected << "1" << "1" << "2" << "1" << "0" << "0",
@@ -2339,18 +2339,18 @@ void tst_Gdb::dump_QObjectSlot()
// Case 3: QAbstractItemModel with connections to itself and to another
// o, using different connection types.
qRegisterMetaType<QModelIndex>("QModelIndex");
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
&o, SLOT(deleteLater()), Qt::DirectConnection);
connect(&o, SIGNAL(destroyed(QObject *)),
connect(&o, SIGNAL(destroyed(QObject*)),
&m, SLOT(revert()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::BlockingQueuedConnection);
connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)),
&m, SLOT(deleteLater()), Qt::AutoConnection);
#if QT_VERSION >= 0x040600
connect(&m, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
connect(&m, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
&m, SLOT(revert()), Qt::UniqueConnection);
#endif
expected = QByteArray("addr='$A',numchild='1',type='$T',"
@@ -2389,17 +2389,17 @@ void tst_Gdb::dump_QObjectSlotList()
// Case 3: QAbstractItemModel with connections to itself and to another
// object, using different connection types.
qRegisterMetaType<QModelIndex>("QModelIndex");
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
&o, SLOT(deleteLater()), Qt::DirectConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(revert()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::QueuedConnection);
connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)),
&m, SLOT(submit()), Qt::BlockingQueuedConnection);
connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)),
connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)),
&m, SLOT(deleteLater()), Qt::AutoConnection);
connect(&o, SIGNAL(destroyed(QObject *)), &m, SLOT(submit()));
connect(&o, SIGNAL(destroyed(QObject*)), &m, SLOT(submit()));
testDumper("numchild='4',value='<4 items>',type='$T',"
"children=[{name='2',value='deleteLater()',numchild='0',"
"addr='$A',type='" NS "QObjectSlot'},"