diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2012-09-13 19:23:10 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-26 10:08:59 +0200 |
commit | 8b032fe423e854428c1c8324dcd0f8c6150b3503 (patch) | |
tree | f70493194703d129cdfa1f49adac9a5e5ec04c0e /src/corelib/statemachine/qsignaltransition.cpp | |
parent | f052ee467d257eb289b560c1420c59e6c558ba91 (diff) |
Make QSignalTransition take a pointer-to-const QObject
The obvious idea is that a connect() happens behind the scenes.
As QObject::connect takes a pointer-to-const, QSignalTransition should
do that as well.
TODO: the API becomes asymmetric in that it takes
a "const QObject *" but returns a "QObject *". Reasoning is needed.
Change-Id: I18d0436e7036eee851fd36d5b8ccda4a4757938f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/corelib/statemachine/qsignaltransition.cpp')
-rw-r--r-- | src/corelib/statemachine/qsignaltransition.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp index d64a91a435..73b6aa1ef9 100644 --- a/src/corelib/statemachine/qsignaltransition.cpp +++ b/src/corelib/statemachine/qsignaltransition.cpp @@ -148,7 +148,7 @@ QSignalTransition::QSignalTransition(QState *sourceState) Constructs a new signal transition associated with the given \a signal of the given \a sender, and with the given \a sourceState. */ -QSignalTransition::QSignalTransition(QObject *sender, const char *signal, +QSignalTransition::QSignalTransition(const QObject *sender, const char *signal, QState *sourceState) : QAbstractTransition(*new QSignalTransitionPrivate, sourceState) { @@ -171,13 +171,13 @@ QSignalTransition::~QSignalTransition() QObject *QSignalTransition::senderObject() const { Q_D(const QSignalTransition); - return d->sender; + return const_cast<QObject *>(d->sender); } /*! Sets the \a sender object associated with this signal transition. */ -void QSignalTransition::setSenderObject(QObject *sender) +void QSignalTransition::setSenderObject(const QObject *sender) { Q_D(QSignalTransition); if (sender == d->sender) |