diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-09-22 15:10:53 -0700 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-16 18:33:48 +0000 |
| commit | e9a7825cf7e5f479f7a04a5800edb752132b1070 (patch) | |
| tree | 70a68c6e55b3cf40b2521a4c9b0b7b5b28713f14 /src/corelib/tools/qversionnumber.cpp | |
| parent | 4e8adb4b7bfcd9892aaea0a7451d0c241be861d6 (diff) | |
Remove the ref-qualified versions of segments and normalized
They can't be ref-qualified if the QVersionNumber object doesn't actually
hold a QVector<int>, as the next commit will make it: for segments(),
there might not be a QVector to be moved; for normalized(), the common
case will be that there's no gain in ref-qualifying.
Change-Id: I4bfb8b8765a502c0de6aed693752217106e575a2
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/tools/qversionnumber.cpp')
| -rw-r--r-- | src/corelib/tools/qversionnumber.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp index 7e87d3e1d3..4bc94c25be 100644 --- a/src/corelib/tools/qversionnumber.cpp +++ b/src/corelib/tools/qversionnumber.cpp @@ -167,6 +167,14 @@ QT_BEGIN_NAMESPACE \sa majorVersion(), minorVersion(), microVersion() */ +QVector<int> QVersionNumber::segments() const +{ + QVector<int> result; + result.resize(segmentCount()); + for (int i = 0; i < segmentCount(); ++i) + result[i] = segmentAt(i); + return result; +} /*! \fn int QVersionNumber::segmentAt(int index) const @@ -195,6 +203,13 @@ QT_BEGIN_NAMESPACE \snippet qversionnumber/main.cpp 4 */ +QVersionNumber QVersionNumber::normalized() const +{ + QVector<int> segs = m_segments; + while (segs.size() && segs.last() == 0) + segs.pop_back(); + return QVersionNumber(qMove(segs)); +} /*! \fn bool QVersionNumber::isPrefixOf(const QVersionNumber &other) const @@ -404,21 +419,6 @@ QVersionNumber QVersionNumber::fromString(const QString &string, int *suffixInde return QVersionNumber(qMove(seg)); } -/*! - \fn QVersionNumber QVersionNumber::normalizedImpl(QVector<int> &segs) - - Implementation of the normalized() function. Takes the movable list \a segs - and normalizes them. - - \internal - */ -QVersionNumber QVersionNumber::normalizedImpl(QVector<int> &segs) -{ - while (segs.size() && segs.last() == 0) - segs.pop_back(); - return QVersionNumber(qMove(segs)); -} - #ifndef QT_NO_DATASTREAM /*! \fn QDataStream& operator<<(QDataStream &out, |