diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-08-23 15:23:26 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-08-31 09:30:11 +0000 |
| commit | 4cb940c170a5df68893e333b70212a6073ee6294 (patch) | |
| tree | 6c503eb3bbcae4223b50d127ac186baaa2d2a680 /src/animation | |
| parent | c64f167fbaa1e2613d9533c8ab596120458c85fb (diff) | |
Alter QChannelMapping to accept QAbstractChannelMapping pointers
In preparation for the new mapping subclasses.
Change-Id: I3d659b350da72cca9f5ad195f7aa7fea3d943810
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/frontend/qchannelmapper.cpp | 6 | ||||
| -rw-r--r-- | src/animation/frontend/qchannelmapper.h | 8 | ||||
| -rw-r--r-- | src/animation/frontend/qchannelmapper_p.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/animation/frontend/qchannelmapper.cpp b/src/animation/frontend/qchannelmapper.cpp index ef7353e9b..da0408c3a 100644 --- a/src/animation/frontend/qchannelmapper.cpp +++ b/src/animation/frontend/qchannelmapper.cpp @@ -70,7 +70,7 @@ QChannelMapper::~QChannelMapper() { } -void QChannelMapper::addMapping(QChannelMapping *mapping) +void QChannelMapper::addMapping(QAbstractChannelMapping *mapping) { Q_ASSERT(mapping); Q_D(QChannelMapper); @@ -95,7 +95,7 @@ void QChannelMapper::addMapping(QChannelMapping *mapping) } } -void QChannelMapper::removeMapping(QChannelMapping *mapping) +void QChannelMapper::removeMapping(QAbstractChannelMapping *mapping) { Q_ASSERT(mapping); Q_D(QChannelMapper); @@ -109,7 +109,7 @@ void QChannelMapper::removeMapping(QChannelMapping *mapping) d->unregisterDestructionHelper(mapping); } -QVector<QChannelMapping *> QChannelMapper::mappings() const +QVector<QAbstractChannelMapping *> QChannelMapper::mappings() const { Q_D(const QChannelMapper); return d->m_mappings; diff --git a/src/animation/frontend/qchannelmapper.h b/src/animation/frontend/qchannelmapper.h index 14319f29b..fce59f6ab 100644 --- a/src/animation/frontend/qchannelmapper.h +++ b/src/animation/frontend/qchannelmapper.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { class QChannelMapperPrivate; -class QChannelMapping; +class QAbstractChannelMapping; class QT3DANIMATIONSHARED_EXPORT QChannelMapper : public Qt3DCore::QNode { @@ -55,9 +55,9 @@ public: explicit QChannelMapper(Qt3DCore::QNode *parent = nullptr); ~QChannelMapper(); - void addMapping(QChannelMapping *mapping); - void removeMapping(QChannelMapping *mapping); - QVector<QChannelMapping *> mappings() const; + void addMapping(QAbstractChannelMapping *mapping); + void removeMapping(QAbstractChannelMapping *mapping); + QVector<QAbstractChannelMapping *> mappings() const; protected: explicit QChannelMapper(QChannelMapperPrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/animation/frontend/qchannelmapper_p.h b/src/animation/frontend/qchannelmapper_p.h index d05ea3277..45f8b0422 100644 --- a/src/animation/frontend/qchannelmapper_p.h +++ b/src/animation/frontend/qchannelmapper_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { -class QChannelMapping; +class QAbstractChannelMapping; class QChannelMapperPrivate : public Qt3DCore::QNodePrivate { @@ -63,7 +63,7 @@ public: Q_DECLARE_PUBLIC(QChannelMapper) - QVector<QChannelMapping *> m_mappings; + QVector<QAbstractChannelMapping *> m_mappings; }; struct QChannelMapperData |