AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Private slots should be named starting with _q_

Browse Source 
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>
This commit is contained in:
Sergio Ahumada 2012-08-31 23:48:30 +02:00 committed by Qt by Nokia
parent a36efc37a1
commit 8cba00ebf5
9 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/kernel/qguiapplication.cpp
View File

@ -1410,7 +1410,7 @@ void QGuiApplicationPrivate::processActivatedEvent(QWindowSystemInterfacePrivate
QFocusEvent focusOut(QEvent::FocusOut); QFocusEvent focusOut(QEvent::FocusOut);
QCoreApplication::sendSpontaneousEvent(previous, &focusOut); QCoreApplication::sendSpontaneousEvent(previous, &focusOut);
QObject::disconnect(previous, SIGNAL(focusObjectChanged(QObject*)), QObject::disconnect(previous, SIGNAL(focusObjectChanged(QObject*)),
qApp, SLOT(q_updateFocusObject(QObject*))); qApp, SLOT(_q_updateFocusObject(QObject*)));
} else { } else {
QEvent appActivate(QEvent::ApplicationActivate); QEvent appActivate(QEvent::ApplicationActivate);
qApp->sendSpontaneousEvent(qApp, &appActivate); qApp->sendSpontaneousEvent(qApp, &appActivate);
@ -1420,7 +1420,7 @@ void QGuiApplicationPrivate::processActivatedEvent(QWindowSystemInterfacePrivate
QFocusEvent focusIn(QEvent::FocusIn); QFocusEvent focusIn(QEvent::FocusIn);
QCoreApplication::sendSpontaneousEvent(QGuiApplicationPrivate::focus_window, &focusIn); QCoreApplication::sendSpontaneousEvent(QGuiApplicationPrivate::focus_window, &focusIn);
QObject::connect(QGuiApplicationPrivate::focus_window, SIGNAL(focusObjectChanged(QObject*)), QObject::connect(QGuiApplicationPrivate::focus_window, SIGNAL(focusObjectChanged(QObject*)),
qApp, SLOT(q_updateFocusObject(QObject*))); qApp, SLOT(_q_updateFocusObject(QObject*)));
} else { } else {
QEvent appActivate(QEvent::ApplicationDeactivate); QEvent appActivate(QEvent::ApplicationDeactivate);
qApp->sendSpontaneousEvent(qApp, &appActivate); qApp->sendSpontaneousEvent(qApp, &appActivate);
@ -1430,7 +1430,7 @@ void QGuiApplicationPrivate::processActivatedEvent(QWindowSystemInterfacePrivate
self->notifyActiveWindowChange(previous); self->notifyActiveWindowChange(previous);
if (previousFocusObject != qApp->focusObject()) if (previousFocusObject != qApp->focusObject())
self->q_updateFocusObject(qApp->focusObject()); self->_q_updateFocusObject(qApp->focusObject());
} }
emit qApp->focusWindowChanged(newFocus); emit qApp->focusWindowChanged(newFocus);
@ -2543,7 +2543,7 @@ const QDrawHelperGammaTables *QGuiApplicationPrivate::gammaTables()
return result; return result;
} }
void QGuiApplicationPrivate::q_updateFocusObject(QObject *object) void QGuiApplicationPrivate::_q_updateFocusObject(QObject *object)
{ {
Q_Q(QGuiApplication); Q_Q(QGuiApplication);

2
src/gui/kernel/qguiapplication.h
View File

@ -158,7 +158,7 @@ private:
Q_DISABLE_COPY(QGuiApplication) Q_DISABLE_COPY(QGuiApplication)
Q_DECLARE_PRIVATE(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 #ifndef QT_NO_GESTURES
friend class QGestureManager; friend class QGestureManager;

2
src/gui/kernel/qguiapplication_p.h
View File

@ -162,7 +162,7 @@ public:
QPixmap getPixmapCursor(Qt::CursorShape cshape); QPixmap getPixmapCursor(Qt::CursorShape cshape);
void q_updateFocusObject(QObject *object); void _q_updateFocusObject(QObject *object);
static QGuiApplicationPrivate *instance() { return self; } static QGuiApplicationPrivate *instance() { return self; }

10
src/gui/kernel/qinputmethod.cpp
View File

@ -54,7 +54,7 @@ QInputMethod::QInputMethod()
: QObject(*new QInputMethodPrivate) : QObject(*new QInputMethodPrivate)
{ {
// might be instantiated before QGuiApplication is fully done, need to connect later // 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 // temporary handlers for updating focus item based on application focus
void QInputMethodPrivate::q_connectFocusObject() void QInputMethodPrivate::_q_connectFocusObject()
{ {
Q_Q(QInputMethod); Q_Q(QInputMethod);
QObject::connect(qApp, SIGNAL(focusObjectChanged(QObject*)), QObject::connect(qApp, SIGNAL(focusObjectChanged(QObject*)),
q, SLOT(q_checkFocusObject(QObject*))); q, SLOT(_q_checkFocusObject(QObject*)));
q_checkFocusObject(qApp->focusObject()); _q_checkFocusObject(qApp->focusObject());
} }
void QInputMethodPrivate::q_checkFocusObject(QObject *object) void QInputMethodPrivate::_q_checkFocusObject(QObject *object)
{ {
bool enabled = objectAcceptsInputMethod(object); bool enabled = objectAcceptsInputMethod(object);
setInputItem(enabled ? object : 0); setInputItem(enabled ? object : 0);

5
src/gui/kernel/qinputmethod.h
View File

@ -129,8 +129,9 @@ private:
QInputMethod(); QInputMethod();
~QInputMethod(); ~QInputMethod();
Q_PRIVATE_SLOT(d_func(), void q_connectFocusObject()) 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_checkFocusObject(QObject* object))
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

4
src/gui/kernel/qinputmethod_p.h
View File

@ -80,8 +80,8 @@ public:
emit q->inputItemChanged(); emit q->inputItemChanged();
} }
void q_connectFocusObject(); void _q_connectFocusObject();
void q_checkFocusObject(QObject *object); void _q_checkFocusObject(QObject *object);
bool objectAcceptsInputMethod(QObject *object); bool objectAcceptsInputMethod(QObject *object);
QTransform inputItemTransform; QTransform inputItemTransform;

2
src/widgets/util/qsystemtrayicon.cpp
View File

@ -391,7 +391,7 @@ void QSystemTrayIcon::showMessage(const QString& title, const QString& msg,
d->showMessage_sys(title, msg, icon, msecs); d->showMessage_sys(title, msg, icon, msecs);
} }
void QSystemTrayIconPrivate::emitActivated(QPlatformSystemTrayIcon::ActivationReason reason) void QSystemTrayIconPrivate::_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason reason)
{ {
Q_Q(QSystemTrayIcon); Q_Q(QSystemTrayIcon);
emit q->activated(static_cast<QSystemTrayIcon::ActivationReason>(reason)); emit q->activated(static_cast<QSystemTrayIcon::ActivationReason>(reason));

2
src/widgets/util/qsystemtrayicon.h
View File

@ -118,7 +118,7 @@ private:
Q_DISABLE_COPY(QSystemTrayIcon) Q_DISABLE_COPY(QSystemTrayIcon)
Q_DECLARE_PRIVATE(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 QSystemTrayIconSys;
friend class QBalloonTip; friend class QBalloonTip;

2
src/widgets/util/qsystemtrayicon_p.h
View File

@ -90,7 +90,7 @@ public:
static bool isSystemTrayAvailable_sys(); static bool isSystemTrayAvailable_sys();
static bool supportsMessages_sys(); static bool supportsMessages_sys();
void emitActivated(QPlatformSystemTrayIcon::ActivationReason reason); void _q_emitActivated(QPlatformSystemTrayIcon::ActivationReason reason);
QPointer<QMenu> menu; QPointer<QMenu> menu;
QIcon icon; QIcon icon;