diff options
author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-09-15 15:53:47 +0300 |
---|---|---|
committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-10-06 11:17:52 +0000 |
commit | 316df620b5f57e406d4f31ec71902da4344dbe3d (patch) | |
tree | 9dba1bcf6afd27d9c29bfb5ad8cdc7398e963715 /src/quick/items/context2d | |
parent | 8991329a99cc8cd75fa9f02daa9dff570647220f (diff) |
Mark some methods as const
These methods do not modify objects.
Change-Id: I4909f382cc19c5ce6f07e0421fef68a63cfe518f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick/items/context2d')
-rw-r--r-- | src/quick/items/context2d/qquickcanvasitem_p.h | 2 | ||||
-rw-r--r-- | src/quick/items/context2d/qquickcontext2d_p.h | 4 | ||||
-rw-r--r-- | src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h | 2 |
3 files changed, 4 insertions, 4 deletions
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<QQuickCanvasPixmap> 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++); } |