summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@digia.com>2012-11-19 09:58:24 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-23 10:08:10 +0100
commit603414525dff5cefa0798de1087f1ea1ff92910b (patch)
tree3b931c0ed1fb19e17deae44f9138cef7b3a364df /src/corelib/kernel
parenta0af81c086459d1dce025d2e6f7516e88ee81463 (diff)
Revise QObject::connect documentation.
Change-Id: I07d593b6b2c3d5c8843212d5a888525ac29ca1b0 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qobject.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 268677ee1b..0d97266f4f 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2381,15 +2381,16 @@ static inline void check_and_warn_compat(const QMetaObject *sender, const QMetaM
can be connected to one slot.
If a signal is connected to several slots, the slots are activated
- in the same order as the order the connection was made, when the
+ in the same order in which the connections were made, when the
signal is emitted.
- The function returns a handle to a connection if it successfully
- connects the signal to the slot. The Connection handle will be invalid
+ The function returns a QMetaObject::Connection that represents
+ a handle to a connection if it successfully
+ connects the signal to the slot. The connection handle will be invalid
if it cannot create the connection, for example, if QObject is unable
to verify the existence of either \a signal or \a method, or if their
signatures aren't compatible.
- You can check if the QMetaObject::Connection is valid by casting it to a bool.
+ You can check if the handle is valid by casting it to a bool.
By default, a signal is emitted for every connection you make;
two signals are emitted for duplicate connections. You can break