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/widgets | |
| parent | a36efc37a1941a4b4cb239fa2ca0bc12ab7569ec (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/widgets')
| -rw-r--r-- | src/widgets/util/qsystemtrayicon.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/util/qsystemtrayicon.h | 2 | ||||
| -rw-r--r-- | src/widgets/util/qsystemtrayicon_p.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp index 343a3c115b..9e667b1781 100644 --- a/src/widgets/util/qsystemtrayicon.cpp +++ b/src/widgets/util/qsystemtrayicon.cpp @@ -391,7 +391,7 @@ void QSystemTrayIcon::showMessage(const QString& title, const QString& msg, d->showMessage_sys(title, msg, icon, msecs); } -void QSystemTrayIconPrivate::emitActivated(QPlatformSystemTrayIcon::ActivationReason reason) +void QSystemTrayIconPrivate::_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason reason) { Q_Q(QSystemTrayIcon); emit q->activated(static_cast<QSystemTrayIcon::ActivationReason>(reason)); diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index ee640b2f78..870081ef3e 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -118,7 +118,7 @@ private: Q_DISABLE_COPY(QSystemTrayIcon) Q_DECLARE_PRIVATE(QSystemTrayIcon) - Q_PRIVATE_SLOT(d_func(), void emitActivated(QPlatformSystemTrayIcon::ActivationReason)) + Q_PRIVATE_SLOT(d_func(), void _q_emitActivated(QPlatformSystemTrayIcon::ActivationReason)) friend class QSystemTrayIconSys; friend class QBalloonTip; diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h index 3ab2ebc100..6650b4ce6b 100644 --- a/src/widgets/util/qsystemtrayicon_p.h +++ b/src/widgets/util/qsystemtrayicon_p.h @@ -90,7 +90,7 @@ public: static bool isSystemTrayAvailable_sys(); static bool supportsMessages_sys(); - void emitActivated(QPlatformSystemTrayIcon::ActivationReason reason); + void _q_emitActivated(QPlatformSystemTrayIcon::ActivationReason reason); QPointer<QMenu> menu; QIcon icon; |