From 9924f1572dcbadf97bfebe624cd190eb40eada46 Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Tue, 11 Oct 2016 17:10:07 +0300 Subject: Quick: mark some methods as const These methods do not modify objects. Change-Id: Ibb2622cad6fbcec31c785f5d032304c648372350 Reviewed-by: Lars Knoll --- src/quick/items/qquickanchors.cpp | 4 ++-- src/quick/items/qquickanchors_p_p.h | 4 ++-- src/quick/items/qquickflickable.cpp | 6 +++--- src/quick/items/qquickflickable_p_p.h | 6 +++--- src/quick/items/qquickflipable.cpp | 2 +- src/quick/items/qquickflipable_p.h | 2 +- src/quick/items/qquickitemview.cpp | 6 +++--- src/quick/items/qquickitemview_p.h | 2 +- src/quick/items/qquickitemview_p_p.h | 4 ++-- src/quick/items/qquicklistview_p.h | 2 +- src/quick/items/qquickloader_p_p.h | 2 +- src/quick/items/qquickpathview.cpp | 4 ++-- src/quick/items/qquickpathview_p.h | 2 +- src/quick/items/qquickpathview_p_p.h | 2 +- src/quick/items/qquickshadereffectmesh.cpp | 2 +- src/quick/items/qquickshadereffectmesh_p.h | 2 +- src/quick/items/qquickstateoperations.cpp | 8 ++++---- src/quick/items/qquickstateoperations_p.h | 4 ++-- src/quick/items/qquicktextdocument.cpp | 2 +- src/quick/items/qquicktextdocument_p.h | 2 +- src/quick/items/qquickwindow.cpp | 2 +- src/quick/items/qquickwindow_p.h | 2 +- 22 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src/quick/items') diff --git a/src/quick/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp index b6978e534e..a7a4a2b882 100644 --- a/src/quick/items/qquickanchors.cpp +++ b/src/quick/items/qquickanchors.cpp @@ -285,7 +285,7 @@ void QQuickAnchorsPrivate::clearItem(QQuickItem *item) } } -QQuickGeometryChange QQuickAnchorsPrivate::calculateDependency(QQuickItem *controlItem) +QQuickGeometryChange QQuickAnchorsPrivate::calculateDependency(QQuickItem *controlItem) const { QQuickGeometryChange dependency; @@ -588,7 +588,7 @@ bool QQuickAnchorsPrivate::calcStretch(QQuickItem *edge1Item, qreal offset1, qreal offset2, QQuickAnchors::Anchor line, - qreal &stretch) + qreal &stretch) const { bool edge1IsParent = (edge1Item == readParentItem(item)); bool edge2IsParent = (edge2Item == readParentItem(item)); diff --git a/src/quick/items/qquickanchors_p_p.h b/src/quick/items/qquickanchors_p_p.h index 3357e134bf..221b4ccb40 100644 --- a/src/quick/items/qquickanchors_p_p.h +++ b/src/quick/items/qquickanchors_p_p.h @@ -124,7 +124,7 @@ public: void clearItem(QQuickItem *); - QQuickGeometryChange calculateDependency(QQuickItem *); + QQuickGeometryChange calculateDependency(QQuickItem *) const; void addDepend(QQuickItem *); void remDepend(QQuickItem *); bool isItemComplete() const; @@ -150,7 +150,7 @@ public: bool checkVAnchorValid(QQuickAnchorLine anchor) const; bool calcStretch(QQuickItem *edge1Item, QQuickAnchors::Anchor edge1Line, QQuickItem *edge2Item, QQuickAnchors::Anchor edge2Line, - qreal offset1, qreal offset2, QQuickAnchors::Anchor line, qreal &stretch); + qreal offset1, qreal offset2, QQuickAnchors::Anchor line, qreal &stretch) const; bool isMirrored() const; void updateHorizontalAnchors(); diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index bcb351c085..45bc7b2e8b 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -277,7 +277,7 @@ void QQuickFlickablePrivate::init() Returns the amount to overshoot by given a velocity. Will be roughly in range 0 - size/4 */ -qreal QQuickFlickablePrivate::overShootDistance(qreal size) +qreal QQuickFlickablePrivate::overShootDistance(qreal size) const { if (maxVelocity <= 0) return 0.0; @@ -951,7 +951,7 @@ void QQuickFlickable::setPixelAligned(bool align) } } -qint64 QQuickFlickablePrivate::computeCurrentTime(QInputEvent *event) +qint64 QQuickFlickablePrivate::computeCurrentTime(QInputEvent *event) const { if (0 != event->timestamp()) return event->timestamp(); @@ -960,7 +960,7 @@ qint64 QQuickFlickablePrivate::computeCurrentTime(QInputEvent *event) return timer.elapsed(); } -qreal QQuickFlickablePrivate::devicePixelRatio() +qreal QQuickFlickablePrivate::devicePixelRatio() const { return (window ? window->effectiveDevicePixelRatio() : qApp->devicePixelRatio()); } diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h index ac1e39d829..0c3bc21071 100644 --- a/src/quick/items/qquickflickable_p_p.h +++ b/src/quick/items/qquickflickable_p_p.h @@ -192,7 +192,7 @@ public: void setViewportX(qreal x); void setViewportY(qreal y); - qreal overShootDistance(qreal size); + qreal overShootDistance(qreal size) const; void itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) Q_DECL_OVERRIDE; @@ -260,8 +260,8 @@ public: const QVector2D &deltas, bool overThreshold, bool momentum, bool velocitySensitiveOverBounds, const QVector2D &velocity); - qint64 computeCurrentTime(QInputEvent *event); - qreal devicePixelRatio(); + qint64 computeCurrentTime(QInputEvent *event) const; + qreal devicePixelRatio() const; // flickableData property static void data_append(QQmlListProperty *, QObject *); diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp index 342e6c07b8..6a6b6c00a9 100644 --- a/src/quick/items/qquickflipable.cpp +++ b/src/quick/items/qquickflipable.cpp @@ -143,7 +143,7 @@ QQuickFlipable::~QQuickFlipable() The front and back sides of the flipable. */ -QQuickItem *QQuickFlipable::front() +QQuickItem *QQuickFlipable::front() const { Q_D(const QQuickFlipable); return d->front; diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h index 189d94775a..d5a1e54d25 100644 --- a/src/quick/items/qquickflipable_p.h +++ b/src/quick/items/qquickflipable_p.h @@ -73,7 +73,7 @@ public: QQuickFlipable(QQuickItem *parent=0); ~QQuickFlipable(); - QQuickItem *front(); + QQuickItem *front() const; void setFront(QQuickItem *); QQuickItem *back(); diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index 11bd4cea67..d02ed07de0 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -2430,14 +2430,14 @@ bool QQuickItemViewPrivate::releaseItem(FxViewItem *item) return flags != QQmlInstanceModel::Referenced; } -QQuickItem *QQuickItemViewPrivate::createHighlightItem() +QQuickItem *QQuickItemViewPrivate::createHighlightItem() const { return createComponentItem(highlightComponent, 0.0, true); } -QQuickItem *QQuickItemViewPrivate::createComponentItem(QQmlComponent *component, qreal zValue, bool createDefault) +QQuickItem *QQuickItemViewPrivate::createComponentItem(QQmlComponent *component, qreal zValue, bool createDefault) const { - Q_Q(QQuickItemView); + Q_Q(const QQuickItemView); QQuickItem *item = 0; if (component) { diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h index 1a28fc212b..0e9a2f31be 100644 --- a/src/quick/items/qquickitemview_p.h +++ b/src/quick/items/qquickitemview_p.h @@ -312,7 +312,7 @@ public: : QObject(parent), m_isCurrent(false), m_delayRemove(false) {} ~QQuickItemViewAttached() {} - QQuickItemView *view() { return m_view; } + QQuickItemView *view() const { return m_view; } void setView(QQuickItemView *view) { if (view != m_view) { m_view = view; diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index 0893d6e749..f3d39bd360 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -205,8 +205,8 @@ public: FxViewItem *createItem(int modelIndex, bool asynchronous = false); virtual bool releaseItem(FxViewItem *item); - QQuickItem *createHighlightItem(); - QQuickItem *createComponentItem(QQmlComponent *component, qreal zValue, bool createDefault = false); + QQuickItem *createHighlightItem() const; + QQuickItem *createComponentItem(QQmlComponent *component, qreal zValue, bool createDefault = false) const; void updateCurrent(int modelIndex); void updateTrackedItem(); diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h index 5a5e8a55fe..f84478acbd 100644 --- a/src/quick/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_p.h @@ -84,7 +84,7 @@ public: enum LabelPositioning { InlineLabels = 0x01, CurrentLabelAtStart = 0x02, NextLabelAtEnd = 0x04 }; Q_ENUM(LabelPositioning) - int labelPositioning() { return m_labelPositioning; } + int labelPositioning() const { return m_labelPositioning; } void setLabelPositioning(int pos); Q_SIGNALS: diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h index fcccbfe4f5..a0a9ca0601 100644 --- a/src/quick/items/qquickloader_p_p.h +++ b/src/quick/items/qquickloader_p_p.h @@ -94,7 +94,7 @@ public: void incubatorStateChanged(QQmlIncubator::Status status); void setInitialState(QObject *o); void disposeInitialPropertyValues(); - QUrl resolveSourceUrl(QQmlV4Function *args); + static QUrl resolveSourceUrl(QQmlV4Function *args); QV4::ReturnedValue extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error); qreal getImplicitWidth() const Q_DECL_OVERRIDE; diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index 0e9eb16e67..15c4205833 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -902,7 +902,7 @@ void QQuickPathView::setHighlight(QQmlComponent *highlight) \sa highlight */ -QQuickItem *QQuickPathView::highlightItem() +QQuickItem *QQuickPathView::highlightItem() const { Q_D(const QQuickPathView); return d->highlightItem; @@ -1606,7 +1606,7 @@ qreal QQuickPathViewPrivate::calcVelocity() const return velocity; } -qint64 QQuickPathViewPrivate::computeCurrentTime(QInputEvent *event) +qint64 QQuickPathViewPrivate::computeCurrentTime(QInputEvent *event) const { if (0 != event->timestamp()) return event->timestamp(); diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h index e6f3cf7fef..1232f72935 100644 --- a/src/quick/items/qquickpathview_p.h +++ b/src/quick/items/qquickpathview_p.h @@ -117,7 +117,7 @@ public: QQmlComponent *highlight() const; void setHighlight(QQmlComponent *highlight); - QQuickItem *highlightItem(); + QQuickItem *highlightItem() const; enum HighlightRangeMode { NoHighlightRange, ApplyRange, StrictlyEnforceRange }; Q_ENUM(HighlightRangeMode) diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h index 0441603a4b..571bb2e9e2 100644 --- a/src/quick/items/qquickpathview_p_p.h +++ b/src/quick/items/qquickpathview_p_p.h @@ -125,7 +125,7 @@ public: QPointF pointNear(const QPointF &point, qreal *nearPercent=0) const; void addVelocitySample(qreal v); qreal calcVelocity() const; - qint64 computeCurrentTime(QInputEvent *event); + qint64 computeCurrentTime(QInputEvent *event) const; void setDragging(bool d); QQuickPath *path; diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp index c1499579e6..20b8d23af3 100644 --- a/src/quick/items/qquickshadereffectmesh.cpp +++ b/src/quick/items/qquickshadereffectmesh.cpp @@ -364,7 +364,7 @@ QSGGeometry *QQuickBorderImageMesh::updateGeometry(QSGGeometry *geometry, int at } \endqml */ -QQuickScaleGrid *QQuickBorderImageMesh::border() +QQuickScaleGrid *QQuickBorderImageMesh::border() const { return m_border; } diff --git a/src/quick/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h index c5f1d19866..5e255e73a3 100644 --- a/src/quick/items/qquickshadereffectmesh_p.h +++ b/src/quick/items/qquickshadereffectmesh_p.h @@ -123,7 +123,7 @@ public: QSGGeometry *updateGeometry(QSGGeometry *geometry, int attrCount, int posIndex, const QRectF &srcRect, const QRectF &rect) override; - QQuickScaleGrid *border(); + QQuickScaleGrid *border() const; enum TileMode { Stretch = Qt::StretchTile, Repeat = Qt::RepeatTile, Round = Qt::RoundTile }; Q_ENUM(TileMode) diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp index 7e485c675c..9cd3b6a5f5 100644 --- a/src/quick/items/qquickstateoperations.cpp +++ b/src/quick/items/qquickstateoperations.cpp @@ -899,9 +899,9 @@ QQuickAnchorChanges::ActionList QQuickAnchorChanges::actions() return ActionList() << a; } -QQuickAnchorSet *QQuickAnchorChanges::anchors() +QQuickAnchorSet *QQuickAnchorChanges::anchors() const { - Q_D(QQuickAnchorChanges); + Q_D(const QQuickAnchorChanges); return d->anchorSet; } @@ -1134,9 +1134,9 @@ QQuickStateActionEvent::EventType QQuickAnchorChanges::type() const return AnchorChanges; } -QList QQuickAnchorChanges::additionalActions() +QList QQuickAnchorChanges::additionalActions() const { - Q_D(QQuickAnchorChanges); + Q_D(const QQuickAnchorChanges); QList extra; QQuickAnchors::Anchors combined = d->anchorSet->d_func()->usedAnchors | d->anchorSet->d_func()->resetAnchors; diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h index 29dec218fa..48b4b23a76 100644 --- a/src/quick/items/qquickstateoperations_p.h +++ b/src/quick/items/qquickstateoperations_p.h @@ -192,7 +192,7 @@ public: ActionList actions() Q_DECL_OVERRIDE; - QQuickAnchorSet *anchors(); + QQuickAnchorSet *anchors() const; QQuickItem *object() const; void setObject(QQuickItem *); @@ -210,7 +210,7 @@ public: void rewind() Q_DECL_OVERRIDE; void saveCurrentValues() Q_DECL_OVERRIDE; - QList additionalActions(); + QList additionalActions() const; void saveTargetValues() Q_DECL_OVERRIDE; }; diff --git a/src/quick/items/qquicktextdocument.cpp b/src/quick/items/qquicktextdocument.cpp index 1dc54eb107..287e07e980 100644 --- a/src/quick/items/qquicktextdocument.cpp +++ b/src/quick/items/qquicktextdocument.cpp @@ -179,7 +179,7 @@ void QQuickTextDocumentWithImageResources::drawObject( { } -QImage QQuickTextDocumentWithImageResources::image(const QTextImageFormat &format) +QImage QQuickTextDocumentWithImageResources::image(const QTextImageFormat &format) const { QVariant res = resource(QTextDocument::ImageResource, QUrl(format.name())); return res.value(); diff --git a/src/quick/items/qquicktextdocument_p.h b/src/quick/items/qquicktextdocument_p.h index fd40669557..1218b12b89 100644 --- a/src/quick/items/qquicktextdocument_p.h +++ b/src/quick/items/qquicktextdocument_p.h @@ -78,7 +78,7 @@ public: QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format) override; void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) override; - QImage image(const QTextImageFormat &format); + QImage image(const QTextImageFormat &format) const; public Q_SLOTS: void clearResources(); diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index dc0bd51a9a..834841333b 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2079,7 +2079,7 @@ void QQuickWindowPrivate::flushFrameSynchronousEvents() There is a unique instance per QQuickPointerDevice, which is determined from \a event's device. */ -QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QEvent *event) +QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QEvent *event) const { QQuickPointerDevice *dev = nullptr; switch (event->type()) { diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index 3328eb65c4..2613c3c724 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -161,7 +161,7 @@ public: void deliverDelayedTouchEvent(); // delivery of pointer events: - QQuickPointerEvent *pointerEventInstance(QEvent *ev); + QQuickPointerEvent *pointerEventInstance(QEvent *ev) const; void deliverPointerEvent(QQuickPointerEvent *); void deliverTouchEvent(QQuickPointerTouchEvent *); bool deliverTouchCancelEvent(QTouchEvent *); -- cgit v1.2.3