diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-27 16:52:53 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-03 12:25:29 +0000 |
| commit | 6e6f29ab6f31822481031aead52f189351b0317f (patch) | |
| tree | 8e8f5532e7aad112462842f2c9a512371a2c11a9 | |
| parent | a8562dd604074c98c473f1cf0d496aebd2cc0d37 (diff) | |
Revert "QVector<T>::const_iterator isn't always a const T*"
This reverts commit 1286bd5bf4348b52ec431be0c37197da9506df6e.
Reason for revert: this change was binary-incompatible.
Change-Id: Ic39284d5f8282ad4b175063220696ab60031c732
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/animation/frontend/qanimationclipdata.h | 3 | ||||
| -rw-r--r-- | src/animation/frontend/qchannel.h | 3 | ||||
| -rw-r--r-- | src/animation/frontend/qchannelcomponent.h | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/animation/frontend/qanimationclipdata.h b/src/animation/frontend/qanimationclipdata.h index 95804447d..11798b373 100644 --- a/src/animation/frontend/qanimationclipdata.h +++ b/src/animation/frontend/qanimationclipdata.h @@ -43,7 +43,6 @@ #include <QtCore/qmetatype.h> #include <QtCore/qscopedpointer.h> #include <QtCore/qstring.h> -#include <QtCore/qvector.h> #include <Qt3DAnimation/qt3danimation_global.h> #include <Qt3DAnimation/qchannel.h> @@ -77,7 +76,7 @@ public: bool isValid() const noexcept; // Iterator API - typedef QVector<QChannel>::const_iterator const_iterator; + typedef const QChannel *const_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator; const_iterator begin() const noexcept; diff --git a/src/animation/frontend/qchannel.h b/src/animation/frontend/qchannel.h index b551a1483..463cb21e2 100644 --- a/src/animation/frontend/qchannel.h +++ b/src/animation/frontend/qchannel.h @@ -42,7 +42,6 @@ #include <QtCore/qscopedpointer.h> #include <QtCore/qstring.h> -#include <QtCore/qvector.h> #include <Qt3DAnimation/qt3danimation_global.h> #include <Qt3DAnimation/qchannelcomponent.h> @@ -74,7 +73,7 @@ public: void clearChannelComponents(); // Iterator API - typedef QVector<QChannelComponent>::const_iterator const_iterator; + typedef const QChannelComponent *const_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator; const_iterator begin() const noexcept; diff --git a/src/animation/frontend/qchannelcomponent.h b/src/animation/frontend/qchannelcomponent.h index 21961c14f..fe9e73ed1 100644 --- a/src/animation/frontend/qchannelcomponent.h +++ b/src/animation/frontend/qchannelcomponent.h @@ -42,7 +42,6 @@ #include <QtCore/qscopedpointer.h> #include <QtCore/qstring.h> -#include <QtCore/qvector.h> #include <Qt3DAnimation/qt3danimation_global.h> #include <Qt3DAnimation/qkeyframe.h> @@ -71,7 +70,7 @@ public: void clearKeyFrames(); // Iterator API - typedef QVector<QKeyFrame>::const_iterator const_iterator; + typedef const QKeyFrame *const_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator; const_iterator begin() const noexcept; |