diff options
Diffstat (limited to 'src/controls')
-rw-r--r-- | src/controls/Private/qquickrangemodel_p.h | 4 | ||||
-rw-r--r-- | src/controls/Private/qquickspinboxvalidator_p.h | 8 | ||||
-rw-r--r-- | src/controls/Private/qquickstyleitem_p.h | 9 | ||||
-rw-r--r-- | src/controls/Private/qquicktreemodeladaptor_p.h | 8 | ||||
-rw-r--r-- | src/controls/Private/qquickwheelarea_p.h | 2 | ||||
-rw-r--r-- | src/controls/plugin.h | 4 | ||||
-rw-r--r-- | src/controls/qquickaction_p.h | 2 | ||||
-rw-r--r-- | src/controls/qquickdesktopiconprovider_p.h | 2 | ||||
-rw-r--r-- | src/controls/qquickmenu_p.h | 8 | ||||
-rw-r--r-- | src/controls/qquickmenuitem_p.h | 14 | ||||
-rw-r--r-- | src/controls/qquickmenuitemcontainer_p.h | 2 | ||||
-rw-r--r-- | src/controls/qquickmenupopupwindow_p.h | 8 |
12 files changed, 36 insertions, 35 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; diff --git a/src/controls/plugin.h b/src/controls/plugin.h index 04fd0685..30ff5df9 100644 --- a/src/controls/plugin.h +++ b/src/controls/plugin.h @@ -56,8 +56,8 @@ class QtQuickControls1Plugin: public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QtQuickControls1Plugin(QObject *parent = 0); - void registerTypes(const char *uri); - void initializeEngine(QQmlEngine *engine, const char *uri); + void registerTypes(const char *uri) override; + void initializeEngine(QQmlEngine *engine, const char *uri) override; private: QString fileLocation() const; bool isLoadedFromResource() const; diff --git a/src/controls/qquickaction_p.h b/src/controls/qquickaction_p.h index 8d6757b5..5c44f89a 100644 --- a/src/controls/qquickaction_p.h +++ b/src/controls/qquickaction_p.h @@ -111,7 +111,7 @@ public: QVariant iconVariant() const { return QVariant(m_icon); } void setIcon(const QIcon &icon) { m_icon = icon; emit iconChanged(); } - bool event(QEvent *e); + bool event(QEvent *e) override; public Q_SLOTS: void trigger(QObject *source = 0); diff --git a/src/controls/qquickdesktopiconprovider_p.h b/src/controls/qquickdesktopiconprovider_p.h index 6e9e94a0..51448cda 100644 --- a/src/controls/qquickdesktopiconprovider_p.h +++ b/src/controls/qquickdesktopiconprovider_p.h @@ -54,7 +54,7 @@ public: { } - QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) + QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override { Q_UNUSED(requestedSize); Q_UNUSED(size); diff --git a/src/controls/qquickmenu_p.h b/src/controls/qquickmenu_p.h index 762774a7..6a159832 100644 --- a/src/controls/qquickmenu_p.h +++ b/src/controls/qquickmenu_p.h @@ -120,8 +120,8 @@ public: QQuickMenu1(QObject *parent = 0); virtual ~QQuickMenu1(); - void setVisible(bool); - void setEnabled(bool); + void setVisible(bool) override; + void setEnabled(bool) override; int selectedIndex() const { return m_selectedIndex; } void setSelectedIndex(int index); @@ -147,7 +147,7 @@ public: QQuickItem *menuContentItem() const { return m_menuContentItem; } bool popupVisible() const { return m_popupVisible; } - bool isNative() { return m_platformMenu != 0; } + bool isNative() override { return m_platformMenu != 0; } QRect popupGeometry() const; @@ -169,7 +169,7 @@ protected Q_SLOTS: void hideMenu(); void clearPopupWindow(); - void updateText(); + void updateText() override; void windowVisibleChanged(bool); void platformMenuWindowVisibleChanged(bool); diff --git a/src/controls/qquickmenuitem_p.h b/src/controls/qquickmenuitem_p.h index f28fafd9..f56ef037 100644 --- a/src/controls/qquickmenuitem_p.h +++ b/src/controls/qquickmenuitem_p.h @@ -202,12 +202,12 @@ public: QQuickMenuItem1(QObject *parent = 0); ~QQuickMenuItem1(); - void setEnabled(bool enabled); + void setEnabled(bool enabled) override; - QString text() const; + QString text() const override; - QUrl iconSource() const; - QString iconName() const; + QUrl iconSource() const override; + QString iconName() const override; QQuickAction1 *boundAction() { return m_boundAction; } void setBoundAction(QQuickAction1 *a); @@ -224,7 +224,7 @@ public: QQuickExclusiveGroup1 *exclusiveGroup() const; void setExclusiveGroup(QQuickExclusiveGroup1 *); - void setParentMenu(QQuickMenu1 *parentMenu); + void setParentMenu(QQuickMenu1 *parentMenu) override; protected Q_SLOTS: void updateShortcut(); @@ -234,8 +234,8 @@ protected Q_SLOTS: void unbindFromAction(QObject *action); protected: - QIcon icon() const; - QQuickAction1 *action() const; + QIcon icon() const override; + QQuickAction1 *action() const override; private: QQuickAction1 *m_boundAction; diff --git a/src/controls/qquickmenuitemcontainer_p.h b/src/controls/qquickmenuitemcontainer_p.h index d0a2b560..c09fb3f5 100644 --- a/src/controls/qquickmenuitemcontainer_p.h +++ b/src/controls/qquickmenuitemcontainer_p.h @@ -59,7 +59,7 @@ public: setParentMenu(0); } - void setParentMenu(QQuickMenu1 *parentMenu) + void setParentMenu(QQuickMenu1 *parentMenu) override { QQuickMenuBase1::setParentMenu(parentMenu); for (QQuickMenuBase1 *item : qAsConst(m_menuItems)) diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h index 8ec6aa5c..15cc5b82 100644 --- a/src/controls/qquickmenupopupwindow_p.h +++ b/src/controls/qquickmenupopupwindow_p.h @@ -57,7 +57,7 @@ public: void setParentWindow(QWindow *effectiveParentWindow, QQuickWindow *parentWindow); void setGeometry(int posx, int posy, int w, int h); - void setParentItem(QQuickItem *); + void setParentItem(QQuickItem *) override; QQuickMenu1 *menu() const; public Q_SLOTS: @@ -71,9 +71,9 @@ Q_SIGNALS: void willBeDeletedLater(); protected: - void focusInEvent(QFocusEvent *); - void exposeEvent(QExposeEvent *); - bool shouldForwardEventAfterDismiss(QMouseEvent *) const; + void focusInEvent(QFocusEvent *) override; + void exposeEvent(QExposeEvent *) override; + bool shouldForwardEventAfterDismiss(QMouseEvent *) const override; private: QQuickItem *m_itemAt; |