summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Volkov <avolkov@astralinux.ru>2020-05-19 17:49:54 +0300
committerAlexander Volkov <avolkov@astralinux.ru>2020-05-20 16:50:32 +0300
commita426158b43c54c2e7e681c173829eba16eec3171 (patch)
treebfe6afe0acfe941f0b2d0d19aeca0e8d7c0a2f5a /src
parentd063abad1a64f12fbac7325c8410b393db81fbd3 (diff)
Add missing override
Change-Id: Id2b1c4b9e7cb24b427f7e3de4b00d1472c67cb5a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/designer/src/components/formeditor/deviceprofiledialog.h2
-rw-r--r--src/designer/src/components/propertyeditor/qlonglongvalidator.h4
-rw-r--r--src/designer/src/designer/mainwindow.h2
-rw-r--r--src/designer/src/lib/shared/qdesigner_propertycommand_p.h12
-rw-r--r--src/linguist/linguist/batchtranslationdialog.h2
-rw-r--r--src/linguist/linguist/main.cpp2
-rw-r--r--src/linguist/linguist/mainwindow.cpp8
-rw-r--r--src/linguist/linguist/mainwindow.h4
-rw-r--r--src/linguist/linguist/messageeditor.h2
-rw-r--r--src/linguist/linguist/messageeditorwidgets.cpp2
-rw-r--r--src/linguist/linguist/messageeditorwidgets.h6
-rw-r--r--src/linguist/linguist/messagehighlighter.h2
-rw-r--r--src/linguist/linguist/messagemodel.h10
-rw-r--r--src/linguist/linguist/phrasebookbox.h2
-rw-r--r--src/linguist/linguist/phrasemodel.h16
-rw-r--r--src/linguist/linguist/phraseview.h4
-rw-r--r--src/linguist/linguist/translatedialog.h2
-rw-r--r--src/linguist/linguist/translationsettingsdialog.h2
-rw-r--r--src/linguist/lprodump/main.cpp8
-rw-r--r--src/linguist/lupdate/qdeclarative.cpp4
-rw-r--r--src/qdbus/qdbusviewer/logviewer.h2
-rw-r--r--src/qdbus/qdbusviewer/propertydialog.h2
-rw-r--r--src/qdbus/qdbusviewer/qdbusmodel.h13
-rw-r--r--src/qdbus/qdbusviewer/qdbusviewer.cpp2
-rw-r--r--src/shared/deviceskin/deviceskin.cpp4
-rw-r--r--src/shared/qtgradienteditor/qtcolorbutton.h12
-rw-r--r--src/shared/qtgradienteditor/qtcolorline.h16
-rw-r--r--src/shared/qtgradienteditor/qtgradientstopswidget.h32
-rw-r--r--src/shared/qtgradienteditor/qtgradientwidget.h16
-rw-r--r--src/shared/qtpropertybrowser/qtbuttonpropertybrowser.h6
-rw-r--r--src/shared/qtpropertybrowser/qteditorfactory.cpp16
-rw-r--r--src/shared/qtpropertybrowser/qteditorfactory.h90
-rw-r--r--src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h6
-rw-r--r--src/shared/qtpropertybrowser/qtpropertybrowser.h6
-rw-r--r--src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h2
-rw-r--r--src/shared/qtpropertybrowser/qtpropertymanager.h148
-rw-r--r--src/shared/qtpropertybrowser/qttreepropertybrowser.cpp20
-rw-r--r--src/shared/qtpropertybrowser/qttreepropertybrowser.h6
-rw-r--r--src/shared/qtpropertybrowser/qtvariantproperty.h18
-rw-r--r--src/shared/qttoolbardialog/qttoolbardialog.h4
40 files changed, 259 insertions, 258 deletions
diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.h b/src/designer/src/components/formeditor/deviceprofiledialog.h
index e44ba0663..ebccd31d9 100644
--- a/src/designer/src/components/formeditor/deviceprofiledialog.h
+++ b/src/designer/src/components/formeditor/deviceprofiledialog.h
@@ -76,7 +76,7 @@ private slots:
void setOkButtonEnabled(bool);
void nameChanged(const QString &name);
void save();
- void open();
+ void open() override;
private:
void critical(const QString &title, const QString &msg);
diff --git a/src/designer/src/components/propertyeditor/qlonglongvalidator.h b/src/designer/src/components/propertyeditor/qlonglongvalidator.h
index ccc28b42e..3f1669448 100644
--- a/src/designer/src/components/propertyeditor/qlonglongvalidator.h
+++ b/src/designer/src/components/propertyeditor/qlonglongvalidator.h
@@ -46,7 +46,7 @@ public:
QLongLongValidator(qlonglong bottom, qlonglong top, QObject * parent);
~QLongLongValidator();
- QValidator::State validate(QString &, int &) const;
+ QValidator::State validate(QString &, int &) const override;
void setBottom(qlonglong);
void setTop(qlonglong);
@@ -74,7 +74,7 @@ public:
QULongLongValidator(qulonglong bottom, qulonglong top, QObject * parent);
~QULongLongValidator();
- QValidator::State validate(QString &, int &) const;
+ QValidator::State validate(QString &, int &) const override;
void setBottom(qulonglong);
void setTop(qulonglong);
diff --git a/src/designer/src/designer/mainwindow.h b/src/designer/src/designer/mainwindow.h
index 3bbfbb7fd..90b2b58a7 100644
--- a/src/designer/src/designer/mainwindow.h
+++ b/src/designer/src/designer/mainwindow.h
@@ -98,7 +98,7 @@ signals:
void fileDropped(const QString &);
protected:
- bool event (QEvent *event);
+ bool event (QEvent *event) override;
private:
QStringList uiFiles(const QMimeData *d) const;
diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h
index ab7662f2a..7aaa7e944 100644
--- a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h
+++ b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h
@@ -242,10 +242,10 @@ public:
bool init(QObject *object, const QString &propertyName);
bool init(const QObjectList &list, const QString &propertyName, QObject *referenceObject = nullptr);
- virtual void redo();
+ void redo() override;
protected:
- virtual bool mergeWith(const QUndoCommand *) { return false; }
+ bool mergeWith(const QUndoCommand *) override { return false; }
private:
void setDescription();
@@ -261,8 +261,8 @@ public:
bool init(const QVector<QObject *> &selection, QObject *current, const QString &propertyName, const QVariant &value);
- virtual void redo();
- virtual void undo();
+ void redo() override;
+ void undo() override;
private:
void setDescription();
QString m_propertyName;
@@ -278,8 +278,8 @@ public:
bool init(const QVector<QObject *> &selection, QObject *current, const QString &propertyName);
- virtual void redo();
- virtual void undo();
+ void redo() override;
+ void undo() override;
private:
void setDescription();
QString m_propertyName;
diff --git a/src/linguist/linguist/batchtranslationdialog.h b/src/linguist/linguist/batchtranslationdialog.h
index 63808dfbb..3bfc00020 100644
--- a/src/linguist/linguist/batchtranslationdialog.h
+++ b/src/linguist/linguist/batchtranslationdialog.h
@@ -43,7 +43,7 @@ class CheckableListModel : public QStandardItemModel
{
public:
CheckableListModel(QObject *parent = 0);
- virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
};
class BatchTranslationDialog : public QDialog
diff --git a/src/linguist/linguist/main.cpp b/src/linguist/linguist/main.cpp
index 18fd938a6..ab14fb78e 100644
--- a/src/linguist/linguist/main.cpp
+++ b/src/linguist/linguist/main.cpp
@@ -65,7 +65,7 @@ public:
}
protected:
- bool eventFilter(QObject *object, QEvent *event)
+ bool eventFilter(QObject *object, QEvent *event) override
{
if (object == qApp && event->type() == QEvent::FileOpen) {
QFileOpenEvent *e = static_cast<QFileOpenEvent*>(event);
diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp
index 9e2ba0bdd..5f4558150 100644
--- a/src/linguist/linguist/mainwindow.cpp
+++ b/src/linguist/linguist/mainwindow.cpp
@@ -174,7 +174,7 @@ public:
ContextItemDelegate(QObject *parent, MultiDataModel *model) : QItemDelegate(parent), m_dataModel(model) {}
void paint(QPainter *painter, const QStyleOptionViewItem &option,
- const QModelIndex &index) const
+ const QModelIndex &index) const override
{
const QAbstractItemModel *model = index.model();
Q_ASSERT(model);
@@ -207,7 +207,7 @@ class SortedMessagesModel : public QSortFilterProxyModel
public:
SortedMessagesModel(QObject *parent, MultiDataModel *model) : QSortFilterProxyModel(parent), m_dataModel(model) {}
- QVariant headerData(int section, Qt::Orientation orientation, int role) const
+ QVariant headerData(int section, Qt::Orientation orientation, int role) const override
{
if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
switch (section - m_dataModel->modelCount()) {
@@ -231,7 +231,7 @@ class SortedContextsModel : public QSortFilterProxyModel
public:
SortedContextsModel(QObject *parent, MultiDataModel *model) : QSortFilterProxyModel(parent), m_dataModel(model) {}
- QVariant headerData(int section, Qt::Orientation orientation, int role) const
+ QVariant headerData(int section, Qt::Orientation orientation, int role) const override
{
if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
switch (section - m_dataModel->modelCount()) {
@@ -257,7 +257,7 @@ public:
FocusWatcher(MessageEditor *msgedit, QObject *parent) : QObject(parent), m_messageEditor(msgedit) {}
protected:
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) override;
private:
MessageEditor *m_messageEditor;
diff --git a/src/linguist/linguist/mainwindow.h b/src/linguist/linguist/mainwindow.h
index d8a99b4b4..90cb1b627 100644
--- a/src/linguist/linguist/mainwindow.h
+++ b/src/linguist/linguist/mainwindow.h
@@ -82,8 +82,8 @@ public:
protected:
void readConfig();
void writeConfig();
- void closeEvent(QCloseEvent *);
- bool eventFilter(QObject *object, QEvent *event);
+ void closeEvent(QCloseEvent *) override;
+ bool eventFilter(QObject *object, QEvent *event) override;
private slots:
void done();
diff --git a/src/linguist/linguist/messageeditor.h b/src/linguist/linguist/messageeditor.h
index a4353bece..386384ec6 100644
--- a/src/linguist/linguist/messageeditor.h
+++ b/src/linguist/linguist/messageeditor.h
@@ -68,7 +68,7 @@ public:
void showNothing();
void showMessage(const MultiDataIndex &index);
void setNumerusForms(int model, const QStringList &numerusForms);
- bool eventFilter(QObject *, QEvent *);
+ bool eventFilter(QObject *, QEvent *) override;
void setTranslation(int model, const QString &translation, int numerus);
int activeModel() const { return (m_editors.count() != 1) ? m_currentModel : 0; }
void setEditorFocus(int model);
diff --git a/src/linguist/linguist/messageeditorwidgets.cpp b/src/linguist/linguist/messageeditorwidgets.cpp
index 6880f50fc..6bcf41b75 100644
--- a/src/linguist/linguist/messageeditorwidgets.cpp
+++ b/src/linguist/linguist/messageeditorwidgets.cpp
@@ -233,7 +233,7 @@ public:
}
protected:
- virtual bool eventFilter(QObject *object, QEvent *event)
+ bool eventFilter(QObject *object, QEvent *event) override
{
if (event->type() == QEvent::Resize) {
QWidget *relator = static_cast<QWidget *>(object);
diff --git a/src/linguist/linguist/messageeditorwidgets.h b/src/linguist/linguist/messageeditorwidgets.h
index 0e17af518..086c4ec2d 100644
--- a/src/linguist/linguist/messageeditorwidgets.h
+++ b/src/linguist/linguist/messageeditorwidgets.h
@@ -59,8 +59,8 @@ class ExpandingTextEdit : public QTextEdit
public:
ExpandingTextEdit(QWidget *parent = 0);
- QSize sizeHint() const;
- QSize minimumSizeHint() const;
+ QSize sizeHint() const override;
+ QSize minimumSizeHint() const override;
private slots:
void updateHeight(const QSizeF &documentSize);
@@ -147,7 +147,7 @@ signals:
void cursorPositionChanged();
protected:
- bool eventFilter(QObject *watched, QEvent *event);
+ bool eventFilter(QObject *watched, QEvent *event) override;
private slots:
void slotTextChanged();
diff --git a/src/linguist/linguist/messagehighlighter.h b/src/linguist/linguist/messagehighlighter.h
index 5b9221939..861ee844b 100644
--- a/src/linguist/linguist/messagehighlighter.h
+++ b/src/linguist/linguist/messagehighlighter.h
@@ -44,7 +44,7 @@ public:
MessageHighlighter(QTextEdit *textEdit);
protected:
- void highlightBlock(const QString &text);
+ void highlightBlock(const QString &text) override;
private:
enum Construct {
diff --git a/src/linguist/linguist/messagemodel.h b/src/linguist/linguist/messagemodel.h
index 85a05f28d..3eadf5193 100644
--- a/src/linguist/linguist/messagemodel.h
+++ b/src/linguist/linguist/messagemodel.h
@@ -496,11 +496,11 @@ public:
MessageModel(QObject *parent, MultiDataModel *data);
// QAbstractItemModel
- QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
- QModelIndex parent(const QModelIndex& index) const;
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- int columnCount(const QModelIndex &parent = QModelIndex()) const;
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex& index) const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
// Convenience
MultiDataIndex dataIndex(const QModelIndex &index, int model) const;
diff --git a/src/linguist/linguist/phrasebookbox.h b/src/linguist/linguist/phrasebookbox.h
index 118c90a15..85a71d835 100644
--- a/src/linguist/linguist/phrasebookbox.h
+++ b/src/linguist/linguist/phrasebookbox.h
@@ -47,7 +47,7 @@ public:
PhraseBookBox(PhraseBook *phraseBook, QWidget *parent = 0);
protected:
- bool eventFilter(QObject *obj, QEvent *event);
+ bool eventFilter(QObject *obj, QEvent *event) override;
private slots:
void newPhrase();
diff --git a/src/linguist/linguist/phrasemodel.h b/src/linguist/linguist/phrasemodel.h
index 190ac2e02..8fc165386 100644
--- a/src/linguist/linguist/phrasemodel.h
+++ b/src/linguist/linguist/phrasemodel.h
@@ -54,22 +54,22 @@ public:
Phrase *phrase(const QModelIndex &index) const;
void setPhrase(const QModelIndex &indx, Phrase *ph);
QModelIndex index(Phrase * const phr) const;
- QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override
{ return QAbstractTableModel::index(row, column, parent); }
// from qabstracttablemodel
- int rowCount(const QModelIndex &) const;
- int columnCount(const QModelIndex &) const;
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ int rowCount(const QModelIndex &) const override;
+ int columnCount(const QModelIndex &) const override;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QVariant headerData(int section, Qt::Orientation orientation,
- int role = Qt::DisplayRole) const;
- Qt::ItemFlags flags(const QModelIndex &index) const;
+ int role = Qt::DisplayRole) const override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value,
- int role = Qt::EditRole);
+ int role = Qt::EditRole) override;
// HACK: This model will be displayed in a _TreeView_
// which has a tendency to expand 'children' on double click
- bool hasChildren(const QModelIndex &parent) const
+ bool hasChildren(const QModelIndex &parent) const override
{ return !parent.isValid(); }
private:
diff --git a/src/linguist/linguist/phraseview.h b/src/linguist/linguist/phraseview.h
index 708105db3..9f773c0b0 100644
--- a/src/linguist/linguist/phraseview.h
+++ b/src/linguist/linguist/phraseview.h
@@ -86,9 +86,9 @@ signals:
protected:
// QObject
- virtual void contextMenuEvent(QContextMenuEvent *event);
+ void contextMenuEvent(QContextMenuEvent *event) override;
// QAbstractItemView
- virtual void mouseDoubleClickEvent(QMouseEvent *event);
+ void mouseDoubleClickEvent(QMouseEvent *event) override;
private slots:
void guessShortcut(int nkey);
diff --git a/src/linguist/linguist/translatedialog.h b/src/linguist/linguist/translatedialog.h
index c3887fa7a..fb086c8a4 100644
--- a/src/linguist/linguist/translatedialog.h
+++ b/src/linguist/linguist/translatedialog.h
@@ -58,7 +58,7 @@ signals:
void activated(int mode);
protected:
- virtual void showEvent(QShowEvent *event);
+ void showEvent(QShowEvent *event) override;
private slots:
void emitFindNext();
diff --git a/src/linguist/linguist/translationsettingsdialog.h b/src/linguist/linguist/translationsettingsdialog.h
index 7e3f2b22e..33340ea6f 100644
--- a/src/linguist/linguist/translationsettingsdialog.h
+++ b/src/linguist/linguist/translationsettingsdialog.h
@@ -49,7 +49,7 @@ public:
void setPhraseBook(PhraseBook *phraseBook);
private:
- virtual void showEvent(QShowEvent *e);
+ void showEvent(QShowEvent *e) override;
private slots:
void on_buttonBox_accepted();
diff --git a/src/linguist/lprodump/main.cpp b/src/linguist/lprodump/main.cpp
index c88887ea2..a7fb56deb 100644
--- a/src/linguist/lprodump/main.cpp
+++ b/src/linguist/lprodump/main.cpp
@@ -121,13 +121,13 @@ static void print(const QString &fileName, int lineNo, const QString &msg)
class EvalHandler : public QMakeHandler {
public:
- virtual void message(int type, const QString &msg, const QString &fileName, int lineNo)
+ void message(int type, const QString &msg, const QString &fileName, int lineNo) override
{
if (verbose && !(type & CumulativeEvalMessage) && (type & CategoryMask) == ErrorMessage)
print(fileName, lineNo, msg);
}
- virtual void fileMessage(int type, const QString &msg)
+ void fileMessage(int type, const QString &msg) override
{
if (verbose && !(type & CumulativeEvalMessage) && (type & CategoryMask) == ErrorMessage) {
// "Downgrade" errors, as we don't really care for them
@@ -135,8 +135,8 @@ public:
}
}
- virtual void aboutToEval(ProFile *, ProFile *, EvalFileType) {}
- virtual void doneWithEval(ProFile *) {}
+ void aboutToEval(ProFile *, ProFile *, EvalFileType) override {}
+ void doneWithEval(ProFile *) override {}
bool verbose = true;
};
diff --git a/src/linguist/lupdate/qdeclarative.cpp b/src/linguist/lupdate/qdeclarative.cpp
index 468a5258c..3cee00266 100644
--- a/src/linguist/lupdate/qdeclarative.cpp
+++ b/src/linguist/lupdate/qdeclarative.cpp
@@ -91,7 +91,7 @@ protected:
void accept(AST::Node *node)
{ AST::Node::acceptChild(node, this); }
- void endVisit(AST::CallExpression *node)
+ void endVisit(AST::CallExpression *node) override
{
QString name;
AST::ExpressionNode *base = node->base;
@@ -220,7 +220,7 @@ protected:
}
}
- virtual void postVisit(AST::Node *node);
+ void postVisit(AST::Node *node) override;
private:
std::ostream &yyMsg(int line)
diff --git a/src/qdbus/qdbusviewer/logviewer.h b/src/qdbus/qdbusviewer/logviewer.h
index 432d27f94..4f56387bb 100644
--- a/src/qdbus/qdbusviewer/logviewer.h
+++ b/src/qdbus/qdbusviewer/logviewer.h
@@ -38,7 +38,7 @@ public:
explicit LogViewer(QWidget *parent = 0);
protected:
- virtual void contextMenuEvent(QContextMenuEvent *event);
+ void contextMenuEvent(QContextMenuEvent *event) override;
};
#endif // LOGVIEWER_H
diff --git a/src/qdbus/qdbusviewer/propertydialog.h b/src/qdbus/qdbusviewer/propertydialog.h
index 6621c60fd..086a3e130 100644
--- a/src/qdbus/qdbusviewer/propertydialog.h
+++ b/src/qdbus/qdbusviewer/propertydialog.h
@@ -45,7 +45,7 @@ public:
QList<QVariant> values() const;
- int exec();
+ int exec() override;
private:
QLabel *label;
diff --git a/src/qdbus/qdbusviewer/qdbusmodel.h b/src/qdbus/qdbusviewer/qdbusmodel.h
index 555245735..44b9fdad8 100644
--- a/src/qdbus/qdbusviewer/qdbusmodel.h
+++ b/src/qdbus/qdbusviewer/qdbusmodel.h
@@ -49,12 +49,13 @@ public:
QDBusModel(const QString &service, const QDBusConnection &connection);
~QDBusModel();
- QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
- QModelIndex parent(const QModelIndex &child) const;
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- int columnCount(const QModelIndex &parent = QModelIndex()) const;
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex &child) const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
Type itemType(const QModelIndex &index) const;
QString dBusPath(const QModelIndex &index) const;
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp
index 83f1ae7d8..a581b55d2 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -63,7 +63,7 @@ public:
: QDBusModel(service, connection)
{}
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override
{
if (role == Qt::FontRole && itemType(index) == InterfaceItem) {
QFont f;
diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp
index b44f06103..6d72f9f84 100644
--- a/src/shared/deviceskin/deviceskin.cpp
+++ b/src/shared/deviceskin/deviceskin.cpp
@@ -354,8 +354,8 @@ public:
bool handleMouseEvent(QEvent *ev);
protected:
- bool event( QEvent *);
- bool eventFilter( QObject*, QEvent *);
+ bool event(QEvent *) override;
+ bool eventFilter(QObject*, QEvent *) override;
private:
QWidget *mouseRecipient;
diff --git a/src/shared/qtgradienteditor/qtcolorbutton.h b/src/shared/qtgradienteditor/qtcolorbutton.h
index 65aa67701..892b7d465 100644
--- a/src/shared/qtgradienteditor/qtcolorbutton.h
+++ b/src/shared/qtgradienteditor/qtcolorbutton.h
@@ -64,13 +64,13 @@ public slots:
signals:
void colorChanged(const QColor &color);
protected:
- void paintEvent(QPaintEvent *event);
- void mousePressEvent(QMouseEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
+ void paintEvent(QPaintEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
#ifndef QT_NO_DRAGANDDROP
- void dragEnterEvent(QDragEnterEvent *event);
- void dragLeaveEvent(QDragLeaveEvent *event);
- void dropEvent(QDropEvent *event);
+ void dragEnterEvent(QDragEnterEvent *event) override;
+ void dragLeaveEvent(QDragLeaveEvent *event) override;
+ void dropEvent(QDropEvent *event) override;
#endif
private:
QScopedPointer<class QtColorButtonPrivate> d_ptr;
diff --git a/src/shared/qtgradienteditor/qtcolorline.h b/src/shared/qtgradienteditor/qtcolorline.h
index 8a9aec90c..a9d0d191c 100644
--- a/src/shared/qtgradienteditor/qtcolorline.h
+++ b/src/shared/qtgradienteditor/qtcolorline.h
@@ -67,8 +67,8 @@ public:
};
Q_ENUM(ColorComponent)
- QSize minimumSizeHint() const;
- QSize sizeHint() const;
+ QSize minimumSizeHint() const override;
+ QSize sizeHint() const override;
QtColorLine(QWidget *parent = 0);
~QtColorLine();
@@ -103,12 +103,12 @@ signals:
protected:
- void resizeEvent(QResizeEvent *event);
- void paintEvent(QPaintEvent *event);
- void mousePressEvent(QMouseEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
- void mouseReleaseEvent(QMouseEvent *event);
- void mouseDoubleClickEvent(QMouseEvent *event);
+ void resizeEvent(QResizeEvent *event) override;
+ void paintEvent(QPaintEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *event) override;
+ void mouseDoubleClickEvent(QMouseEvent *event) override;
private:
diff --git a/src/shared/qtgradienteditor/qtgradientstopswidget.h b/src/shared/qtgradienteditor/qtgradientstopswidget.h
index d3593ae81..025f72846 100644
--- a/src/shared/qtgradienteditor/qtgradientstopswidget.h
+++ b/src/shared/qtgradienteditor/qtgradientstopswidget.h
@@ -55,8 +55,8 @@ public:
QtGradientStopsWidget(QWidget *parent = 0);
~QtGradientStopsWidget();
- QSize minimumSizeHint() const;
- QSize sizeHint() const;
+ QSize minimumSizeHint() const override;
+ QSize sizeHint() const override;
bool isBackgroundCheckered() const;
void setBackgroundCheckered(bool checkered);
@@ -71,21 +71,21 @@ signals:
void zoomChanged(double zoom);
protected:
- void paintEvent(QPaintEvent *e);
- void mousePressEvent(QMouseEvent *e);
- void mouseReleaseEvent(QMouseEvent *e);
- void mouseMoveEvent(QMouseEvent *e);
- void mouseDoubleClickEvent(QMouseEvent *e);
- void keyPressEvent(QKeyEvent *e);
- void focusInEvent(QFocusEvent *e);
- void focusOutEvent(QFocusEvent *e);
- void contextMenuEvent(QContextMenuEvent *e);
- void wheelEvent(QWheelEvent *e);
+ void paintEvent(QPaintEvent *e) override;
+ void mousePressEvent(QMouseEvent *e) override;
+ void mouseReleaseEvent(QMouseEvent *e) override;
+ void mouseMoveEvent(QMouseEvent *e) override;
+ void mouseDoubleClickEvent(QMouseEvent *e) override;
+ void keyPressEvent(QKeyEvent *e) override;
+ void focusInEvent(QFocusEvent *e) override;
+ void focusOutEvent(QFocusEvent *e) override;
+ void contextMenuEvent(QContextMenuEvent *e) override;
+ void wheelEvent(QWheelEvent *e) override;
#ifndef QT_NO_DRAGANDDROP
- void dragEnterEvent(QDragEnterEvent *event);
- void dragMoveEvent(QDragMoveEvent *event);
- void dragLeaveEvent(QDragLeaveEvent *event);
- void dropEvent(QDropEvent *event);
+ void dragEnterEvent(QDragEnterEvent *event) override;
+ void dragMoveEvent(QDragMoveEvent *event) override;
+ void dragLeaveEvent(QDragLeaveEvent *event) override;
+ void dropEvent(QDropEvent *event) override;
#endif
private:
diff --git a/src/shared/qtgradienteditor/qtgradientwidget.h b/src/shared/qtgradienteditor/qtgradientwidget.h
index 2c701b28c..a5609e77b 100644
--- a/src/shared/qtgradienteditor/qtgradientwidget.h
+++ b/src/shared/qtgradienteditor/qtgradientwidget.h
@@ -52,9 +52,9 @@ public:
QtGradientWidget(QWidget *parent = 0);
~QtGradientWidget();
- QSize minimumSizeHint() const;
- QSize sizeHint() const;
- int heightForWidth(int w) const;
+ QSize minimumSizeHint() const override;
+ QSize sizeHint() const override;
+ int heightForWidth(int w) const override;
bool isBackgroundCheckered() const;
void setBackgroundCheckered(bool checkered);
@@ -101,11 +101,11 @@ signals:
void angleConicalChanged(qreal angle);
protected:
- void paintEvent(QPaintEvent *e);
- void mousePressEvent(QMouseEvent *e);
- void mouseReleaseEvent(QMouseEvent *e);
- void mouseMoveEvent(QMouseEvent *e);
- void mouseDoubleClickEvent(QMouseEvent *e);
+ void paintEvent(QPaintEvent *e) override;
+ void mousePressEvent(QMouseEvent *e) override;
+ void mouseReleaseEvent(QMouseEvent *e) override;
+ void mouseMoveEvent(QMouseEvent *e) override;
+ void mouseDoubleClickEvent(QMouseEvent *e) override;
private:
QScopedPointer<class QtGradientWidgetPrivate> d_ptr;
diff --git a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.h b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
index d97613153..f76d476c5 100644
--- a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
+++ b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
@@ -63,9 +63,9 @@ Q_SIGNALS:
void expanded(QtBrowserItem *item);
protected:
- virtual void itemInserted(QtBrowserItem *item, QtBrowserItem *afterItem);
- virtual void itemRemoved(QtBrowserItem *item);
- virtual void itemChanged(QtBrowserItem *item);
+ void itemInserted(QtBrowserItem *item, QtBrowserItem *afterItem) override;
+ void itemRemoved(QtBrowserItem *item) override;
+ void itemChanged(QtBrowserItem *item) override;
private:
diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp
index ca20003e1..5ec9d7be2 100644
--- a/src/shared/qtpropertybrowser/qteditorfactory.cpp
+++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp
@@ -1507,17 +1507,17 @@ public:
QtCharEdit(QWidget *parent = 0);
QChar value() const;
- bool eventFilter(QObject *o, QEvent *e);
+ bool eventFilter(QObject *o, QEvent *e) override;
public Q_SLOTS:
void setValue(const QChar &value);
Q_SIGNALS:
void valueChanged(const QChar &value);
protected:
- void focusInEvent(QFocusEvent *e);
- void focusOutEvent(QFocusEvent *e);
- void keyPressEvent(QKeyEvent *e);
- void keyReleaseEvent(QKeyEvent *e);
- bool event(QEvent *e);
+ void focusInEvent(QFocusEvent *e) override;
+ void focusOutEvent(QFocusEvent *e) override;
+ void keyPressEvent(QKeyEvent *e) override;
+ void keyReleaseEvent(QKeyEvent *e) override;
+ bool event(QEvent *e) override;
private slots:
void slotClearChar();
private:
@@ -2123,7 +2123,7 @@ class QtColorEditWidget : public QWidget {
public:
QtColorEditWidget(QWidget *parent);
- bool eventFilter(QObject *obj, QEvent *ev);
+ bool eventFilter(QObject *obj, QEvent *ev) override;
public Q_SLOTS:
void setValue(const QColor &value);
@@ -2320,7 +2320,7 @@ class QtFontEditWidget : public QWidget {
public:
QtFontEditWidget(QWidget *parent);
- bool eventFilter(QObject *obj, QEvent *ev);
+ bool eventFilter(QObject *obj, QEvent *ev) override;
public Q_SLOTS:
void setValue(const QFont &value);
diff --git a/src/shared/qtpropertybrowser/qteditorfactory.h b/src/shared/qtpropertybrowser/qteditorfactory.h
index 03104ff97..5a2095bef 100644
--- a/src/shared/qtpropertybrowser/qteditorfactory.h
+++ b/src/shared/qtpropertybrowser/qteditorfactory.h
@@ -55,10 +55,10 @@ public:
QtSpinBoxFactory(QObject *parent = 0);
~QtSpinBoxFactory();
protected:
- void connectPropertyManager(QtIntPropertyManager *manager);
+ void connectPropertyManager(QtIntPropertyManager *manager) override;
QWidget *createEditor(QtIntPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtIntPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtIntPropertyManager *manager) override;
private:
QScopedPointer<QtSpinBoxFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtSpinBoxFactory)
@@ -79,10 +79,10 @@ public:
QtSliderFactory(QObject *parent = 0);
~QtSliderFactory();
protected:
- void connectPropertyManager(QtIntPropertyManager *manager);
+ void connectPropertyManager(QtIntPropertyManager *manager) override;
QWidget *createEditor(QtIntPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtIntPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtIntPropertyManager *manager) override;
private:
QScopedPointer<QtSliderFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtSliderFactory)
@@ -103,10 +103,10 @@ public:
QtScrollBarFactory(QObject *parent = 0);
~QtScrollBarFactory();
protected:
- void connectPropertyManager(QtIntPropertyManager *manager);
+ void connectPropertyManager(QtIntPropertyManager *manager) override;
QWidget *createEditor(QtIntPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtIntPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtIntPropertyManager *manager) override;
private:
QScopedPointer<QtScrollBarFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtScrollBarFactory)
@@ -127,10 +127,10 @@ public:
QtCheckBoxFactory(QObject *parent = 0);
~QtCheckBoxFactory();
protected:
- void connectPropertyManager(QtBoolPropertyManager *manager);
+ void connectPropertyManager(QtBoolPropertyManager *manager) override;
QWidget *createEditor(QtBoolPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtBoolPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtBoolPropertyManager *manager) override;
private:
QScopedPointer<QtCheckBoxFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtCheckBoxFactory)
@@ -149,10 +149,10 @@ public:
QtDoubleSpinBoxFactory(QObject *parent = 0);
~QtDoubleSpinBoxFactory();
protected:
- void connectPropertyManager(QtDoublePropertyManager *manager);
+ void connectPropertyManager(QtDoublePropertyManager *manager) override;
QWidget *createEditor(QtDoublePropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtDoublePropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtDoublePropertyManager *manager) override;
private:
QScopedPointer<QtDoubleSpinBoxFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory)
@@ -174,10 +174,10 @@ public:
QtLineEditFactory(QObject *parent = 0);
~QtLineEditFactory();
protected:
- void connectPropertyManager(QtStringPropertyManager *manager);
+ void connectPropertyManager(QtStringPropertyManager *manager) override;
QWidget *createEditor(QtStringPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtStringPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtStringPropertyManager *manager) override;
private:
QScopedPointer<QtLineEditFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtLineEditFactory)
@@ -197,10 +197,10 @@ public:
QtDateEditFactory(QObject *parent = 0);
~QtDateEditFactory();
protected:
- void connectPropertyManager(QtDatePropertyManager *manager);
+ void connectPropertyManager(QtDatePropertyManager *manager) override;
QWidget *createEditor(QtDatePropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtDatePropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtDatePropertyManager *manager) override;
private:
QScopedPointer<QtDateEditFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtDateEditFactory)
@@ -221,10 +221,10 @@ public:
QtTimeEditFactory(QObject *parent = 0);
~QtTimeEditFactory();
protected:
- void connectPropertyManager(QtTimePropertyManager *manager);
+ void connectPropertyManager(QtTimePropertyManager *manager) override;
QWidget *createEditor(QtTimePropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtTimePropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtTimePropertyManager *manager) override;
private:
QScopedPointer<QtTimeEditFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtTimeEditFactory)
@@ -243,10 +243,10 @@ public:
QtDateTimeEditFactory(QObject *parent = 0);
~QtDateTimeEditFactory();
protected:
- void connectPropertyManager(QtDateTimePropertyManager *manager);
+ void connectPropertyManager(QtDateTimePropertyManager *manager) override;
QWidget *createEditor(QtDateTimePropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtDateTimePropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtDateTimePropertyManager *manager) override;
private:
QScopedPointer<QtDateTimeEditFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtDateTimeEditFactory)
@@ -265,10 +265,10 @@ public:
QtKeySequenceEditorFactory(QObject *parent = 0);
~QtKeySequenceEditorFactory();
protected:
- void connectPropertyManager(QtKeySequencePropertyManager *manager);
+ void connectPropertyManager(QtKeySequencePropertyManager *manager) override;
QWidget *createEditor(QtKeySequencePropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtKeySequencePropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtKeySequencePropertyManager *manager) override;
private:
QScopedPointer<QtKeySequenceEditorFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory)
@@ -287,10 +287,10 @@ public:
QtCharEditorFactory(QObject *parent = 0);
~QtCharEditorFactory();
protected:
- void connectPropertyManager(QtCharPropertyManager *manager);
+ void connectPropertyManager(QtCharPropertyManager *manager) override;
QWidget *createEditor(QtCharPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtCharPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtCharPropertyManager *manager) override;
private:
QScopedPointer<QtCharEditorFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtCharEditorFactory)
@@ -309,10 +309,10 @@ public:
QtEnumEditorFactory(QObject *parent = 0);
~QtEnumEditorFactory();
protected:
- void connectPropertyManager(QtEnumPropertyManager *manager);
+ void connectPropertyManager(QtEnumPropertyManager *manager) override;
QWidget *createEditor(QtEnumPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtEnumPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtEnumPropertyManager *manager) override;
private:
QScopedPointer<QtEnumEditorFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtEnumEditorFactory)
@@ -335,10 +335,10 @@ public:
QtCursorEditorFactory(QObject *parent = 0);
~QtCursorEditorFactory();
protected:
- void connectPropertyManager(QtCursorPropertyManager *manager);
+ void connectPropertyManager(QtCursorPropertyManager *manager) override;
QWidget *createEditor(QtCursorPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtCursorPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtCursorPropertyManager *manager) override;
private:
QScopedPointer<QtCursorEditorFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtCursorEditorFactory)
@@ -357,10 +357,10 @@ public:
QtColorEditorFactory(QObject *parent = 0);
~QtColorEditorFactory();
protected:
- void connectPropertyManager(QtColorPropertyManager *manager);
+ void connectPropertyManager(QtColorPropertyManager *manager) override;
QWidget *createEditor(QtColorPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtColorPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtColorPropertyManager *manager) override;
private:
QScopedPointer<QtColorEditorFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtColorEditorFactory)
@@ -379,10 +379,10 @@ public:
QtFontEditorFactory(QObject *parent = 0);
~QtFontEditorFactory();
protected:
- void connectPropertyManager(QtFontPropertyManager *manager);
+ void connectPropertyManager(QtFontPropertyManager *manager) override;
QWidget *createEditor(QtFontPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtFontPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtFontPropertyManager *manager) override;
private:
QScopedPointer<QtFontEditorFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtFontEditorFactory)
diff --git a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
index bb44a01b5..a42b8cf1d 100644
--- a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
+++ b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
@@ -55,9 +55,9 @@ public:
~QtGroupBoxPropertyBrowser();
protected:
- virtual void itemInserted(QtBrowserItem *item, QtBrowserItem *afterItem);
- virtual void itemRemoved(QtBrowserItem *item);
- virtual void itemChanged(QtBrowserItem *item);
+ void itemInserted(QtBrowserItem *item, QtBrowserItem *afterItem) override;
+ void itemRemoved(QtBrowserItem *item) override;
+ void itemChanged(QtBrowserItem *item) override;
private:
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.h b/src/shared/qtpropertybrowser/qtpropertybrowser.h
index 3781fdf58..b9a4a7e72 100644
--- a/src/shared/qtpropertybrowser/qtpropertybrowser.h
+++ b/src/shared/qtpropertybrowser/qtpropertybrowser.h
@@ -146,7 +146,7 @@ class QtAbstractEditorFactory : public QtAbstractEditorFactoryBase
{
public:
explicit QtAbstractEditorFactory(QObject *parent) : QtAbstractEditorFactoryBase(parent) {}
- QWidget *createEditor(QtProperty *property, QWidget *parent)
+ QWidget *createEditor(QtProperty *property, QWidget *parent) override
{
for (PropertyManager *manager : qAsConst(m_managers)) {
if (manager == property->propertyManager()) {
@@ -192,7 +192,7 @@ protected:
virtual QWidget *createEditor(PropertyManager *manager, QtProperty *property,
QWidget *parent) = 0;
virtual void disconnectPropertyManager(PropertyManager *manager) = 0;
- void managerDestroyed(QObject *manager)
+ void managerDestroyed(QObject *manager) override
{
for (PropertyManager *m : qAsConst(m_managers)) {
if (m == manager) {
@@ -202,7 +202,7 @@ protected:
}
}
private:
- void breakConnection(QtAbstractPropertyManager *manager)
+ void breakConnection(QtAbstractPropertyManager *manager) override
{
for (PropertyManager *m : qAsConst(m_managers)) {
if (m == manager) {
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h b/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
index d8d26299e..08de7f0d7 100644
--- a/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
+++ b/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
@@ -118,7 +118,7 @@ Q_SIGNALS:
void toggled(bool);
protected:
- void mousePressEvent(QMouseEvent * event);
+ void mousePressEvent(QMouseEvent * event) override;
private:
QCheckBox *m_checkBox;
diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.h b/src/shared/qtpropertybrowser/qtpropertymanager.h
index 736229f91..1c9caaed1 100644
--- a/src/shared/qtpropertybrowser/qtpropertymanager.h
+++ b/src/shared/qtpropertybrowser/qtpropertymanager.h
@@ -58,10 +58,10 @@ public:
~QtGroupPropertyManager();
protected:
- virtual bool hasValue(const QtProperty *property) const;
+ bool hasValue(const QtProperty *property) const override;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
};
class QtIntPropertyManagerPrivate;
@@ -89,9 +89,9 @@ Q_SIGNALS:
void rangeChanged(QtProperty *property, int minVal, int maxVal);
void singleStepChanged(QtProperty *property, int step);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtIntPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtIntPropertyManager)
@@ -114,10 +114,10 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, bool val);
protected:
- QString valueText(const QtProperty *property) const;
- QIcon valueIcon(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ QIcon valueIcon(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtBoolPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtBoolPropertyManager)
@@ -152,9 +152,9 @@ Q_SIGNALS:
void singleStepChanged(QtProperty *property, double step);
void decimalsChanged(QtProperty *property, int prec);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtDoublePropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtDoublePropertyManager)
@@ -180,9 +180,9 @@ Q_SIGNALS:
void valueChanged(QtProperty *property, const QString &val);
void regExpChanged(QtProperty *property, const QRegularExpression &regExp);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtStringPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtStringPropertyManager)
@@ -211,9 +211,9 @@ Q_SIGNALS:
void valueChanged(QtProperty *property, const QDate &val);
void rangeChanged(QtProperty *property, const QDate &minVal, const QDate &maxVal);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtDatePropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtDatePropertyManager)
@@ -236,9 +236,9 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, const QTime &val);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtTimePropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtTimePropertyManager)
@@ -261,9 +261,9 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, const QDateTime &val);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtDateTimePropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtDateTimePropertyManager)
@@ -286,9 +286,9 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, const QKeySequence &val);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtKeySequencePropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtKeySequencePropertyManager)
@@ -311,9 +311,9 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, const QChar &val);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtCharPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtCharPropertyManager)
@@ -339,9 +339,9 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, const QLocale &val);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtLocalePropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtLocalePropertyManager)
@@ -368,9 +368,9 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, const QPoint &val);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtPointPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtPointPropertyManager)
@@ -400,9 +400,9 @@ Q_SIGNALS:
void valueChanged(QtProperty *property, const QPointF &val);
void decimalsChanged(QtProperty *property, int prec);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtPointFPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtPointFPropertyManager)
@@ -435,9 +435,9 @@ Q_SIGNALS:
void valueChanged(QtProperty *property, const QSize &val);
void rangeChanged(QtProperty *property, const QSize &minVal, const QSize &maxVal);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtSizePropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtSizePropertyManager)
@@ -473,9 +473,9 @@ Q_SIGNALS:
void rangeChanged(QtProperty *property, const QSizeF &minVal, const QSizeF &maxVal);
void decimalsChanged(QtProperty *property, int prec);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtSizeFPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtSizeFPropertyManager)
@@ -505,9 +505,9 @@ Q_SIGNALS:
void valueChanged(QtProperty *property, const QRect &val);
void constraintChanged(QtProperty *property, const QRect &constraint);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtRectPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtRectPropertyManager)
@@ -540,9 +540,9 @@ Q_SIGNALS:
void constraintChanged(QtProperty *property, const QRectF &constraint);
void decimalsChanged(QtProperty *property, int prec);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtRectFPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtRectFPropertyManager)
@@ -573,10 +573,10 @@ Q_SIGNALS:
void enumNamesChanged(QtProperty *property, const QStringList &names);
void enumIconsChanged(QtProperty *property, const QMap<int, QIcon> &icons);
protected:
- QString valueText(const QtProperty *property) const;
- QIcon valueIcon(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ QIcon valueIcon(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtEnumPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtEnumPropertyManager)
@@ -604,9 +604,9 @@ Q_SIGNALS:
void valueChanged(QtProperty *property, int val);
void flagNamesChanged(QtProperty *property, const QStringList &names);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtFlagPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtFlagPropertyManager)
@@ -634,9 +634,9 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, const QSizePolicy &val);
protected:
- QString valueText(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtSizePolicyPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager)
@@ -666,10 +666,10 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, const QFont &val);
protected:
- QString valueText(const QtProperty *property) const;
- QIcon valueIcon(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ QIcon valueIcon(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtFontPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtFontPropertyManager)
@@ -700,10 +700,10 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, const QColor &val);
protected:
- QString valueText(const QtProperty *property) const;
- QIcon valueIcon(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ QIcon valueIcon(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtColorPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtColorPropertyManager)
@@ -730,10 +730,10 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(QtProperty *property, const QCursor &val);
protected:
- QString valueText(const QtProperty *property) const;
- QIcon valueIcon(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
+ QString valueText(const QtProperty *property) const override;
+ QIcon valueIcon(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
private:
QScopedPointer<QtCursorPropertyManagerPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtCursorPropertyManager)
diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
index d8f38cd12..318686952 100644
--- a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
@@ -125,9 +125,9 @@ public:
{ return itemFromIndex(index); }
protected:
- void keyPressEvent(QKeyEvent *event);
- void mousePressEvent(QMouseEvent *event);
- void drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+ void keyPressEvent(QKeyEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
QtTreePropertyBrowserPrivate *m_editorPrivate;
@@ -224,22 +224,22 @@ public:
{ m_editorPrivate = editorPrivate; }
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
- const QModelIndex &index) const;
+ const QModelIndex &index) const override;
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
- const QModelIndex &index) const;
+ const QModelIndex &index) const override;
void paint(QPainter *painter, const QStyleOptionViewItem &option,
- const QModelIndex &index) const;
+ const QModelIndex &index) const override;
- QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+ QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setModelData(QWidget *, QAbstractItemModel *,
- const QModelIndex &) const {}
+ const QModelIndex &) const override {}
- void setEditorData(QWidget *, const QModelIndex &) const {}
+ void setEditorData(QWidget *, const QModelIndex &) const override {}
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) override;
void closeEditor(QtProperty *property);
QTreeWidgetItem *editedItem() const { return m_editedItem; }
diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.h b/src/shared/qtpropertybrowser/qttreepropertybrowser.h
index e8716c898..ce2a04f04 100644
--- a/src/shared/qtpropertybrowser/qttreepropertybrowser.h
+++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.h
@@ -110,9 +110,9 @@ Q_SIGNALS:
void expanded(QtBrowserItem *item);
protected:
- virtual void itemInserted(QtBrowserItem *item, QtBrowserItem *afterItem);
- virtual void itemRemoved(QtBrowserItem *item);
- virtual void itemChanged(QtBrowserItem *item);
+ void itemInserted(QtBrowserItem *item, QtBrowserItem *afterItem) override;
+ void itemRemoved(QtBrowserItem *item) override;
+ void itemChanged(QtBrowserItem *item) override;
private:
diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.h b/src/shared/qtpropertybrowser/qtvariantproperty.h
index c3aff099f..2026f1569 100644
--- a/src/shared/qtpropertybrowser/qtvariantproperty.h
+++ b/src/shared/qtpropertybrowser/qtvariantproperty.h
@@ -104,12 +104,12 @@ Q_SIGNALS:
void attributeChanged(QtProperty *property,
const QString &attribute, const QVariant &val);
protected:
- virtual bool hasValue(const QtProperty *property) const;
- QString valueText(const QtProperty *property) const;
- QIcon valueIcon(const QtProperty *property) const;
- virtual void initializeProperty(QtProperty *property);
- virtual void uninitializeProperty(QtProperty *property);
- virtual QtProperty *createProperty();
+ bool hasValue(const QtProperty *property) const override;
+ QString valueText(const QtProperty *property) const override;
+ QIcon valueIcon(const QtProperty *property) const override;
+ void initializeProperty(QtProperty *property) override;
+ void uninitializeProperty(QtProperty *property) override;
+ QtProperty *createProperty() override;
private:
QScopedPointer<class QtVariantPropertyManagerPrivate> d_ptr;
Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, int))
@@ -160,10 +160,10 @@ public:
QtVariantEditorFactory(QObject *parent = 0);
~QtVariantEditorFactory();
protected:
- void connectPropertyManager(QtVariantPropertyManager *manager);
+ void connectPropertyManager(QtVariantPropertyManager *manager) override;
QWidget *createEditor(QtVariantPropertyManager *manager, QtProperty *property,
- QWidget *parent);
- void disconnectPropertyManager(QtVariantPropertyManager *manager);
+ QWidget *parent) override;
+ void disconnectPropertyManager(QtVariantPropertyManager *manager) override;
private:
QScopedPointer<class QtVariantEditorFactoryPrivate> d_ptr;
Q_DECLARE_PRIVATE(QtVariantEditorFactory)
diff --git a/src/shared/qttoolbardialog/qttoolbardialog.h b/src/shared/qttoolbardialog/qttoolbardialog.h
index b6d0defe0..2f937bc19 100644
--- a/src/shared/qttoolbardialog/qttoolbardialog.h
+++ b/src/shared/qttoolbardialog/qttoolbardialog.h
@@ -105,8 +105,8 @@ public:
protected:
- void showEvent(QShowEvent *event);
- void hideEvent(QHideEvent *event);
+ void showEvent(QShowEvent *event) override;
+ void hideEvent(QHideEvent *event) override;
private: