From 1ab5f763f0006675e412f30b7af2986a0d1ab8c5 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Thu, 18 Jun 2015 12:31:09 +0200 Subject: StateMachine: Move Q...Private::get to _p.h file. Micro optimization, because it's called a lot. Change-Id: I50f775b39393f1f450e09ae9dc59a77d584f3c10 Reviewed-by: Simon Hausmann --- src/corelib/statemachine/qabstractstate.cpp | 10 ---------- src/corelib/statemachine/qabstractstate_p.h | 6 ++++-- src/corelib/statemachine/qabstracttransition.cpp | 5 ----- src/corelib/statemachine/qabstracttransition_p.h | 3 ++- src/corelib/statemachine/qeventtransition.cpp | 5 ----- src/corelib/statemachine/qeventtransition_p.h | 3 ++- src/corelib/statemachine/qhistorystate.cpp | 5 ----- src/corelib/statemachine/qhistorystate_p.h | 3 ++- src/corelib/statemachine/qsignaltransition.cpp | 5 ----- src/corelib/statemachine/qsignaltransition_p.h | 3 ++- src/corelib/statemachine/qstatemachine.cpp | 7 ------- src/corelib/statemachine/qstatemachine_p.h | 3 ++- 12 files changed, 14 insertions(+), 44 deletions(-) (limited to 'src') diff --git a/src/corelib/statemachine/qabstractstate.cpp b/src/corelib/statemachine/qabstractstate.cpp index 543edb2f98..ba904648d8 100644 --- a/src/corelib/statemachine/qabstractstate.cpp +++ b/src/corelib/statemachine/qabstractstate.cpp @@ -85,16 +85,6 @@ QAbstractStatePrivate::QAbstractStatePrivate(StateType type) { } -QAbstractStatePrivate *QAbstractStatePrivate::get(QAbstractState *q) -{ - return q->d_func(); -} - -const QAbstractStatePrivate *QAbstractStatePrivate::get(const QAbstractState *q) -{ - return q->d_func(); -} - QStateMachine *QAbstractStatePrivate::machine() const { QObject *par = parent; diff --git a/src/corelib/statemachine/qabstractstate_p.h b/src/corelib/statemachine/qabstractstate_p.h index 087e355b71..660371b80c 100644 --- a/src/corelib/statemachine/qabstractstate_p.h +++ b/src/corelib/statemachine/qabstractstate_p.h @@ -66,8 +66,10 @@ public: QAbstractStatePrivate(StateType type); - static QAbstractStatePrivate *get(QAbstractState *q); - static const QAbstractStatePrivate *get(const QAbstractState *q); + static QAbstractStatePrivate *get(QAbstractState *q) + { return q->d_func(); } + static const QAbstractStatePrivate *get(const QAbstractState *q) + { return q->d_func(); } QStateMachine *machine() const; diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp index 7f04160a8f..92a5d373fe 100644 --- a/src/corelib/statemachine/qabstracttransition.cpp +++ b/src/corelib/statemachine/qabstracttransition.cpp @@ -133,11 +133,6 @@ QAbstractTransitionPrivate::QAbstractTransitionPrivate() { } -QAbstractTransitionPrivate *QAbstractTransitionPrivate::get(QAbstractTransition *q) -{ - return q->d_func(); -} - QStateMachine *QAbstractTransitionPrivate::machine() const { QState *source = sourceState(); diff --git a/src/corelib/statemachine/qabstracttransition_p.h b/src/corelib/statemachine/qabstracttransition_p.h index 1a28e5a73e..ed726fa6ef 100644 --- a/src/corelib/statemachine/qabstracttransition_p.h +++ b/src/corelib/statemachine/qabstracttransition_p.h @@ -65,7 +65,8 @@ class Q_CORE_EXPORT QAbstractTransitionPrivate public: QAbstractTransitionPrivate(); - static QAbstractTransitionPrivate *get(QAbstractTransition *q); + static QAbstractTransitionPrivate *get(QAbstractTransition *q) + { return q->d_func(); } bool callEventTest(QEvent *e); virtual void callOnTransition(QEvent *e); diff --git a/src/corelib/statemachine/qeventtransition.cpp b/src/corelib/statemachine/qeventtransition.cpp index c10127fa68..de6858ae42 100644 --- a/src/corelib/statemachine/qeventtransition.cpp +++ b/src/corelib/statemachine/qeventtransition.cpp @@ -106,11 +106,6 @@ QEventTransitionPrivate::~QEventTransitionPrivate() { } -QEventTransitionPrivate *QEventTransitionPrivate::get(QEventTransition *q) -{ - return q->d_func(); -} - void QEventTransitionPrivate::unregister() { Q_Q(QEventTransition); diff --git a/src/corelib/statemachine/qeventtransition_p.h b/src/corelib/statemachine/qeventtransition_p.h index 3e430d86a9..3f6c9475ea 100644 --- a/src/corelib/statemachine/qeventtransition_p.h +++ b/src/corelib/statemachine/qeventtransition_p.h @@ -57,7 +57,8 @@ public: QEventTransitionPrivate(); ~QEventTransitionPrivate(); - static QEventTransitionPrivate *get(QEventTransition *q); + static QEventTransitionPrivate *get(QEventTransition *q) + { return q->d_func(); } void unregister(); void maybeRegister(); diff --git a/src/corelib/statemachine/qhistorystate.cpp b/src/corelib/statemachine/qhistorystate.cpp index e58b0c16fc..b6384a159a 100644 --- a/src/corelib/statemachine/qhistorystate.cpp +++ b/src/corelib/statemachine/qhistorystate.cpp @@ -118,11 +118,6 @@ QHistoryStatePrivate::QHistoryStatePrivate() { } -QHistoryStatePrivate *QHistoryStatePrivate::get(QHistoryState *q) -{ - return q->d_func(); -} - /*! Constructs a new shallow history state with the given \a parent state. */ diff --git a/src/corelib/statemachine/qhistorystate_p.h b/src/corelib/statemachine/qhistorystate_p.h index b5c353fdff..57149e3f86 100644 --- a/src/corelib/statemachine/qhistorystate_p.h +++ b/src/corelib/statemachine/qhistorystate_p.h @@ -59,7 +59,8 @@ class QHistoryStatePrivate : public QAbstractStatePrivate public: QHistoryStatePrivate(); - static QHistoryStatePrivate *get(QHistoryState *q); + static QHistoryStatePrivate *get(QHistoryState *q) + { return q->d_func(); } QAbstractState *defaultState; QHistoryState::HistoryType historyType; diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp index 41005fca41..7ec72df77c 100644 --- a/src/corelib/statemachine/qsignaltransition.cpp +++ b/src/corelib/statemachine/qsignaltransition.cpp @@ -108,11 +108,6 @@ QSignalTransitionPrivate::QSignalTransitionPrivate() signalIndex = -1; } -QSignalTransitionPrivate *QSignalTransitionPrivate::get(QSignalTransition *q) -{ - return q->d_func(); -} - void QSignalTransitionPrivate::unregister() { Q_Q(QSignalTransition); diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h index bed0abd9ff..0bf4b1540b 100644 --- a/src/corelib/statemachine/qsignaltransition_p.h +++ b/src/corelib/statemachine/qsignaltransition_p.h @@ -56,7 +56,8 @@ class QSignalTransitionPrivate : public QAbstractTransitionPrivate public: QSignalTransitionPrivate(); - static QSignalTransitionPrivate *get(QSignalTransition *q); + static QSignalTransitionPrivate *get(QSignalTransition *q) + { return q->d_func(); } void unregister(); void maybeRegister(); diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 3e513459ff..c93eb54128 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -406,13 +406,6 @@ QStateMachinePrivate::~QStateMachinePrivate() qDeleteAll(externalEventQueue); } -QStateMachinePrivate *QStateMachinePrivate::get(QStateMachine *q) -{ - if (q) - return q->d_func(); - return 0; -} - QState *QStateMachinePrivate::rootState() const { return const_cast(q_func()); diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index 426f2732df..66b615bb31 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -99,7 +99,8 @@ public: QStateMachinePrivate(); ~QStateMachinePrivate(); - static QStateMachinePrivate *get(QStateMachine *q); + static QStateMachinePrivate *get(QStateMachine *q) + { return q ? q->d_func() : 0; } QState *findLCA(const QList &states, bool onlyCompound = false) const; QState *findLCCA(const QList &states) const; -- cgit v1.2.3