diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-10-18 14:29:06 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-25 15:56:14 +0200 |
commit | dee57bc91080740201a0bf0b8c42eb374ee696f3 (patch) | |
tree | edc27d73f41475ccb7c3e83c671f361f79693eeb /src/corelib/kernel/qtimer.cpp | |
parent | 611c0081ff265354405882b40b323d7cb20ca967 (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 'src/corelib/kernel/qtimer.cpp')
-rw-r--r-- | src/corelib/kernel/qtimer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index a685973bd7..9dea666363 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -247,7 +247,7 @@ void QTimer::timerEvent(QTimerEvent *e) if (e->timerId() == id) { if (single) stop(); - emit timeout(); + emit timeout(QPrivateSignal()); } } |