summaryrefslogtreecommitdiff
path: root/src/controls/Private
diff options
context:
space:
mode:
Diffstat (limited to 'src/controls/Private')
-rw-r--r--src/controls/Private/qquickrangemodel_p.h4
-rw-r--r--src/controls/Private/qquickspinboxvalidator_p.h8
-rw-r--r--src/controls/Private/qquickstyleitem_p.h9
-rw-r--r--src/controls/Private/qquicktreemodeladaptor_p.h8
-rw-r--r--src/controls/Private/qquickwheelarea_p.h2
5 files changed, 16 insertions, 15 deletions
diff --git a/src/controls/Private/qquickrangemodel_p.h b/src/controls/Private/qquickrangemodel_p.h
index e5796725..6fb2c525 100644
--- a/src/controls/Private/qquickrangemodel_p.h
+++ b/src/controls/Private/qquickrangemodel_p.h
@@ -92,8 +92,8 @@ public:
Q_INVOKABLE qreal valueForPosition(qreal position) const;
Q_INVOKABLE qreal positionForValue(qreal value) const;
- void classBegin();
- void componentComplete();
+ void classBegin() override;
+ void componentComplete() override;
public Q_SLOTS:
void toMinimum();
diff --git a/src/controls/Private/qquickspinboxvalidator_p.h b/src/controls/Private/qquickspinboxvalidator_p.h
index baaeb1b3..4b92ead3 100644
--- a/src/controls/Private/qquickspinboxvalidator_p.h
+++ b/src/controls/Private/qquickspinboxvalidator_p.h
@@ -87,11 +87,11 @@ public:
QString suffix() const;
void setSuffix(const QString &suffix);
- void fixup(QString &input) const;
- State validate(QString &input, int &pos) const;
+ void fixup(QString &input) const override;
+ State validate(QString &input, int &pos) const override;
- void classBegin() { }
- void componentComplete();
+ void classBegin() override { }
+ void componentComplete() override;
public Q_SLOTS:
void increment();
diff --git a/src/controls/Private/qquickstyleitem_p.h b/src/controls/Private/qquickstyleitem_p.h
index 19cc15cf..38af22f2 100644
--- a/src/controls/Private/qquickstyleitem_p.h
+++ b/src/controls/Private/qquickstyleitem_p.h
@@ -55,7 +55,7 @@ class QQuickTableRowImageProvider1 : public QQuickImageProvider
public:
QQuickTableRowImageProvider1()
: QQuickImageProvider(QQuickImageProvider::Pixmap) {}
- QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize);
+ QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override;
};
class QQuickStyleItem1: public QQuickItem
@@ -245,9 +245,10 @@ Q_SIGNALS:
void textureHeightChanged(int h);
protected:
- virtual bool event(QEvent *);
- virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
- virtual void updatePolish();
+ bool event(QEvent *)
+ override;
+ QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
+ void updatePolish() override;
private:
QSize sizeFromContents(int width, int height);
diff --git a/src/controls/Private/qquicktreemodeladaptor_p.h b/src/controls/Private/qquicktreemodeladaptor_p.h
index 6e926db2..9a272936 100644
--- a/src/controls/Private/qquicktreemodeladaptor_p.h
+++ b/src/controls/Private/qquicktreemodeladaptor_p.h
@@ -84,10 +84,10 @@ public:
ModelIndexRole
};
- QHash<int, QByteArray> roleNames() const;
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- QVariant data(const QModelIndex &, int role) const;
- bool setData(const QModelIndex &index, const QVariant &value, int role);
+ QHash<int, QByteArray> roleNames() const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex &, int role) const override;
+ bool setData(const QModelIndex &index, const QVariant &value, int role) override;
void clearModelData();
diff --git a/src/controls/Private/qquickwheelarea_p.h b/src/controls/Private/qquickwheelarea_p.h
index a11b78cf..6e7232d7 100644
--- a/src/controls/Private/qquickwheelarea_p.h
+++ b/src/controls/Private/qquickwheelarea_p.h
@@ -96,7 +96,7 @@ public:
bool isInverted() const;
#ifndef QT_NO_WHEELEVENT
- void wheelEvent(QWheelEvent *event);
+ void wheelEvent(QWheelEvent *event) override;
#endif
bool isAtXEnd() const;