summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/kernel/qmetamethod
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-10-18 14:29:06 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-25 15:56:14 +0200
commitdee57bc91080740201a0bf0b8c42eb374ee696f3 (patch)
treeedc27d73f41475ccb7c3e83c671f361f79693eeb /tests/auto/corelib/kernel/qmetamethod
parent611c0081ff265354405882b40b323d7cb20ca967 (diff)
Core/kernel: Make some signals private.
There are more opportunities in QtCore and the rest of Qt to make signals private instead of public. This is a test-dart to see if there is any reason not to do this. It would be nice to make QObject::destroyed private, but as it has a default argument it would be source incompatible to anyone connecting to the SIGNAL(destroyed()) instead of SIGNAL(destroyed(QObject*)). Currently the function-pointer-based connect syntax does not accept a functor (or lambda) with a different number of arguments than the signal. Olivier says a fix for that might come in 5.1, but for now the qfiledialog2 test is changed to not use that anymore. Also, the function pointer for a private signal can not be assigned to a local variable, so the qmetamethod test is changed to not do so anymore. Change-Id: Iaf776b822f9ba364f2c184df0c6b23811da56e44 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qmetamethod')
-rw-r--r--tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
index 1ef2cf8e3f..526a5039b0 100644
--- a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
+++ b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
@@ -714,9 +714,8 @@ void tst_QMetaMethod::comparisonOperators()
void tst_QMetaMethod::fromSignal()
{
#define FROMSIGNAL_HELPER(ObjectType, Name, Arguments) { \
- void (ObjectType::*signal)Arguments = &ObjectType::Name; \
const QMetaObject *signalMeta = &ObjectType::staticMetaObject; \
- QCOMPARE(QMetaMethod::fromSignal(signal), \
+ QCOMPARE(QMetaMethod::fromSignal(&ObjectType::Name), \
signalMeta->method(signalMeta->indexOfSignal(QMetaObject::normalizedSignature(#Name #Arguments)))); \
}