diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-08-31 23:48:30 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-03 11:05:49 +0200 |
| commit | 8cba00ebf55090d717e41c14f5f1044faac578a7 (patch) | |
| tree | 5644c4a5add623fb00be1b1d9f16c281755ce3e1 /src/gui/kernel/qinputmethod.h | |
| parent | a36efc37a1941a4b4cb239fa2ca0bc12ab7569ec (diff) | |
| download | qtbase-8cba00ebf55090d717e41c14f5f1044faac578a7.tar.gz | |
Private slots should be named starting with _q_
This is to reduce the risk of collisions with signals/slots in user classes
q_updateFocusObject(QObject *object) => _q_updateFocusObject(QObject *object)
q_checkFocusObject(QObject *object) => _q_checkFocusObject(QObject *object)
q_connectFocusObject() => _q_connectFocusObject()
emitActivated(QPlatformSystemTrayIcon::ActivationReason) => _q_emitActivated(QPlatformSystemTrayIcon::ActivationReason)
Change-Id: I148913f1e24a80fe5cacfd737d1b455b805cfced
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/gui/kernel/qinputmethod.h')
| -rw-r--r-- | src/gui/kernel/qinputmethod.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qinputmethod.h b/src/gui/kernel/qinputmethod.h index 095c17ffd8..4b21e4ac15 100644 --- a/src/gui/kernel/qinputmethod.h +++ b/src/gui/kernel/qinputmethod.h @@ -129,8 +129,9 @@ private: QInputMethod(); ~QInputMethod(); - Q_PRIVATE_SLOT(d_func(), void q_connectFocusObject()) - Q_PRIVATE_SLOT(d_func(), void q_checkFocusObject(QObject* object)) + Q_PRIVATE_SLOT(d_func(), void _q_connectFocusObject()) + Q_PRIVATE_SLOT(d_func(), void _q_checkFocusObject(QObject* object)) + }; QT_END_NAMESPACE |