summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-12-14 03:20:58 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-12-14 12:28:34 +0000
commit8df4b1deec1296b562dacb6a0b5c84ed7fdb08cf (patch)
treef46cf70c39eb2bdeb8e57620ee93647f3d7a7bc7
parent380c6abac71d8d300e088943cf5ce757b378775e (diff)
Assistant: Add missing override and remove redundant virtual
Change-Id: I29ad763c013b9a41862c45a7e39b34d9c856ab04 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
-rw-r--r--src/assistant/assistant/aboutdialog.h6
-rw-r--r--src/assistant/assistant/bookmarkdialog.h2
-rw-r--r--src/assistant/assistant/bookmarkfiltermodel.h26
-rw-r--r--src/assistant/assistant/bookmarkmanager.h4
-rw-r--r--src/assistant/assistant/bookmarkmanagerwidget.h4
-rw-r--r--src/assistant/assistant/bookmarkmodel.h28
-rw-r--r--src/assistant/assistant/centralwidget.h6
-rw-r--r--src/assistant/assistant/contentwindow.h6
-rw-r--r--src/assistant/assistant/findwidget.h6
-rw-r--r--src/assistant/assistant/helpbrowsersupport.cpp14
-rw-r--r--src/assistant/assistant/helpviewer.h22
-rw-r--r--src/assistant/assistant/indexwindow.h4
-rw-r--r--src/assistant/assistant/mainwindow.h2
-rw-r--r--src/assistant/assistant/openpagesmodel.h6
-rw-r--r--src/assistant/assistant/openpagesswitcher.h6
-rw-r--r--src/assistant/assistant/openpageswidget.h4
-rw-r--r--src/assistant/assistant/qtdocinstaller.h2
-rw-r--r--src/assistant/assistant/searchwidget.h6
-rw-r--r--src/assistant/assistant/topicchooser.h2
-rw-r--r--src/assistant/help/qhelpcontentwidget.cpp2
-rw-r--r--src/assistant/help/qhelpcontentwidget.h10
-rw-r--r--src/assistant/help/qhelpengine_p.h2
-rw-r--r--src/assistant/help/qhelpindexwidget.cpp2
-rw-r--r--src/assistant/help/qhelpprojectdata_p.h12
-rw-r--r--src/assistant/help/qhelpsearchindexreader_clucene_p.h2
-rw-r--r--src/assistant/help/qhelpsearchindexreader_default_p.h2
-rw-r--r--src/assistant/help/qhelpsearchindexreader_p.h2
-rw-r--r--src/assistant/help/qhelpsearchindexwriter_clucene_p.h2
-rw-r--r--src/assistant/help/qhelpsearchindexwriter_default_p.h2
-rw-r--r--src/assistant/help/qhelpsearchquerywidget.cpp6
-rw-r--r--src/assistant/help/qhelpsearchquerywidget.h4
-rw-r--r--src/assistant/help/qhelpsearchresultwidget.cpp2
-rw-r--r--src/assistant/help/qhelpsearchresultwidget.h2
-rw-r--r--src/assistant/qhelpconverter/conversionwizard.h4
-rw-r--r--src/assistant/qhelpconverter/filespage.h2
-rw-r--r--src/assistant/qhelpconverter/filterpage.h2
-rw-r--r--src/assistant/qhelpconverter/generalpage.h4
-rw-r--r--src/assistant/qhelpconverter/inputpage.h2
-rw-r--r--src/assistant/qhelpconverter/outputpage.h4
39 files changed, 113 insertions, 113 deletions
diff --git a/src/assistant/assistant/aboutdialog.h b/src/assistant/assistant/aboutdialog.h
index 68661ac23..65e5cd7e9 100644
--- a/src/assistant/assistant/aboutdialog.h
+++ b/src/assistant/assistant/aboutdialog.h
@@ -45,11 +45,11 @@ class AboutLabel : public QTextBrowser
public:
AboutLabel(QWidget *parent = 0);
void setText(const QString &text, const QByteArray &resources);
- QSize minimumSizeHint() const;
+ QSize minimumSizeHint() const override;
private:
- QVariant loadResource(int type, const QUrl &name);
- void setSource(const QUrl &url);
+ QVariant loadResource(int type, const QUrl &name) override;
+ void setSource(const QUrl &url) override;
QMap<QString, QByteArray> m_resourceMap;
};
diff --git a/src/assistant/assistant/bookmarkdialog.h b/src/assistant/assistant/bookmarkdialog.h
index 5db2af996..3bac1cb5b 100644
--- a/src/assistant/assistant/bookmarkdialog.h
+++ b/src/assistant/assistant/bookmarkdialog.h
@@ -46,7 +46,7 @@ public:
private:
bool isRootItem(const QModelIndex &index) const;
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) override;
private slots:
void currentIndexChanged(int index);
diff --git a/src/assistant/assistant/bookmarkfiltermodel.h b/src/assistant/assistant/bookmarkfiltermodel.h
index a8ab770c2..8f154f4c6 100644
--- a/src/assistant/assistant/bookmarkfiltermodel.h
+++ b/src/assistant/assistant/bookmarkfiltermodel.h
@@ -46,22 +46,22 @@ class BookmarkFilterModel : public QAbstractProxyModel
public:
explicit BookmarkFilterModel(QObject *parent = 0);
- void setSourceModel(QAbstractItemModel *sourceModel);
+ void setSourceModel(QAbstractItemModel *sourceModel) override;
- int rowCount(const QModelIndex &index) const;
- int columnCount(const QModelIndex &index) const;
+ int rowCount(const QModelIndex &index) const override;
+ int columnCount(const QModelIndex &index) const override;
- QModelIndex mapToSource(const QModelIndex &proxyIndex) const;
- QModelIndex mapFromSource(const QModelIndex &sourceIndex) const;
+ QModelIndex mapToSource(const QModelIndex &proxyIndex) const override;
+ QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override;
- QModelIndex parent(const QModelIndex &child) const;
- QModelIndex index(int row, int column, const QModelIndex &parent) const;
+ QModelIndex parent(const QModelIndex &child) const override;
+ QModelIndex index(int row, int column, const QModelIndex &parent) const override;
- Qt::DropActions supportedDropActions () const;
- Qt::ItemFlags flags(const QModelIndex &index) const;
+ Qt::DropActions supportedDropActions () const override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
- QVariant data(const QModelIndex &index, int role) const;
- bool setData(const QModelIndex &index, const QVariant &value, int role);
+ QVariant data(const QModelIndex &index, int role) const override;
+ bool setData(const QModelIndex &index, const QVariant &value, int role) override;
void filterBookmarks();
void filterBookmarkFolders();
@@ -94,10 +94,10 @@ class BookmarkTreeModel : public QSortFilterProxyModel
Q_OBJECT
public:
BookmarkTreeModel(QObject *parent = 0);
- int columnCount(const QModelIndex &parent = QModelIndex()) const;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const override;
protected:
- bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+ bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
};
QT_END_NAMESPACE
diff --git a/src/assistant/assistant/bookmarkmanager.h b/src/assistant/assistant/bookmarkmanager.h
index 6c4693f94..a9637eaa7 100644
--- a/src/assistant/assistant/bookmarkmanager.h
+++ b/src/assistant/assistant/bookmarkmanager.h
@@ -71,7 +71,7 @@ private:
~BookmarkManager();
void removeItem(const QModelIndex &index);
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) override;
void buildBookmarksMenu(const QModelIndex &index, QMenu *menu);
void showBookmarkDialog(const QString &name, const QString &url);
@@ -126,7 +126,7 @@ signals:
void focusInEvent();
private:
- void focusInEvent(QFocusEvent *event);
+ void focusInEvent(QFocusEvent *event) override;
};
class BookmarkManager::BookmarkTreeView : public QTreeView
diff --git a/src/assistant/assistant/bookmarkmanagerwidget.h b/src/assistant/assistant/bookmarkmanagerwidget.h
index a5c32c7eb..231bb4b25 100644
--- a/src/assistant/assistant/bookmarkmanagerwidget.h
+++ b/src/assistant/assistant/bookmarkmanagerwidget.h
@@ -49,7 +49,7 @@ public:
~BookmarkManagerWidget();
protected:
- void closeEvent(QCloseEvent *event);
+ void closeEvent(QCloseEvent *event) override;
signals:
void setSource(const QUrl &url);
@@ -60,7 +60,7 @@ signals:
private:
void renameItem(const QModelIndex &index);
void selectNextIndex(bool direction) const;
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) override;
private slots:
void findNext();
diff --git a/src/assistant/assistant/bookmarkmodel.h b/src/assistant/assistant/bookmarkmodel.h
index a14479416..15965510b 100644
--- a/src/assistant/assistant/bookmarkmodel.h
+++ b/src/assistant/assistant/bookmarkmodel.h
@@ -56,31 +56,31 @@ public:
QModelIndex addItem(const QModelIndex &parent, bool isFolder = false);
bool removeItem(const QModelIndex &index);
- int rowCount(const QModelIndex &index = QModelIndex()) const;
- int columnCount(const QModelIndex &index = QModelIndex()) const;
+ int rowCount(const QModelIndex &index = QModelIndex()) const override;
+ int columnCount(const QModelIndex &index = QModelIndex()) const override;
- QModelIndex parent(const QModelIndex &index) const;
- QModelIndex index(int row, int column, const QModelIndex &index) const;
+ QModelIndex parent(const QModelIndex &index) const override;
+ QModelIndex index(int row, int column, const QModelIndex &index) const override;
- Qt::DropActions supportedDropActions () const;
- Qt::ItemFlags flags(const QModelIndex &index) const;
+ Qt::DropActions supportedDropActions () const override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
- QVariant data(const QModelIndex &index, int role) const;
+ QVariant data(const QModelIndex &index, int role) const override;
void setData(const QModelIndex &index, const QVector<QVariant> &data);
- bool setData(const QModelIndex &index, const QVariant &value, int role);
- QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+ bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+ QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
QModelIndex indexFromItem(BookmarkItem *item) const;
BookmarkItem *itemFromIndex(const QModelIndex &index) const;
QList<QPersistentModelIndex> indexListFor(const QString &label) const;
- bool insertRows(int position, int rows, const QModelIndex &parent);
- bool removeRows(int position, int rows, const QModelIndex &parent);
+ bool insertRows(int position, int rows, const QModelIndex &parent) override;
+ bool removeRows(int position, int rows, const QModelIndex &parent) override;
- QStringList mimeTypes() const;
- QMimeData* mimeData(const QModelIndexList &indexes) const;
+ QStringList mimeTypes() const override;
+ QMimeData* mimeData(const QModelIndexList &indexes) const override;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row,
- int column, const QModelIndex &parent);
+ int column, const QModelIndex &parent) override;
private:
void setupCache(const QModelIndex &parent);
diff --git a/src/assistant/assistant/centralwidget.h b/src/assistant/assistant/centralwidget.h
index 19d06e529..f61eb800a 100644
--- a/src/assistant/assistant/centralwidget.h
+++ b/src/assistant/assistant/centralwidget.h
@@ -135,8 +135,8 @@ signals:
void addBookmark(const QString &title, const QString &url);
protected:
- void keyPressEvent(QKeyEvent *);
- void focusInEvent(QFocusEvent *event);
+ void keyPressEvent(QKeyEvent *) override;
+ void focusInEvent(QFocusEvent *event) override;
private slots:
void highlightSearchTerms();
@@ -147,7 +147,7 @@ private slots:
private:
void initPrinter();
void connectSignals(HelpViewer *page);
- bool eventFilter(QObject *object, QEvent *e);
+ bool eventFilter(QObject *object, QEvent *e) override;
void removePage(int index);
void setCurrentPage(HelpViewer *page);
diff --git a/src/assistant/assistant/contentwindow.h b/src/assistant/assistant/contentwindow.h
index 5a1c2fc38..30b2b80c4 100644
--- a/src/assistant/assistant/contentwindow.h
+++ b/src/assistant/assistant/contentwindow.h
@@ -60,9 +60,9 @@ private slots:
void itemClicked(const QModelIndex &index);
private:
- void focusInEvent(QFocusEvent *e);
- void keyPressEvent(QKeyEvent *e);
- bool eventFilter(QObject *o, QEvent *e);
+ void focusInEvent(QFocusEvent *e) override;
+ void keyPressEvent(QKeyEvent *e) override;
+ bool eventFilter(QObject *o, QEvent *e) override;
QHelpContentWidget * const m_contentWidget;
int m_expandDepth;
diff --git a/src/assistant/assistant/findwidget.h b/src/assistant/assistant/findwidget.h
index b6f80d78e..9b3e3ffbd 100644
--- a/src/assistant/assistant/findwidget.h
+++ b/src/assistant/assistant/findwidget.h
@@ -60,15 +60,15 @@ signals:
void find(const QString &text, bool forward, bool incremental);
protected:
- void hideEvent(QHideEvent* event);
- void showEvent(QShowEvent * event);
+ void hideEvent(QHideEvent* event) override;
+ void showEvent(QShowEvent * event) override;
private slots:
void updateButtons();
void textChanged(const QString &text);
private:
- bool eventFilter(QObject *object, QEvent *e);
+ bool eventFilter(QObject *object, QEvent *e) override;
QToolButton* setupToolButton(const QString &text, const QString &icon);
private:
diff --git a/src/assistant/assistant/helpbrowsersupport.cpp b/src/assistant/assistant/helpbrowsersupport.cpp
index bd97f884c..746cef82f 100644
--- a/src/assistant/assistant/helpbrowsersupport.cpp
+++ b/src/assistant/assistant/helpbrowsersupport.cpp
@@ -93,13 +93,13 @@ public:
HelpNetworkReply(const QNetworkRequest &request, const QByteArray &fileData,
const QString &mimeType);
- virtual void abort();
+ void abort() override;
- virtual qint64 bytesAvailable() const
+ qint64 bytesAvailable() const override
{ return data.length() + QNetworkReply::bytesAvailable(); }
protected:
- virtual qint64 readData(char *data, qint64 maxlen);
+ qint64 readData(char *data, qint64 maxlen) override;
private:
QByteArray data;
@@ -155,8 +155,8 @@ public:
}
protected:
- void abort() { TRACE_OBJ }
- qint64 readData(char*, qint64) { TRACE_OBJ return qint64(-1); }
+ void abort() override { TRACE_OBJ }
+ qint64 readData(char*, qint64) override { TRACE_OBJ return qint64(-1); }
};
// -- HelpNetworkAccessManager
@@ -167,8 +167,8 @@ public:
HelpNetworkAccessManager(QObject *parent);
protected:
- virtual QNetworkReply *createRequest(Operation op,
- const QNetworkRequest &request, QIODevice *outgoingData = 0);
+ QNetworkReply *createRequest(Operation op,
+ const QNetworkRequest &request, QIODevice *outgoingData = 0) override;
};
HelpNetworkAccessManager::HelpNetworkAccessManager(QObject *parent)
diff --git a/src/assistant/assistant/helpviewer.h b/src/assistant/assistant/helpviewer.h
index aced6177d..3ea3c1dee 100644
--- a/src/assistant/assistant/helpviewer.h
+++ b/src/assistant/assistant/helpviewer.h
@@ -80,7 +80,7 @@ public:
void setTitle(const QString &title);
QUrl source() const;
- void setSource(const QUrl &url);
+ void setSource(const QUrl &url) override;
QString selectedText() const;
bool isForwardAvailable() const;
@@ -102,10 +102,10 @@ public slots:
#ifndef QT_NO_CLIPBOARD
void copy();
#endif
- void home();
+ void home() override;
- void forward();
- void backward();
+ void forward() override;
+ void backward() override;
signals:
void titleChanged();
@@ -124,10 +124,10 @@ signals:
#endif
protected:
- void keyPressEvent(QKeyEvent *e);
- void wheelEvent(QWheelEvent *event);
- void mousePressEvent(QMouseEvent *event);
- void mouseReleaseEvent(QMouseEvent *event);
+ void keyPressEvent(QKeyEvent *e) override;
+ void wheelEvent(QWheelEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *event) override;
private slots:
void actionChanged();
@@ -135,9 +135,9 @@ private slots:
void setLoadFinished(bool ok);
private:
- bool eventFilter(QObject *obj, QEvent *event);
- void contextMenuEvent(QContextMenuEvent *event);
- QVariant loadResource(int type, const QUrl &name);
+ bool eventFilter(QObject *obj, QEvent *event) override;
+ void contextMenuEvent(QContextMenuEvent *event) override;
+ QVariant loadResource(int type, const QUrl &name) override;
bool handleForwardBackwardMouseButtons(QMouseEvent *e);
private:
diff --git a/src/assistant/assistant/indexwindow.h b/src/assistant/assistant/indexwindow.h
index d0d5c4860..af585b48f 100644
--- a/src/assistant/assistant/indexwindow.h
+++ b/src/assistant/assistant/indexwindow.h
@@ -64,8 +64,8 @@ private slots:
void disableSearchLineEdit();
private:
- bool eventFilter(QObject *obj, QEvent *e);
- void focusInEvent(QFocusEvent *e);
+ bool eventFilter(QObject *obj, QEvent *e) override;
+ void focusInEvent(QFocusEvent *e) override;
void open(QHelpIndexWidget *indexWidget, const QModelIndex &index);
QLineEdit *m_searchLineEdit;
diff --git a/src/assistant/assistant/mainwindow.h b/src/assistant/assistant/mainwindow.h
index 6292135f0..b0db48be6 100644
--- a/src/assistant/assistant/mainwindow.h
+++ b/src/assistant/assistant/mainwindow.h
@@ -110,7 +110,7 @@ private slots:
private:
bool initHelpDB(bool registerInternalDoc);
void setupActions();
- void closeEvent(QCloseEvent *e);
+ void closeEvent(QCloseEvent *e) override;
void activateDockWidget(QWidget *w);
void updateAboutMenuText();
void setupFilterToolbar();
diff --git a/src/assistant/assistant/openpagesmodel.h b/src/assistant/assistant/openpagesmodel.h
index 49845da1a..781a65127 100644
--- a/src/assistant/assistant/openpagesmodel.h
+++ b/src/assistant/assistant/openpagesmodel.h
@@ -44,9 +44,9 @@ class OpenPagesModel : public QAbstractTableModel
Q_OBJECT
friend class OpenPagesManager;
public:
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
- virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ 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;
void addPage(const QUrl &url, qreal zoom = 0);
void removePage(int index);
diff --git a/src/assistant/assistant/openpagesswitcher.h b/src/assistant/assistant/openpagesswitcher.h
index 2b58d4704..eb76b9067 100644
--- a/src/assistant/assistant/openpagesswitcher.h
+++ b/src/assistant/assistant/openpagesswitcher.h
@@ -51,9 +51,9 @@ public:
void selectAndHide();
void selectCurrentPage();
- void setVisible(bool visible);
- void focusInEvent(QFocusEvent *event);
- bool eventFilter(QObject *object, QEvent *event);
+ void setVisible(bool visible) override;
+ void focusInEvent(QFocusEvent *event) override;
+ bool eventFilter(QObject *object, QEvent *event) override;
signals:
void closePage(const QModelIndex &index);
diff --git a/src/assistant/assistant/openpageswidget.h b/src/assistant/assistant/openpageswidget.h
index 535da4791..ed3900b3a 100644
--- a/src/assistant/assistant/openpageswidget.h
+++ b/src/assistant/assistant/openpageswidget.h
@@ -42,7 +42,7 @@ class OpenPagesDelegate : public QStyledItemDelegate
public:
explicit OpenPagesDelegate(QObject *parent = 0);
void paint(QPainter *painter, const QStyleOptionViewItem &option,
- const QModelIndex &index) const;
+ const QModelIndex &index) const override;
mutable QModelIndex pressedIndex;
};
@@ -68,7 +68,7 @@ private slots:
void handleClicked(const QModelIndex &index);
private:
- bool eventFilter(QObject *obj, QEvent *event);
+ bool eventFilter(QObject *obj, QEvent *event) override;
bool m_allowContextMenu;
OpenPagesDelegate *m_delegate;
diff --git a/src/assistant/assistant/qtdocinstaller.h b/src/assistant/assistant/qtdocinstaller.h
index 7aa0918a4..bbbf98f60 100644
--- a/src/assistant/assistant/qtdocinstaller.h
+++ b/src/assistant/assistant/qtdocinstaller.h
@@ -56,7 +56,7 @@ signals:
void docsInstalled(bool newDocsInstalled);
private:
- void run();
+ void run() override;
bool installDoc(const DocInfo &docInfo);
bool m_abort;
diff --git a/src/assistant/assistant/searchwidget.h b/src/assistant/assistant/searchwidget.h
index f2529a703..a0c179ddb 100644
--- a/src/assistant/assistant/searchwidget.h
+++ b/src/assistant/assistant/searchwidget.h
@@ -62,9 +62,9 @@ private slots:
void searchingFinished(int hits);
private:
- bool eventFilter(QObject* o, QEvent *e);
- void keyPressEvent(QKeyEvent *keyEvent);
- void contextMenuEvent(QContextMenuEvent *contextMenuEvent);
+ bool eventFilter(QObject* o, QEvent *e) override;
+ void keyPressEvent(QKeyEvent *keyEvent) override;
+ void contextMenuEvent(QContextMenuEvent *contextMenuEvent) override;
private:
int zoomCount;
diff --git a/src/assistant/assistant/topicchooser.h b/src/assistant/assistant/topicchooser.h
index 52cfcca98..4817ea010 100644
--- a/src/assistant/assistant/topicchooser.h
+++ b/src/assistant/assistant/topicchooser.h
@@ -53,7 +53,7 @@ private slots:
void activated(const QModelIndex &index);
private:
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) override;
private:
Ui::TopicChooser ui;
diff --git a/src/assistant/help/qhelpcontentwidget.cpp b/src/assistant/help/qhelpcontentwidget.cpp
index 2f6e68d60..b9ec65cbb 100644
--- a/src/assistant/help/qhelpcontentwidget.cpp
+++ b/src/assistant/help/qhelpcontentwidget.cpp
@@ -83,7 +83,7 @@ signals:
void finishedSuccessFully();
private:
- void run();
+ void run() override;
QHelpEnginePrivate *m_helpEngine;
QStringList m_filterAttributes;
diff --git a/src/assistant/help/qhelpcontentwidget.h b/src/assistant/help/qhelpcontentwidget.h
index 06a34fe98..a4b0ce273 100644
--- a/src/assistant/help/qhelpcontentwidget.h
+++ b/src/assistant/help/qhelpcontentwidget.h
@@ -88,12 +88,12 @@ public:
void createContents(const QString &customFilterName);
QHelpContentItem *contentItemAt(const QModelIndex &index) const;
- QVariant data(const QModelIndex &index, int role) const;
+ QVariant data(const QModelIndex &index, int role) const override;
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;
+ 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;
bool isCreatingContents() const;
Q_SIGNALS:
diff --git a/src/assistant/help/qhelpengine_p.h b/src/assistant/help/qhelpengine_p.h
index 91a693f8c..a38cc1b7a 100644
--- a/src/assistant/help/qhelpengine_p.h
+++ b/src/assistant/help/qhelpengine_p.h
@@ -111,7 +111,7 @@ public:
~QHelpEnginePrivate();
void init(const QString &collectionFile,
- QHelpEngineCore *helpEngineCore);
+ QHelpEngineCore *helpEngineCore) override;
QHelpContentModel *contentModel;
QHelpContentWidget *contentWidget;
diff --git a/src/assistant/help/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp
index 91221d92c..a0a61c7ab 100644
--- a/src/assistant/help/qhelpindexwidget.cpp
+++ b/src/assistant/help/qhelpindexwidget.cpp
@@ -63,7 +63,7 @@ public:
QSet<int> indexIds(QHelpDBReader *reader) const;
private:
- void run();
+ void run() override;
QHelpEnginePrivate *m_helpEngine;
QStringList m_indices;
diff --git a/src/assistant/help/qhelpprojectdata_p.h b/src/assistant/help/qhelpprojectdata_p.h
index 104505fe8..1e4af4287 100644
--- a/src/assistant/help/qhelpprojectdata_p.h
+++ b/src/assistant/help/qhelpprojectdata_p.h
@@ -67,12 +67,12 @@ public:
bool readData(const QString &fileName);
QString errorMessage() const;
- QString namespaceName() const;
- QString virtualFolder() const;
- QList<QHelpDataCustomFilter> customFilters() const;
- QList<QHelpDataFilterSection> filterSections() const;
- QMap<QString, QVariant> metaData() const;
- QString rootPath() const;
+ QString namespaceName() const override;
+ QString virtualFolder() const override;
+ QList<QHelpDataCustomFilter> customFilters() const override;
+ QList<QHelpDataFilterSection> filterSections() const override;
+ QMap<QString, QVariant> metaData() const override;
+ QString rootPath() const override;
private:
QHelpProjectDataPrivate *d;
diff --git a/src/assistant/help/qhelpsearchindexreader_clucene_p.h b/src/assistant/help/qhelpsearchindexreader_clucene_p.h
index ecae85ab6..a9890f0f0 100644
--- a/src/assistant/help/qhelpsearchindexreader_clucene_p.h
+++ b/src/assistant/help/qhelpsearchindexreader_clucene_p.h
@@ -73,7 +73,7 @@ public:
~QHelpSearchIndexReaderClucene();
private:
- void run();
+ void run() override;
void boostSearchHits(const QHelpEngineCore &engine, QList<QHelpSearchEngine::SearchHit> &hitList,
const QList<QHelpSearchQuery> &queryList);
bool buildQuery(const QList<QHelpSearchQuery> &queries,
diff --git a/src/assistant/help/qhelpsearchindexreader_default_p.h b/src/assistant/help/qhelpsearchindexreader_default_p.h
index c4f391d61..956b654f4 100644
--- a/src/assistant/help/qhelpsearchindexreader_default_p.h
+++ b/src/assistant/help/qhelpsearchindexreader_default_p.h
@@ -115,7 +115,7 @@ public:
~QHelpSearchIndexReaderDefault();
private:
- void run();
+ void run() override;
private:
Reader m_reader;
diff --git a/src/assistant/help/qhelpsearchindexreader_p.h b/src/assistant/help/qhelpsearchindexreader_p.h
index 30e0a6f90..a94085aaf 100644
--- a/src/assistant/help/qhelpsearchindexreader_p.h
+++ b/src/assistant/help/qhelpsearchindexreader_p.h
@@ -94,7 +94,7 @@ protected:
QString m_indexFilesFolder;
private:
- virtual void run()=0;
+ void run() override = 0;
};
} // namespace fulltextsearch
diff --git a/src/assistant/help/qhelpsearchindexwriter_clucene_p.h b/src/assistant/help/qhelpsearchindexwriter_clucene_p.h
index 7fab71085..668272c7e 100644
--- a/src/assistant/help/qhelpsearchindexwriter_clucene_p.h
+++ b/src/assistant/help/qhelpsearchindexwriter_clucene_p.h
@@ -88,7 +88,7 @@ signals:
void indexingFinished();
private:
- void run();
+ void run() override;
bool addDocuments(const QList<QUrl> docFiles, const QHelpEngineCore &engine,
const QStringList &attributes, const QString &namespaceName,
diff --git a/src/assistant/help/qhelpsearchindexwriter_default_p.h b/src/assistant/help/qhelpsearchindexwriter_default_p.h
index ec237709e..25cfa601a 100644
--- a/src/assistant/help/qhelpsearchindexwriter_default_p.h
+++ b/src/assistant/help/qhelpsearchindexwriter_default_p.h
@@ -106,7 +106,7 @@ signals:
void indexingFinished();
private:
- void run();
+ void run() override;
QString addNamespace(const QString namespaces, const QString &namespaceName);
QString removeNamespace(const QString namespaces, const QString &namespaceName);
diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
index fda435b45..98fc1af00 100644
--- a/src/assistant/help/qhelpsearchquerywidget.cpp
+++ b/src/assistant/help/qhelpsearchquerywidget.cpp
@@ -71,12 +71,12 @@ private:
explicit CompleterModel(QObject *parent)
: QAbstractListModel(parent) {}
- int rowCount(const QModelIndex &parent = QModelIndex()) const
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override
{
return parent.isValid() ? 0 : termList.size();
}
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override
{
if (!index.isValid() || index.row() >= termList.count()||
(role != Qt::EditRole && role != Qt::DisplayRole))
@@ -286,7 +286,7 @@ private:
}
private slots:
- bool eventFilter(QObject *ob, QEvent *event)
+ bool eventFilter(QObject *ob, QEvent *event) override
{
if (event->type() == QEvent::KeyPress) {
QKeyEvent *const keyEvent = static_cast<QKeyEvent *>(event);
diff --git a/src/assistant/help/qhelpsearchquerywidget.h b/src/assistant/help/qhelpsearchquerywidget.h
index 1441a321c..5216bb44a 100644
--- a/src/assistant/help/qhelpsearchquerywidget.h
+++ b/src/assistant/help/qhelpsearchquerywidget.h
@@ -76,8 +76,8 @@ Q_SIGNALS:
void search();
private:
- virtual void focusInEvent(QFocusEvent *focusEvent);
- virtual void changeEvent(QEvent *event);
+ void focusInEvent(QFocusEvent *focusEvent) override;
+ void changeEvent(QEvent *event) override;
private:
QHelpSearchQueryWidgetPrivate *d;
diff --git a/src/assistant/help/qhelpsearchresultwidget.cpp b/src/assistant/help/qhelpsearchresultwidget.cpp
index 2d78e1d82..49d3beebf 100644
--- a/src/assistant/help/qhelpsearchresultwidget.cpp
+++ b/src/assistant/help/qhelpsearchresultwidget.cpp
@@ -142,7 +142,7 @@ signals:
void requestShowLink(const QUrl &url);
private slots:
- void setSource(const QUrl & /* name */) {}
+ void setSource(const QUrl & /* name */) override {}
};
diff --git a/src/assistant/help/qhelpsearchresultwidget.h b/src/assistant/help/qhelpsearchresultwidget.h
index ace38c95b..502fe56ad 100644
--- a/src/assistant/help/qhelpsearchresultwidget.h
+++ b/src/assistant/help/qhelpsearchresultwidget.h
@@ -70,7 +70,7 @@ private:
QHelpSearchResultWidgetPrivate *d;
QHelpSearchResultWidget(QHelpSearchEngine *engine);
- virtual void changeEvent(QEvent *event);
+ void changeEvent(QEvent *event) override;
};
QT_END_NAMESPACE
diff --git a/src/assistant/qhelpconverter/conversionwizard.h b/src/assistant/qhelpconverter/conversionwizard.h
index 401212f55..9c86f3e04 100644
--- a/src/assistant/qhelpconverter/conversionwizard.h
+++ b/src/assistant/qhelpconverter/conversionwizard.h
@@ -61,9 +61,9 @@ private:
enum Pages {Input_Page, General_Page, Filter_Page,
Identifier_Page, Path_Page, Files_Page, Output_Page,
Finish_Page};
- void initializePage(int id);
+ void initializePage(int id) override;
QStringList getUnreferencedFiles(const QStringList &files);
- bool eventFilter(QObject *obj, QEvent *e);
+ bool eventFilter(QObject *obj, QEvent *e) override;
AdpReader m_adpReader;
InputPage *m_inputPage;
diff --git a/src/assistant/qhelpconverter/filespage.h b/src/assistant/qhelpconverter/filespage.h
index 2da2657ec..3e0d6af3e 100644
--- a/src/assistant/qhelpconverter/filespage.h
+++ b/src/assistant/qhelpconverter/filespage.h
@@ -48,7 +48,7 @@ private slots:
void removeAllFiles();
private:
- bool eventFilter(QObject *obj, QEvent *event);
+ bool eventFilter(QObject *obj, QEvent *event) override;
Ui::FilesPage m_ui;
QStringList m_files;
diff --git a/src/assistant/qhelpconverter/filterpage.h b/src/assistant/qhelpconverter/filterpage.h
index 757851bea..f6bf7797d 100644
--- a/src/assistant/qhelpconverter/filterpage.h
+++ b/src/assistant/qhelpconverter/filterpage.h
@@ -54,7 +54,7 @@ private slots:
void removeFilter();
private:
- bool validatePage();
+ bool validatePage() override;
Ui::FilterPage m_ui;
QStringList m_filterAttributes;
diff --git a/src/assistant/qhelpconverter/generalpage.h b/src/assistant/qhelpconverter/generalpage.h
index 5c547cfd7..b52cdffb7 100644
--- a/src/assistant/qhelpconverter/generalpage.h
+++ b/src/assistant/qhelpconverter/generalpage.h
@@ -42,8 +42,8 @@ public:
GeneralPage(QWidget *parent = 0);
private:
- bool validatePage();
- bool isComplete() const;
+ bool validatePage() override;
+ bool isComplete() const override;
Ui::GeneralPage m_ui;
};
diff --git a/src/assistant/qhelpconverter/inputpage.h b/src/assistant/qhelpconverter/inputpage.h
index 2f5b5b145..a52be283a 100644
--- a/src/assistant/qhelpconverter/inputpage.h
+++ b/src/assistant/qhelpconverter/inputpage.h
@@ -47,7 +47,7 @@ private slots:
void getFileName();
private:
- bool validatePage();
+ bool validatePage() override;
Ui::InputPage m_ui;
AdpReader *m_adpReader;
diff --git a/src/assistant/qhelpconverter/outputpage.h b/src/assistant/qhelpconverter/outputpage.h
index d11bd4b5d..ac7ae9683 100644
--- a/src/assistant/qhelpconverter/outputpage.h
+++ b/src/assistant/qhelpconverter/outputpage.h
@@ -44,8 +44,8 @@ public:
void setCollectionComponentEnabled(bool enabled);
private:
- bool isComplete() const;
- bool validatePage();
+ bool isComplete() const override;
+ bool validatePage() override;
bool checkFile(const QString &fileName,
const QString &title);