summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qguiapplication.h
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-08-31 23:48:30 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-03 11:05:49 +0200
commit8cba00ebf55090d717e41c14f5f1044faac578a7 (patch)
tree5644c4a5add623fb00be1b1d9f16c281755ce3e1 /src/gui/kernel/qguiapplication.h
parenta36efc37a1941a4b4cb239fa2ca0bc12ab7569ec (diff)
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/qguiapplication.h')
-rw-r--r--src/gui/kernel/qguiapplication.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index 9d90cde993..1c0ce17f3f 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -158,7 +158,7 @@ private:
Q_DISABLE_COPY(QGuiApplication)
Q_DECLARE_PRIVATE(QGuiApplication)
- Q_PRIVATE_SLOT(d_func(), void q_updateFocusObject(QObject *object))
+ Q_PRIVATE_SLOT(d_func(), void _q_updateFocusObject(QObject *object))
#ifndef QT_NO_GESTURES
friend class QGestureManager;