diff options
Diffstat (limited to 'src/dialogs')
-rw-r--r-- | src/dialogs/Private/dialogsprivateplugin.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/Private/qquickfontlistmodel_p.h | 12 | ||||
-rw-r--r-- | src/dialogs/Private/qquickwritingsystemlistmodel_p.h | 12 | ||||
-rw-r--r-- | src/dialogs/plugin.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/qquickabstractcolordialog_p.h | 10 | ||||
-rw-r--r-- | src/dialogs/qquickabstractfiledialog_p.h | 6 | ||||
-rw-r--r-- | src/dialogs/qquickabstractfontdialog_p.h | 10 | ||||
-rw-r--r-- | src/dialogs/qquickabstractmessagedialog_p.h | 6 | ||||
-rw-r--r-- | src/dialogs/qquickcolordialog_p.h | 2 | ||||
-rw-r--r-- | src/dialogs/qquickdialog_p.h | 12 | ||||
-rw-r--r-- | src/dialogs/qquickfontdialog_p.h | 2 | ||||
-rw-r--r-- | src/dialogs/qquickmessagedialog_p.h | 6 | ||||
-rw-r--r-- | src/dialogs/qquickplatformcolordialog_p.h | 2 | ||||
-rw-r--r-- | src/dialogs/qquickplatformfontdialog_p.h | 2 | ||||
-rw-r--r-- | src/dialogs/qquickplatformmessagedialog_p.h | 2 |
15 files changed, 44 insertions, 44 deletions
diff --git a/src/dialogs/Private/dialogsprivateplugin.cpp b/src/dialogs/Private/dialogsprivateplugin.cpp index a785f388e..bee329ee1 100644 --- a/src/dialogs/Private/dialogsprivateplugin.cpp +++ b/src/dialogs/Private/dialogsprivateplugin.cpp @@ -51,7 +51,7 @@ class QtQuick2DialogsPrivatePlugin : public QQmlExtensionPlugin public: QtQuick2DialogsPrivatePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } - virtual void registerTypes(const char *uri) + void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Dialogs.Private")); diff --git a/src/dialogs/Private/qquickfontlistmodel_p.h b/src/dialogs/Private/qquickfontlistmodel_p.h index 73270e12a..5792a658a 100644 --- a/src/dialogs/Private/qquickfontlistmodel_p.h +++ b/src/dialogs/Private/qquickfontlistmodel_p.h @@ -73,10 +73,10 @@ public: FontFamilyRole = Qt::UserRole + 1 }; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual QHash<int, QByteArray> roleNames() const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QHash<int, QByteArray> roleNames() const override; int count() const { return rowCount(QModelIndex()); } @@ -91,8 +91,8 @@ public: Q_INVOKABLE QJSValue get(int index) const; Q_INVOKABLE QJSValue pointSizes(); - virtual void classBegin(); - virtual void componentComplete(); + void classBegin() override; + void componentComplete() override; public Q_SLOTS: void setScalableFonts(bool arg); diff --git a/src/dialogs/Private/qquickwritingsystemlistmodel_p.h b/src/dialogs/Private/qquickwritingsystemlistmodel_p.h index 8ece6586e..407f84eb0 100644 --- a/src/dialogs/Private/qquickwritingsystemlistmodel_p.h +++ b/src/dialogs/Private/qquickwritingsystemlistmodel_p.h @@ -68,10 +68,10 @@ public: WritingSystemSampleRole = Qt::UserRole + 2 }; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual QHash<int, QByteArray> roleNames() const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QHash<int, QByteArray> roleNames() const override; int count() const { return rowCount(QModelIndex()); } @@ -79,8 +79,8 @@ public: Q_INVOKABLE QJSValue get(int index) const; - virtual void classBegin(); - virtual void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: void writingSystemsChanged(); diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 68b4cf3b8..9470c2080 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -88,7 +88,7 @@ class QtQuick2DialogsPlugin : public QQmlExtensionPlugin public: QtQuick2DialogsPlugin() : QQmlExtensionPlugin(), m_useResources(true) { } - virtual void registerTypes(const char *uri) { + void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Dialogs")); bool hasTopLevelWindows = QGuiApplicationPrivate::platformIntegration()-> hasCapability(QPlatformIntegration::MultipleWindows); diff --git a/src/dialogs/qquickabstractcolordialog_p.h b/src/dialogs/qquickabstractcolordialog_p.h index 16b39c267..e65c25568 100644 --- a/src/dialogs/qquickabstractcolordialog_p.h +++ b/src/dialogs/qquickabstractcolordialog_p.h @@ -73,7 +73,7 @@ public: QQuickAbstractColorDialog(QObject *parent = 0); virtual ~QQuickAbstractColorDialog(); - virtual QString title() const; + QString title() const override; bool showAlphaChannel() const; QColor color() const { return m_color; } QColor currentColor() const { return m_currentColor; } @@ -83,9 +83,9 @@ public: qreal currentAlpha() const { return m_currentColor.alphaF(); } public Q_SLOTS: - void setVisible(bool v); - void setModality(Qt::WindowModality m); - void setTitle(const QString &t); + void setVisible(bool v) override; + void setModality(Qt::WindowModality m) override; + void setTitle(const QString &t) override; void setColor(QColor arg); void setCurrentColor(QColor currentColor); void setShowAlphaChannel(bool arg); @@ -97,7 +97,7 @@ Q_SIGNALS: void selectionAccepted(); protected Q_SLOTS: - virtual void accept(); + void accept() override; protected: QPlatformColorDialogHelper *m_dlgHelper; diff --git a/src/dialogs/qquickabstractfiledialog_p.h b/src/dialogs/qquickabstractfiledialog_p.h index e00db5be8..ba62c04d2 100644 --- a/src/dialogs/qquickabstractfiledialog_p.h +++ b/src/dialogs/qquickabstractfiledialog_p.h @@ -82,7 +82,7 @@ public: QQuickAbstractFileDialog(QObject *parent = 0); virtual ~QQuickAbstractFileDialog(); - virtual QString title() const; + QString title() const override; bool selectExisting() const { return m_selectExisting; } bool selectMultiple() const { return m_selectMultiple; } bool selectFolder() const { return m_selectFolder; } @@ -99,8 +99,8 @@ public: QString defaultSuffix() const { return m_options->defaultSuffix(); } public Q_SLOTS: - void setVisible(bool v); - void setTitle(const QString &t); + void setVisible(bool v) override; + void setTitle(const QString &t) override; void setSelectExisting(bool s); void setSelectMultiple(bool s); void setSelectFolder(bool s); diff --git a/src/dialogs/qquickabstractfontdialog_p.h b/src/dialogs/qquickabstractfontdialog_p.h index f60c4ddb8..b9c0380d0 100644 --- a/src/dialogs/qquickabstractfontdialog_p.h +++ b/src/dialogs/qquickabstractfontdialog_p.h @@ -73,7 +73,7 @@ public: QQuickAbstractFontDialog(QObject *parent = 0); virtual ~QQuickAbstractFontDialog(); - virtual QString title() const; + QString title() const override; bool scalableFonts() const; bool nonScalableFonts() const; bool monospacedFonts() const; @@ -82,9 +82,9 @@ public: QFont currentFont() const { return m_currentFont; } public Q_SLOTS: - void setVisible(bool v); - void setModality(Qt::WindowModality m); - void setTitle(const QString &t); + void setVisible(bool v) override; + void setModality(Qt::WindowModality m) override; + void setTitle(const QString &t) override; void setFont(const QFont &arg); void setCurrentFont(const QFont &arg); void setScalableFonts(bool arg); @@ -102,7 +102,7 @@ Q_SIGNALS: void selectionAccepted(); protected Q_SLOTS: - virtual void accept(); + void accept() override; protected: QPlatformFontDialogHelper *m_dlgHelper; diff --git a/src/dialogs/qquickabstractmessagedialog_p.h b/src/dialogs/qquickabstractmessagedialog_p.h index 68d0c51ef..e4bfa6319 100644 --- a/src/dialogs/qquickabstractmessagedialog_p.h +++ b/src/dialogs/qquickabstractmessagedialog_p.h @@ -76,7 +76,7 @@ public: QQuickAbstractMessageDialog(QObject *parent = 0); virtual ~QQuickAbstractMessageDialog(); - virtual QString title() const { return m_options->windowTitle(); } + QString title() const override { return m_options->windowTitle(); } QString text() const { return m_options->text(); } QString informativeText() const { return m_options->informativeText(); } QString detailedText() const { return m_options->detailedText(); } @@ -98,8 +98,8 @@ public: StandardButton clickedButton() const { return m_clickedButton; } public Q_SLOTS: - virtual void setVisible(bool v); - virtual void setTitle(const QString &arg); + void setVisible(bool v) override; + void setTitle(const QString &arg) override; void setText(const QString &arg); void setInformativeText(const QString &arg); void setDetailedText(const QString &arg); diff --git a/src/dialogs/qquickcolordialog_p.h b/src/dialogs/qquickcolordialog_p.h index 619b7b100..eb3ad5dff 100644 --- a/src/dialogs/qquickcolordialog_p.h +++ b/src/dialogs/qquickcolordialog_p.h @@ -66,7 +66,7 @@ public: ~QQuickColorDialog(); protected: - virtual QPlatformColorDialogHelper *helper() { return 0; } + QPlatformColorDialogHelper *helper() override { return 0; } Q_DISABLE_COPY(QQuickColorDialog) }; diff --git a/src/dialogs/qquickdialog_p.h b/src/dialogs/qquickdialog_p.h index fec4ec9a1..6c2083f1e 100644 --- a/src/dialogs/qquickdialog_p.h +++ b/src/dialogs/qquickdialog_p.h @@ -78,11 +78,11 @@ public: Q_INVOKABLE QJSValue __standardButtonsLeftModel(); Q_INVOKABLE QJSValue __standardButtonsRightModel(); - QString title() const { return m_title; } - virtual void setVisible(bool v); + QString title() const override { return m_title; } + void setVisible(bool v) override; public Q_SLOTS: - virtual void setTitle(const QString &arg); + void setTitle(const QString &arg) override; void setStandardButtons(StandardButtons buttons); void click(QQuickAbstractDialog::StandardButton button); @@ -98,12 +98,12 @@ Q_SIGNALS: void reset(); protected: - virtual QPlatformDialogHelper *helper() { return 0; } + QPlatformDialogHelper *helper() override { return 0; } void click(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole); protected Q_SLOTS: - virtual void accept(); - virtual void reject(); + void accept() override; + void reject() override; private: void updateStandardButtons(); diff --git a/src/dialogs/qquickfontdialog_p.h b/src/dialogs/qquickfontdialog_p.h index bd04f5361..df9fcafa0 100644 --- a/src/dialogs/qquickfontdialog_p.h +++ b/src/dialogs/qquickfontdialog_p.h @@ -66,7 +66,7 @@ public: ~QQuickFontDialog(); protected: - virtual QPlatformFontDialogHelper *helper() { return 0; } + QPlatformFontDialogHelper *helper() override { return 0; } Q_DISABLE_COPY(QQuickFontDialog) }; diff --git a/src/dialogs/qquickmessagedialog_p.h b/src/dialogs/qquickmessagedialog_p.h index 3b79f9674..4f23e6772 100644 --- a/src/dialogs/qquickmessagedialog_p.h +++ b/src/dialogs/qquickmessagedialog_p.h @@ -66,11 +66,11 @@ public: ~QQuickMessageDialog(); protected: - virtual QPlatformDialogHelper *helper() { return 0; } + QPlatformDialogHelper *helper() override { return 0; } protected Q_SLOTS: - virtual void accept(); - virtual void reject(); + void accept() override; + void reject() override; private: Q_DISABLE_COPY(QQuickMessageDialog) diff --git a/src/dialogs/qquickplatformcolordialog_p.h b/src/dialogs/qquickplatformcolordialog_p.h index d4d79d425..625affcb3 100644 --- a/src/dialogs/qquickplatformcolordialog_p.h +++ b/src/dialogs/qquickplatformcolordialog_p.h @@ -64,7 +64,7 @@ public: virtual ~QQuickPlatformColorDialog1(); protected: - QPlatformColorDialogHelper *helper(); + QPlatformColorDialogHelper *helper() override; Q_DISABLE_COPY(QQuickPlatformColorDialog1) }; diff --git a/src/dialogs/qquickplatformfontdialog_p.h b/src/dialogs/qquickplatformfontdialog_p.h index 096f26b25..8fb97158d 100644 --- a/src/dialogs/qquickplatformfontdialog_p.h +++ b/src/dialogs/qquickplatformfontdialog_p.h @@ -64,7 +64,7 @@ public: virtual ~QQuickPlatformFontDialog1(); protected: - QPlatformFontDialogHelper *helper(); + QPlatformFontDialogHelper *helper() override; Q_DISABLE_COPY(QQuickPlatformFontDialog1) }; diff --git a/src/dialogs/qquickplatformmessagedialog_p.h b/src/dialogs/qquickplatformmessagedialog_p.h index 045dabd0f..2a2f3d9b2 100644 --- a/src/dialogs/qquickplatformmessagedialog_p.h +++ b/src/dialogs/qquickplatformmessagedialog_p.h @@ -64,7 +64,7 @@ public: virtual ~QQuickPlatformMessageDialog1(); protected: - QPlatformMessageDialogHelper *helper(); + QPlatformMessageDialogHelper *helper() override; Q_DISABLE_COPY(QQuickPlatformMessageDialog1) }; |