From 316df620b5f57e406d4f31ec71902da4344dbe3d Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Thu, 15 Sep 2016 15:53:47 +0300 Subject: Mark some methods as const These methods do not modify objects. Change-Id: I4909f382cc19c5ce6f07e0421fef68a63cfe518f Reviewed-by: Ulf Hermann --- src/quick/items/context2d/qquickcanvasitem_p.h | 2 +- src/quick/items/context2d/qquickcontext2d_p.h | 4 ++-- src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h | 2 +- src/quick/items/qquickaccessibleattached_p.h | 2 +- src/quick/items/qquickdroparea.cpp | 2 +- src/quick/items/qquickdroparea_p.h | 2 +- src/quick/items/qquickflickable.cpp | 4 ++-- src/quick/items/qquickflickable_p.h | 2 +- src/quick/items/qquickitem.cpp | 4 ++-- src/quick/items/qquickitem_p.h | 2 +- src/quick/items/qquickitemanimation_p_p.h | 2 +- src/quick/items/qquickitemviewtransition.cpp | 2 +- src/quick/items/qquickitemviewtransition_p.h | 2 +- src/quick/items/qquickpathview_p.h | 2 +- src/quick/items/qquickspriteengine.cpp | 4 ++-- src/quick/items/qquickspriteengine_p.h | 10 +++++----- 16 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/quick/items') diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index 4f94393a45..1948a57e58 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -191,7 +191,7 @@ private: Q_INVOKABLE void delayedCreate(); bool createContext(const QString &contextType); void initializeContext(QQuickCanvasContext *context, const QVariantMap &args = QVariantMap()); - QRect tiledRect(const QRectF &window, const QSize &tileSize); + static QRect tiledRect(const QRectF &window, const QSize &tileSize); bool isPaintConnected(); }; diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h index e5d777d411..2e900a49af 100644 --- a/src/quick/items/context2d/qquickcontext2d_p.h +++ b/src/quick/items/context2d/qquickcontext2d_p.h @@ -240,8 +240,8 @@ public: QPainterPath createTextGlyphs(qreal x, qreal y, const QString& text); QQmlRefPointer createPixmap(const QUrl& url); - QOpenGLContext *glContext() { return m_glContext; } - QSurface *surface() { return m_surface.data(); } + QOpenGLContext *glContext() const { return m_glContext; } + QSurface *surface() const { return m_surface.data(); } void setGrabbedImage(const QImage& grab); State state; diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h index f281cec2d5..716b73f8df 100644 --- a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h +++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h @@ -67,7 +67,7 @@ public: void reset(); void clear(); - inline int size() {return commands.size();} + inline int size() const { return commands.size(); } inline bool isEmpty() const {return commands.isEmpty(); } inline bool hasNext() const {return cmdIdx < commands.size(); } inline QQuickContext2D::PaintCommand takeNextCommand() { return commands.at(cmdIdx++); } diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index 2c209ae664..7054d9d9c9 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_p.h @@ -203,7 +203,7 @@ public: return object; } - QAccessible::State state() { return m_state; } + QAccessible::State state() const { return m_state; } bool ignored() const; bool doAction(const QString &actionName); void availableActions(QStringList *actions) const; diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp index 8dcc13971e..70d76c99a1 100644 --- a/src/quick/items/qquickdroparea.cpp +++ b/src/quick/items/qquickdroparea.cpp @@ -513,7 +513,7 @@ void QQuickDropArea::dropEvent(QDropEvent *event) easily be translated into a QByteArray. \a format should be one contained in the \l formats property. */ -QObject *QQuickDropEvent::source() +QObject *QQuickDropEvent::source() const { if (const QQuickDragMimeData *dragMime = qobject_cast(event->mimeData())) return dragMime->source(); diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h index d3b37979da..ecd4da4367 100644 --- a/src/quick/items/qquickdroparea_p.h +++ b/src/quick/items/qquickdroparea_p.h @@ -86,7 +86,7 @@ public: qreal x() const { return event->pos().x(); } qreal y() const { return event->pos().y(); } - QObject *source(); + QObject *source() const; Qt::DropActions supportedActions() const { return event->possibleActions(); } Qt::DropActions proposedAction() const { return event->proposedAction(); } diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 0333f6b9bd..bcb351c085 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -874,9 +874,9 @@ bool QQuickFlickable::isAtYBeginning() const } \endcode */ -QQuickItem *QQuickFlickable::contentItem() +QQuickItem *QQuickFlickable::contentItem() const { - Q_D(QQuickFlickable); + Q_D(const QQuickFlickable); return d->contentItem; } diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 318b8ce473..cd727a2a68 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -190,7 +190,7 @@ public: bool isAtYEnd() const; bool isAtYBeginning() const; - QQuickItem *contentItem(); + QQuickItem *contentItem() const; enum FlickableDirection { AutoFlickDirection=0x0, HorizontalFlick=0x1, VerticalFlick=0x2, HorizontalAndVerticalFlick=0x3, AutoFlickIfNeeded=0xc }; diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 2851d1a9e7..09d5e55c24 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -789,9 +789,9 @@ QByteArray QQuickKeysAttached::keyToSignal(int key) return keySignal; } -bool QQuickKeysAttached::isConnected(const char *signalName) +bool QQuickKeysAttached::isConnected(const char *signalName) const { - Q_D(QQuickKeysAttached); + Q_D(const QQuickKeysAttached); int signal_index = d->signalIndex(signalName); return d->isSignalConnected(signal_index); } diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index c892ec9144..c5cac2ff1e 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -858,7 +858,7 @@ private: #endif static QByteArray keyToSignal(int key); - bool isConnected(const char *signalName); + bool isConnected(const char *signalName) const; }; Qt::MouseButtons QQuickItemPrivate::acceptedMouseButtons() const diff --git a/src/quick/items/qquickitemanimation_p_p.h b/src/quick/items/qquickitemanimation_p_p.h index 5b18e4b0ae..8d270865ed 100644 --- a/src/quick/items/qquickitemanimation_p_p.h +++ b/src/quick/items/qquickitemanimation_p_p.h @@ -129,7 +129,7 @@ public: void clearTemplate() { animationTemplate = 0; } - QQuickPathAnimationUpdater *pathUpdater() { return static_cast(getAnimValue()); } + QQuickPathAnimationUpdater *pathUpdater() const { return static_cast(getAnimValue()); } private: QQuickPathAnimationPrivate *animationTemplate; }; diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index 6d2421c3df..83c451613e 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.cpp @@ -246,7 +246,7 @@ void QQuickItemViewTransitioner::resetTargetLists() moveTransitionTargets.clear(); } -QQuickTransition *QQuickItemViewTransitioner::transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget) +QQuickTransition *QQuickItemViewTransitioner::transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget) const { if (type == QQuickItemViewTransitioner::NoTransition) return 0; diff --git a/src/quick/items/qquickitemviewtransition_p.h b/src/quick/items/qquickitemviewtransition_p.h index 6641dada29..e79c3b26f6 100644 --- a/src/quick/items/qquickitemviewtransition_p.h +++ b/src/quick/items/qquickitemviewtransition_p.h @@ -94,7 +94,7 @@ public: void addToTargetLists(QQuickItemViewTransitioner::TransitionType type, QQuickItemViewTransitionableItem *item, int index); void resetTargetLists(); - QQuickTransition *transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget); + QQuickTransition *transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget) const; const QList &targetIndexes(QQuickItemViewTransitioner::TransitionType type) const; const QList &targetItems(QQuickItemViewTransitioner::TransitionType type) const; diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h index 5fe08abef6..e6f3cf7fef 100644 --- a/src/quick/items/qquickpathview_p.h +++ b/src/quick/items/qquickpathview_p.h @@ -255,7 +255,7 @@ public: QQuickPathViewAttached(QObject *parent); ~QQuickPathViewAttached(); - QQuickPathView *view() { return m_view; } + QQuickPathView *view() const { return m_view; } bool isCurrentItem() const { return m_isCurrent; } void setIsCurrentItem(bool c) { diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp index 10e0d51709..74b04a75ad 100644 --- a/src/quick/items/qquickspriteengine.cpp +++ b/src/quick/items/qquickspriteengine.cpp @@ -323,13 +323,13 @@ void QQuickStochasticEngine::setGoal(int state, int sprite, bool jump) return; } -QQuickPixmap::Status QQuickSpriteEngine::status()//Composed status of all Sprites +QQuickPixmap::Status QQuickSpriteEngine::status() const //Composed status of all Sprites { if (!m_startedImageAssembly) return QQuickPixmap::Null; int null, loading, ready; null = loading = ready = 0; - for (QQuickSprite* s : qAsConst(m_sprites)) { + for (QQuickSprite* s : m_sprites) { switch (s->m_pix.status()) { // ### Maybe add an error message here, because this null shouldn't be reached but when it does, the image fails without an error message. case QQuickPixmap::Null : null++; break; diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index 485afc16e5..5154dd7a31 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -289,11 +289,11 @@ public: void advance(int index=0) Q_DECL_OVERRIDE; //Similar API to QQuickPixmap for async loading convenience - bool isNull() { return status() == QQuickPixmap::Null; } - bool isReady() { return status() == QQuickPixmap::Ready; } - bool isLoading() { return status() == QQuickPixmap::Loading; } - bool isError() { return status() == QQuickPixmap::Error; } - QQuickPixmap::Status status();//Composed status of all Sprites + bool isNull() const { return status() == QQuickPixmap::Null; } + bool isReady() const { return status() == QQuickPixmap::Ready; } + bool isLoading() const { return status() == QQuickPixmap::Loading; } + bool isError() const { return status() == QQuickPixmap::Error; } + QQuickPixmap::Status status() const; //Composed status of all Sprites void startAssemblingImage(); QImage assembledImage(int maxSize = 2048); -- cgit v1.2.3