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>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/kernel/qinputmethod.cpp b/src/gui/kernel/qinputmethod.cpp
index c8d143c70c..ec2c3ed48c 100644
--- a/src/gui/kernel/qinputmethod.cpp
+++ b/src/gui/kernel/qinputmethod.cpp
@@ -54,7 +54,7 @@ QInputMethod::QInputMethod()
     : QObject(*new QInputMethodPrivate)
 {
     // might be instantiated before QGuiApplication is fully done, need to connect later
-    QTimer::singleShot(0, this, SLOT(q_connectFocusObject()));
+    QTimer::singleShot(0, this, SLOT(_q_connectFocusObject()));
 }
 
 /*!
@@ -358,15 +358,15 @@ void QInputMethod::invokeAction(Action a, int cursorPosition)
 }
 
 // temporary handlers for updating focus item based on application focus
-void QInputMethodPrivate::q_connectFocusObject()
+void QInputMethodPrivate::_q_connectFocusObject()
 {
     Q_Q(QInputMethod);
     QObject::connect(qApp, SIGNAL(focusObjectChanged(QObject*)),
-                     q, SLOT(q_checkFocusObject(QObject*)));
-    q_checkFocusObject(qApp->focusObject());
+                     q, SLOT(_q_checkFocusObject(QObject*)));
+    _q_checkFocusObject(qApp->focusObject());
 }
 
-void QInputMethodPrivate::q_checkFocusObject(QObject *object)
+void QInputMethodPrivate::_q_checkFocusObject(QObject *object)
 {
     bool enabled = objectAcceptsInputMethod(object);
     setInputItem(enabled ? object : 0);