From b87ccf714c3ef45565e4069652bc3fb84c9e95ed Mon Sep 17 00:00:00 2001 From: David Rosca Date: Fri, 1 Mar 2019 17:08:50 +0100 Subject: [PATCH] Fix all override warnings --- .../databaseencryptedpasswordbackendtest.h | 6 ++-- autotests/databasepasswordbackendtest.h | 6 ++-- src/lib/3rdparty/fancytabwidget.cpp | 2 +- src/lib/3rdparty/lineedit.h | 2 +- .../qtsingleapplication/qtlockedfile.h | 2 +- src/lib/adblock/adblocksubscription.h | 14 ++++----- src/lib/adblock/adblocktreewidget.h | 2 +- src/lib/adblock/adblockurlinterceptor.h | 2 +- .../databaseencryptedpasswordbackend.h | 28 ++++++++--------- .../databasepasswordbackend.h | 16 +++++----- .../bookmarks/bookmarksexport/htmlexporter.h | 6 ++-- .../bookmarksimport/chromeimporter.h | 10 +++---- .../bookmarksimport/firefoximporter.h | 10 +++---- .../bookmarks/bookmarksimport/htmlimporter.h | 10 +++---- .../bookmarks/bookmarksimport/ieimporter.h | 10 +++---- .../bookmarks/bookmarksimport/operaimporter.h | 10 +++---- src/lib/downloads/downloadmanager.cpp | 1 + src/lib/downloads/downloadoptionsdialog.h | 2 +- .../completer/locationcompleterdelegate.h | 4 +-- .../completer/locationcompleterview.h | 2 +- .../qml/api/browseraction/qmlbrowseraction.h | 4 +-- .../api/extensionscheme/qmlextensionscheme.h | 2 +- src/lib/plugins/qml/api/sidebar/qmlsidebar.h | 6 ++-- src/lib/popupwindow/popuplocationbar.cpp | 2 +- src/lib/popupwindow/popupwebview.h | 12 ++++---- src/lib/preferences/acceptlanguage.h | 2 +- src/lib/preferences/jsoptions.h | 2 +- src/lib/preferences/pluginlistdelegate.h | 4 +-- src/lib/preferences/preferences.h | 2 +- src/lib/preferences/useragentdialog.h | 2 +- src/lib/tabwidget/combotabbar.h | 24 +++++++-------- src/lib/tabwidget/tabbar.h | 30 +++++++++---------- src/lib/tabwidget/tabstackedwidget.h | 4 +-- src/lib/tabwidget/tabwidget.h | 6 ++-- src/lib/tools/animatedwidget.h | 2 +- src/lib/tools/buttonwithmenu.h | 4 +-- src/lib/tools/clickablelabel.h | 4 +-- src/lib/tools/enhancedmenu.h | 4 +-- src/lib/tools/focusselectlineedit.h | 4 +-- src/lib/tools/headerview.h | 4 +-- src/lib/tools/horizontallistwidget.h | 8 ++--- src/lib/tools/listitemdelegate.h | 4 +-- src/lib/tools/progressbar.h | 2 +- src/lib/tools/toolbutton.h | 10 +++---- src/lib/tools/treewidget.h | 2 +- src/lib/webengine/webinspector.h | 4 +-- src/lib/webengine/webpage.h | 14 ++++----- src/lib/webtab/searchtoolbar.h | 2 +- src/lib/webtab/tabbedwebview.h | 14 ++++----- src/plugins/AutoScroll/autoscroller.h | 2 +- src/plugins/FlashCookieManager/fcm_dialog.h | 4 +-- .../settings/gm_settingslistdelegate.h | 4 +-- .../settings/gm_settingslistwidget.h | 4 +-- .../3rdparty/QjtMouseGestureFilter.cpp | 2 +- .../3rdparty/QjtMouseGestureFilter.h | 2 +- src/plugins/StatusBarIcons/sbi_networkicon.h | 2 +- src/plugins/TabManager/tabmanagerdelegate.h | 2 +- src/plugins/TabManager/tabmanagersettings.h | 2 +- src/plugins/TabManager/tabmanagerwidget.cpp | 2 +- src/plugins/TabManager/tabmanagerwidget.h | 10 +++---- .../TabManager/tabmanagerwidgetcontroller.h | 6 ++-- 61 files changed, 186 insertions(+), 185 deletions(-) diff --git a/autotests/databaseencryptedpasswordbackendtest.h b/autotests/databaseencryptedpasswordbackendtest.h index 2095daca9..2862ab9d3 100644 --- a/autotests/databaseencryptedpasswordbackendtest.h +++ b/autotests/databaseencryptedpasswordbackendtest.h @@ -28,7 +28,7 @@ private: QByteArray m_testMasterPassword; protected: - void reloadBackend(); - void init(); - void cleanup(); + void reloadBackend() override; + void init() override; + void cleanup() override; }; diff --git a/autotests/databasepasswordbackendtest.h b/autotests/databasepasswordbackendtest.h index c083712da..8948b1c35 100644 --- a/autotests/databasepasswordbackendtest.h +++ b/autotests/databasepasswordbackendtest.h @@ -25,7 +25,7 @@ class DatabasePasswordBackendTest : public PasswordBackendTest Q_OBJECT protected: - void reloadBackend(); - void init(); - void cleanup(); + void reloadBackend() override; + void init() override; + void cleanup() override; }; diff --git a/src/lib/3rdparty/fancytabwidget.cpp b/src/lib/3rdparty/fancytabwidget.cpp index de27bbbb0..1816ea18f 100644 --- a/src/lib/3rdparty/fancytabwidget.cpp +++ b/src/lib/3rdparty/fancytabwidget.cpp @@ -476,7 +476,7 @@ public: setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); } - void mousePressEvent(QMouseEvent* ev) { + void mousePressEvent(QMouseEvent* ev) override { if (ev->modifiers() & Qt::ShiftModifier) { Utils::StyleHelper::setBaseColor(QColorDialog::getColor(Utils::StyleHelper::requestedBaseColor(), m_parent)); } diff --git a/src/lib/3rdparty/lineedit.h b/src/lib/3rdparty/lineedit.h index fc8d35d09..7f19ada8f 100644 --- a/src/lib/3rdparty/lineedit.h +++ b/src/lib/3rdparty/lineedit.h @@ -155,7 +155,7 @@ public: SideWidget(QWidget* parent = 0); protected: - bool event(QEvent* event); + bool event(QEvent* event) override; }; diff --git a/src/lib/3rdparty/qtsingleapplication/qtlockedfile.h b/src/lib/3rdparty/qtsingleapplication/qtlockedfile.h index 84c18e5c9..c7f51f4f4 100644 --- a/src/lib/3rdparty/qtsingleapplication/qtlockedfile.h +++ b/src/lib/3rdparty/qtsingleapplication/qtlockedfile.h @@ -73,7 +73,7 @@ public: QtLockedFile(const QString &name); ~QtLockedFile(); - bool open(OpenMode mode); + bool open(OpenMode mode) override; bool lock(LockMode mode, bool block = true); bool unlock(); diff --git a/src/lib/adblock/adblocksubscription.h b/src/lib/adblock/adblocksubscription.h index c48931d71..9a235d861 100644 --- a/src/lib/adblock/adblocksubscription.h +++ b/src/lib/adblock/adblocksubscription.h @@ -118,18 +118,18 @@ class AdBlockCustomList : public AdBlockSubscription public: explicit AdBlockCustomList(QObject* parent = nullptr); - void loadSubscription(const QStringList &disabledRules); - void saveSubscription(); + void loadSubscription(const QStringList &disabledRules) override; + void saveSubscription() override; - bool canEditRules() const; - bool canBeRemoved() const; + bool canEditRules() const override; + bool canBeRemoved() const override; bool containsFilter(const QString &filter) const; bool removeFilter(const QString &filter); - int addRule(AdBlockRule* rule); - bool removeRule(int offset); - const AdBlockRule* replaceRule(AdBlockRule* rule, int offset); + int addRule(AdBlockRule* rule) override; + bool removeRule(int offset) override; + const AdBlockRule* replaceRule(AdBlockRule* rule, int offset) override; }; #endif // ADBLOCKSUBSCRIPTION_H diff --git a/src/lib/adblock/adblocktreewidget.h b/src/lib/adblock/adblocktreewidget.h index 35fb2d543..a2c040a35 100644 --- a/src/lib/adblock/adblocktreewidget.h +++ b/src/lib/adblock/adblocktreewidget.h @@ -49,7 +49,7 @@ private Q_SLOTS: private: void adjustItemFeatures(QTreeWidgetItem* item, const AdBlockRule* rule); - void keyPressEvent(QKeyEvent* event); + void keyPressEvent(QKeyEvent* event) override; AdBlockSubscription* m_subscription; QTreeWidgetItem* m_topItem; diff --git a/src/lib/adblock/adblockurlinterceptor.h b/src/lib/adblock/adblockurlinterceptor.h index 9cc4b049f..733040b57 100644 --- a/src/lib/adblock/adblockurlinterceptor.h +++ b/src/lib/adblock/adblockurlinterceptor.h @@ -32,7 +32,7 @@ class FALKON_EXPORT AdBlockUrlInterceptor : public UrlInterceptor public: explicit AdBlockUrlInterceptor(AdBlockManager *manager); - void interceptRequest(QWebEngineUrlRequestInfo &request); + void interceptRequest(QWebEngineUrlRequestInfo &request) override; Q_SIGNALS: void requestBlocked(const AdBlockedRequest &request); diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h index eae74ed94..202e54e1f 100644 --- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h +++ b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h @@ -40,23 +40,23 @@ public: ~DatabaseEncryptedPasswordBackend(); - QStringList getUsernames(const QUrl &url); - QVector getEntries(const QUrl &url); - QVector getAllEntries(); + QStringList getUsernames(const QUrl &url) override; + QVector getEntries(const QUrl &url) override; + QVector getAllEntries() override; - void setActive(bool active); + void setActive(bool active) override; - void addEntry(const PasswordEntry &entry); - bool updateEntry(const PasswordEntry &entry); - void updateLastUsed(PasswordEntry &entry); + void addEntry(const PasswordEntry &entry) override; + bool updateEntry(const PasswordEntry &entry) override; + void updateLastUsed(PasswordEntry &entry) override; - void removeEntry(const PasswordEntry &entry); - void removeAll(); + void removeEntry(const PasswordEntry &entry) override; + void removeAll() override; - QString name() const; + QString name() const override; - bool hasSettings() const; - void showSettings(QWidget* parent); + bool hasSettings() const override; + void showSettings(QWidget* parent) override; bool isMasterPasswordSetted(); @@ -107,8 +107,8 @@ public: void delayedExec(); public Q_SLOTS: - void accept(); - void reject(); + void accept() override; + void reject() override; void showSettingPage(); void showSetMasterPasswordPage(); void clearMasterPasswordAndConvert(bool forcedAskPass = true); diff --git a/src/lib/autofill/passwordbackends/databasepasswordbackend.h b/src/lib/autofill/passwordbackends/databasepasswordbackend.h index d651f7a97..7a3933a17 100644 --- a/src/lib/autofill/passwordbackends/databasepasswordbackend.h +++ b/src/lib/autofill/passwordbackends/databasepasswordbackend.h @@ -26,17 +26,17 @@ class FALKON_EXPORT DatabasePasswordBackend : public PasswordBackend public: explicit DatabasePasswordBackend(); - QString name() const; + QString name() const override; - QVector getEntries(const QUrl &url); - QVector getAllEntries(); + QVector getEntries(const QUrl &url) override; + QVector getAllEntries() override; - void addEntry(const PasswordEntry &entry); - bool updateEntry(const PasswordEntry &entry); - void updateLastUsed(PasswordEntry &entry); + void addEntry(const PasswordEntry &entry) override; + bool updateEntry(const PasswordEntry &entry) override; + void updateLastUsed(PasswordEntry &entry) override; - void removeEntry(const PasswordEntry &entry); - void removeAll(); + void removeEntry(const PasswordEntry &entry) override; + void removeAll() override; }; #endif // DATABASEPASSWORDBACKEND_H diff --git a/src/lib/bookmarks/bookmarksexport/htmlexporter.h b/src/lib/bookmarks/bookmarksexport/htmlexporter.h index 3003ccac6..99346c091 100644 --- a/src/lib/bookmarks/bookmarksexport/htmlexporter.h +++ b/src/lib/bookmarks/bookmarksexport/htmlexporter.h @@ -29,9 +29,9 @@ class HtmlExporter : public BookmarksExporter public: explicit HtmlExporter(QObject* parent = 0); - QString name() const; - QString getPath(QWidget* parent); - bool exportBookmarks(BookmarkItem* root); + QString name() const override; + QString getPath(QWidget* parent) override; + bool exportBookmarks(BookmarkItem* root) override; private: void writeBookmark(BookmarkItem* item, QTextStream &stream, int level); diff --git a/src/lib/bookmarks/bookmarksimport/chromeimporter.h b/src/lib/bookmarks/bookmarksimport/chromeimporter.h index 1f5bfb74c..0ad6a9757 100644 --- a/src/lib/bookmarks/bookmarksimport/chromeimporter.h +++ b/src/lib/bookmarks/bookmarksimport/chromeimporter.h @@ -28,13 +28,13 @@ class FALKON_EXPORT ChromeImporter : public BookmarksImporter public: explicit ChromeImporter(QObject* parent = 0); - QString description() const; - QString standardPath() const; + QString description() const override; + QString standardPath() const override; - QString getPath(QWidget* parent); - bool prepareImport(); + QString getPath(QWidget* parent) override; + bool prepareImport() override; - BookmarkItem* importBookmarks(); + BookmarkItem* importBookmarks() override; private: void readBookmarks(const QVariantList &list, BookmarkItem* parent); diff --git a/src/lib/bookmarks/bookmarksimport/firefoximporter.h b/src/lib/bookmarks/bookmarksimport/firefoximporter.h index 376c9e22c..42aa03684 100644 --- a/src/lib/bookmarks/bookmarksimport/firefoximporter.h +++ b/src/lib/bookmarks/bookmarksimport/firefoximporter.h @@ -29,13 +29,13 @@ public: explicit FirefoxImporter(QObject* parent = 0); ~FirefoxImporter(); - QString description() const; - QString standardPath() const; + QString description() const override; + QString standardPath() const override; - QString getPath(QWidget* parent); - bool prepareImport(); + QString getPath(QWidget* parent) override; + bool prepareImport() override; - BookmarkItem* importBookmarks(); + BookmarkItem* importBookmarks() override; private: enum Type { diff --git a/src/lib/bookmarks/bookmarksimport/htmlimporter.h b/src/lib/bookmarks/bookmarksimport/htmlimporter.h index 1ce0ffe06..41c7cf7bb 100644 --- a/src/lib/bookmarks/bookmarksimport/htmlimporter.h +++ b/src/lib/bookmarks/bookmarksimport/htmlimporter.h @@ -27,13 +27,13 @@ class FALKON_EXPORT HtmlImporter : public BookmarksImporter public: explicit HtmlImporter(QObject* parent = 0); - QString description() const; - QString standardPath() const; + QString description() const override; + QString standardPath() const override; - QString getPath(QWidget* parent); - bool prepareImport(); + QString getPath(QWidget* parent) override; + bool prepareImport() override; - BookmarkItem* importBookmarks(); + BookmarkItem* importBookmarks() override; private: QString m_path; diff --git a/src/lib/bookmarks/bookmarksimport/ieimporter.h b/src/lib/bookmarks/bookmarksimport/ieimporter.h index 2991bacae..eae9aef57 100644 --- a/src/lib/bookmarks/bookmarksimport/ieimporter.h +++ b/src/lib/bookmarks/bookmarksimport/ieimporter.h @@ -27,13 +27,13 @@ class IeImporter : public BookmarksImporter public: explicit IeImporter(QObject* parent = 0); - QString description() const; - QString standardPath() const; + QString description() const override; + QString standardPath() const override; - QString getPath(QWidget* parent); - bool prepareImport(); + QString getPath(QWidget* parent) override; + bool prepareImport() override; - BookmarkItem* importBookmarks(); + BookmarkItem* importBookmarks() override; private: void readDir(const QDir &dir, BookmarkItem* parent); diff --git a/src/lib/bookmarks/bookmarksimport/operaimporter.h b/src/lib/bookmarks/bookmarksimport/operaimporter.h index bb5ca64b4..0d0e2544e 100644 --- a/src/lib/bookmarks/bookmarksimport/operaimporter.h +++ b/src/lib/bookmarks/bookmarksimport/operaimporter.h @@ -28,13 +28,13 @@ class FALKON_EXPORT OperaImporter : public BookmarksImporter public: explicit OperaImporter(QObject* parent = 0); - QString description() const; - QString standardPath() const; + QString description() const override; + QString standardPath() const override; - QString getPath(QWidget* parent); - bool prepareImport(); + QString getPath(QWidget* parent) override; + bool prepareImport() override; - BookmarkItem* importBookmarks(); + BookmarkItem* importBookmarks() override; private: enum Token { EmptyLine, diff --git a/src/lib/downloads/downloadmanager.cpp b/src/lib/downloads/downloadmanager.cpp index 683a6584d..09eab397a 100644 --- a/src/lib/downloads/downloadmanager.cpp +++ b/src/lib/downloads/downloadmanager.cpp @@ -134,6 +134,7 @@ void DownloadManager::closeDownloadTab(QWebEngineDownloadItem *item) const return false; } #if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 12, 0) + Q_UNUSED(url) return true; #else if (page->url() != QUrl()) { diff --git a/src/lib/downloads/downloadoptionsdialog.h b/src/lib/downloads/downloadoptionsdialog.h index 3e2e47347..bce57afec 100644 --- a/src/lib/downloads/downloadoptionsdialog.h +++ b/src/lib/downloads/downloadoptionsdialog.h @@ -44,7 +44,7 @@ public: void setLastDownloadOption(const DownloadManager::DownloadOption &option); - int exec(); + int exec() override; private Q_SLOTS: void copyDownloadLink(); diff --git a/src/lib/navigation/completer/locationcompleterdelegate.h b/src/lib/navigation/completer/locationcompleterdelegate.h index 7ab6d6559..a0e1aa829 100644 --- a/src/lib/navigation/completer/locationcompleterdelegate.h +++ b/src/lib/navigation/completer/locationcompleterdelegate.h @@ -27,8 +27,8 @@ class FALKON_EXPORT LocationCompleterDelegate : public QStyledItemDelegate public: explicit LocationCompleterDelegate(QObject *parent = 0); - void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; void setForceVisitItem(bool enable); diff --git a/src/lib/navigation/completer/locationcompleterview.h b/src/lib/navigation/completer/locationcompleterview.h index cdcfb8f78..ebe1de4e1 100644 --- a/src/lib/navigation/completer/locationcompleterview.h +++ b/src/lib/navigation/completer/locationcompleterview.h @@ -44,7 +44,7 @@ public: void adjustSize(); - bool eventFilter(QObject* object, QEvent* event); + bool eventFilter(QObject* object, QEvent* event) override; Q_SIGNALS: void closed(); diff --git a/src/lib/plugins/qml/api/browseraction/qmlbrowseraction.h b/src/lib/plugins/qml/api/browseraction/qmlbrowseraction.h index 5917c5ddd..0f3145611 100644 --- a/src/lib/plugins/qml/api/browseraction/qmlbrowseraction.h +++ b/src/lib/plugins/qml/api/browseraction/qmlbrowseraction.h @@ -189,9 +189,9 @@ class QmlBrowserActionButton : public AbstractButtonInterface Q_OBJECT public: explicit QmlBrowserActionButton(QObject *parent = nullptr); - QString id() const; + QString id() const override; void setId(const QString &id); - QString name() const; + QString name() const override; void setName(const QString &name); void setTitle(const QString &title); void setToolTip(const QString &toolTip); diff --git a/src/lib/plugins/qml/api/extensionscheme/qmlextensionscheme.h b/src/lib/plugins/qml/api/extensionscheme/qmlextensionscheme.h index c39e65e80..286b011b6 100644 --- a/src/lib/plugins/qml/api/extensionscheme/qmlextensionscheme.h +++ b/src/lib/plugins/qml/api/extensionscheme/qmlextensionscheme.h @@ -57,7 +57,7 @@ class QmlExtensionSchemeHandler : public ExtensionSchemeHandler { Q_OBJECT public: - void requestStarted(QWebEngineUrlRequestJob *job); + void requestStarted(QWebEngineUrlRequestJob *job) override; Q_SIGNALS: void _requestStarted(QWebEngineUrlRequestJob *job); }; diff --git a/src/lib/plugins/qml/api/sidebar/qmlsidebar.h b/src/lib/plugins/qml/api/sidebar/qmlsidebar.h index de9981790..5aff57ebd 100644 --- a/src/lib/plugins/qml/api/sidebar/qmlsidebar.h +++ b/src/lib/plugins/qml/api/sidebar/qmlsidebar.h @@ -140,9 +140,9 @@ class QmlSideBarHelper : public SideBarInterface Q_OBJECT public: explicit QmlSideBarHelper(QObject *parent = nullptr); - QString title() const; - QAction *createMenuAction(); - QWidget *createSideBarWidget(BrowserWindow *mainWindow); + QString title() const override; + QAction *createMenuAction() override; + QWidget *createSideBarWidget(BrowserWindow *mainWindow) override; void setTitle(const QString &title); void setIcon(const QString &icon); diff --git a/src/lib/popupwindow/popuplocationbar.cpp b/src/lib/popupwindow/popuplocationbar.cpp index 93a72fa0c..b4b67ce4e 100644 --- a/src/lib/popupwindow/popuplocationbar.cpp +++ b/src/lib/popupwindow/popuplocationbar.cpp @@ -36,7 +36,7 @@ public: private: QIcon m_icon; - void paintEvent(QPaintEvent*) { + void paintEvent(QPaintEvent*) override { QPainter p(this); m_icon.paint(&p, rect()); } diff --git a/src/lib/popupwindow/popupwebview.h b/src/lib/popupwindow/popupwebview.h index 87bd62e4f..f06b0312b 100644 --- a/src/lib/popupwindow/popupwebview.h +++ b/src/lib/popupwindow/popupwebview.h @@ -33,18 +33,18 @@ class FALKON_EXPORT PopupWebView : public WebView public: explicit PopupWebView(QWidget* parent = 0); - QWidget* overlayWidget() Q_DECL_OVERRIDE; - void loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position) Q_DECL_OVERRIDE; + QWidget* overlayWidget() override; + void loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position) override; - void closeView() Q_DECL_OVERRIDE; - bool isFullScreen() Q_DECL_OVERRIDE; - void requestFullScreen(bool enable) Q_DECL_OVERRIDE; + void closeView() override; + bool isFullScreen() override; + void requestFullScreen(bool enable) override; public Q_SLOTS: void inspectElement(); private: - void _contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void _contextMenuEvent(QContextMenuEvent *event) override; Menu* m_menu; QPointer m_inspector; diff --git a/src/lib/preferences/acceptlanguage.h b/src/lib/preferences/acceptlanguage.h index 27e2ae818..2bae62ed2 100644 --- a/src/lib/preferences/acceptlanguage.h +++ b/src/lib/preferences/acceptlanguage.h @@ -40,7 +40,7 @@ public: static QByteArray generateHeader(const QStringList &langs); public Q_SLOTS: - void accept(); + void accept() override; private Q_SLOTS: void addLanguage(); diff --git a/src/lib/preferences/jsoptions.h b/src/lib/preferences/jsoptions.h index 8f715a8d3..3593086d0 100644 --- a/src/lib/preferences/jsoptions.h +++ b/src/lib/preferences/jsoptions.h @@ -37,7 +37,7 @@ public: ~JsOptions(); public Q_SLOTS: - void accept(); + void accept() override; private: Ui::JsOptions* ui; diff --git a/src/lib/preferences/pluginlistdelegate.h b/src/lib/preferences/pluginlistdelegate.h index f5d37a042..639163dc8 100644 --- a/src/lib/preferences/pluginlistdelegate.h +++ b/src/lib/preferences/pluginlistdelegate.h @@ -29,8 +29,8 @@ class FALKON_EXPORT PluginListDelegate : public QStyledItemDelegate public: explicit PluginListDelegate(QListWidget* parent); - void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; private: mutable int m_rowHeight; diff --git a/src/lib/preferences/preferences.h b/src/lib/preferences/preferences.h index a183488ac..332bb1521 100644 --- a/src/lib/preferences/preferences.h +++ b/src/lib/preferences/preferences.h @@ -89,7 +89,7 @@ private Q_SLOTS: void makeFalkonDefault(); private: - void closeEvent(QCloseEvent* event); + void closeEvent(QCloseEvent* event) override; Ui::Preferences* ui; BrowserWindow* m_window; diff --git a/src/lib/preferences/useragentdialog.h b/src/lib/preferences/useragentdialog.h index 9968e15cf..3125a9483 100644 --- a/src/lib/preferences/useragentdialog.h +++ b/src/lib/preferences/useragentdialog.h @@ -43,7 +43,7 @@ private Q_SLOTS: void removeSite(); void editSite(); - void accept(); + void accept() override; void enableGlobalComboBox(bool enable); void enablePerSiteFrame(bool enable); diff --git a/src/lib/tabwidget/combotabbar.h b/src/lib/tabwidget/combotabbar.h index 489140971..885cca297 100644 --- a/src/lib/tabwidget/combotabbar.h +++ b/src/lib/tabwidget/combotabbar.h @@ -182,10 +182,10 @@ protected: int mainTabBarWidth() const; int pinTabBarWidth() const; - bool event(QEvent *event); - void wheelEvent(QWheelEvent* event); - bool eventFilter(QObject* obj, QEvent* ev); - void paintEvent(QPaintEvent* ev); + bool event(QEvent *event) override; + void wheelEvent(QWheelEvent* event) override; + bool eventFilter(QObject* obj, QEvent* ev) override; + void paintEvent(QPaintEvent* ev) override; virtual int comboTabBarPixelMetric(SizeType sizeType) const; virtual QSize tabSizeHint(int index, bool fast = false) const; @@ -241,7 +241,7 @@ public: void setTabButton(int index, QTabBar::ButtonPosition position, QWidget* widget); - QSize tabSizeHint(int index) const; + QSize tabSizeHint(int index) const override; QSize baseClassTabSizeHint(int index) const; QRect draggedTabRect() const; @@ -267,11 +267,11 @@ public Q_SLOTS: void setCurrentIndex(int index); private: - bool event(QEvent* ev); - void paintEvent(QPaintEvent* event); - void mousePressEvent(QMouseEvent* event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent* event); + bool event(QEvent* ev) override; + void paintEvent(QPaintEvent* event) override; + void mousePressEvent(QMouseEvent* event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent* event) override; int dragOffset(QStyleOptionTab *option, int tabIndex) const; void initStyleOption(QStyleOptionTab* option, int tabIndex) const; @@ -341,8 +341,8 @@ private Q_SLOTS: void updateScrollButtonsState(); private: - void mouseMoveEvent(QMouseEvent* event); - void resizeEvent(QResizeEvent* event); + void mouseMoveEvent(QMouseEvent* event) override; + void resizeEvent(QResizeEvent* event) override; QTabBar* m_tabBar; QScrollArea* m_scrollArea; diff --git a/src/lib/tabwidget/tabbar.h b/src/lib/tabwidget/tabbar.h index a55f2665b..84c6ca5ec 100644 --- a/src/lib/tabwidget/tabbar.h +++ b/src/lib/tabwidget/tabbar.h @@ -36,12 +36,12 @@ public: void loadSettings(); TabWidget* tabWidget() const; - void setVisible(bool visible); + void setVisible(bool visible) override; void setForceHidden(bool hidden); void setTabText(int index, const QString &text); - void wheelEvent(QWheelEvent* event); + void wheelEvent(QWheelEvent* event) override; Q_SIGNALS: void moveAddTabButton(int posX); @@ -54,26 +54,26 @@ private Q_SLOTS: private: inline bool validIndex(int index) const { return index >= 0 && index < count(); } - void tabInserted(int index); - void tabRemoved(int index); + void tabInserted(int index) override; + void tabRemoved(int index) override; void hideCloseButton(int index); void showCloseButton(int index); void updatePinnedTabCloseButton(int index); - void contextMenuEvent(QContextMenuEvent* event); - void mouseDoubleClickEvent(QMouseEvent* event); - void mousePressEvent(QMouseEvent* event); - void mouseMoveEvent(QMouseEvent* event); - void mouseReleaseEvent(QMouseEvent* event); + void contextMenuEvent(QContextMenuEvent* event) override; + void mouseDoubleClickEvent(QMouseEvent* event) override; + void mousePressEvent(QMouseEvent* event) override; + void mouseMoveEvent(QMouseEvent* event) override; + void mouseReleaseEvent(QMouseEvent* event) override; - 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; - QSize tabSizeHint(int index, bool fast) const; - int comboTabBarPixelMetric(ComboTabBar::SizeType sizeType) const; + QSize tabSizeHint(int index, bool fast) const override; + int comboTabBarPixelMetric(ComboTabBar::SizeType sizeType) const override; WebTab* webTab(int index = -1) const; BrowserWindow* m_window; diff --git a/src/lib/tabwidget/tabstackedwidget.h b/src/lib/tabwidget/tabstackedwidget.h index e42d3c325..e2cc6f99a 100644 --- a/src/lib/tabwidget/tabstackedwidget.h +++ b/src/lib/tabwidget/tabstackedwidget.h @@ -78,8 +78,8 @@ private Q_SLOTS: void tabWasRemoved(int index); protected: - bool eventFilter(QObject* obj, QEvent* event); - void keyPressEvent(QKeyEvent* event); + bool eventFilter(QObject* obj, QEvent* event) override; + void keyPressEvent(QKeyEvent* event) override; private: bool validIndex(int index) const; diff --git a/src/lib/tabwidget/tabwidget.h b/src/lib/tabwidget/tabwidget.h index fb8772a48..698c9a853 100644 --- a/src/lib/tabwidget/tabwidget.h +++ b/src/lib/tabwidget/tabwidget.h @@ -42,8 +42,8 @@ public: explicit AddTabButton(TabWidget* tabWidget, TabBar* tabBar); private: - void wheelEvent(QWheelEvent* event); - void mouseReleaseEvent(QMouseEvent* event); + void wheelEvent(QWheelEvent* event) override; + void mouseReleaseEvent(QMouseEvent* event) override; TabBar* m_tabBar; TabWidget* m_tabWidget; @@ -59,7 +59,7 @@ Q_SIGNALS: void closeTab(int); private: - void mouseReleaseEvent(QMouseEvent* event); + void mouseReleaseEvent(QMouseEvent* event) override; }; class FALKON_EXPORT TabWidget : public TabStackedWidget diff --git a/src/lib/tools/animatedwidget.h b/src/lib/tools/animatedwidget.h index f5142600b..1c67845d1 100644 --- a/src/lib/tools/animatedwidget.h +++ b/src/lib/tools/animatedwidget.h @@ -42,7 +42,7 @@ private Q_SLOTS: void animateFrame(int frame); private: - void resizeEvent(QResizeEvent* e); + void resizeEvent(QResizeEvent* e) override; Direction m_direction; QTimeLine m_timeLine; diff --git a/src/lib/tools/buttonwithmenu.h b/src/lib/tools/buttonwithmenu.h index 14c25d4e0..6b1ab91f7 100644 --- a/src/lib/tools/buttonwithmenu.h +++ b/src/lib/tools/buttonwithmenu.h @@ -82,8 +82,8 @@ private Q_SLOTS: void generateMenu(); private: - void mousePressEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent* event); + void mousePressEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent* event) override; QMenu* m_menu; QVector m_items; diff --git a/src/lib/tools/clickablelabel.h b/src/lib/tools/clickablelabel.h index b2434c376..1db10bc0b 100644 --- a/src/lib/tools/clickablelabel.h +++ b/src/lib/tools/clickablelabel.h @@ -50,8 +50,8 @@ Q_SIGNALS: private: void updateIcon(); - void resizeEvent(QResizeEvent *ev); - void mouseReleaseEvent(QMouseEvent* ev); + void resizeEvent(QResizeEvent *ev) override; + void mouseReleaseEvent(QMouseEvent* ev) override; QString m_themeIcon; QIcon m_fallbackIcon; diff --git a/src/lib/tools/enhancedmenu.h b/src/lib/tools/enhancedmenu.h index d079c612f..9b64792ab 100644 --- a/src/lib/tools/enhancedmenu.h +++ b/src/lib/tools/enhancedmenu.h @@ -42,8 +42,8 @@ Q_SIGNALS: public Q_SLOTS: private: - void mouseReleaseEvent(QMouseEvent* e); - void keyPressEvent(QKeyEvent* e); + void mouseReleaseEvent(QMouseEvent* e) override; + void keyPressEvent(QKeyEvent* e) override; void closeAllMenus(); diff --git a/src/lib/tools/focusselectlineedit.h b/src/lib/tools/focusselectlineedit.h index b00b5d2b1..e387e88ea 100644 --- a/src/lib/tools/focusselectlineedit.h +++ b/src/lib/tools/focusselectlineedit.h @@ -32,8 +32,8 @@ public Q_SLOTS: void setFocus(); protected: - void focusInEvent(QFocusEvent* event); - void mousePressEvent(QMouseEvent* event); + void focusInEvent(QFocusEvent* event) override; + void mousePressEvent(QMouseEvent* event) override; bool m_mouseFocusReason; diff --git a/src/lib/tools/headerview.h b/src/lib/tools/headerview.h index 87ec2aa12..f5595ed5c 100644 --- a/src/lib/tools/headerview.h +++ b/src/lib/tools/headerview.h @@ -39,8 +39,8 @@ private Q_SLOTS: void toggleSectionVisibility(); private: - void showEvent(QShowEvent* event); - void contextMenuEvent(QContextMenuEvent* event); + void showEvent(QShowEvent* event) override; + void contextMenuEvent(QContextMenuEvent* event) override; QAbstractItemView* m_parent; QMenu* m_menu; diff --git a/src/lib/tools/horizontallistwidget.h b/src/lib/tools/horizontallistwidget.h index ddf2089de..0ccfe475f 100644 --- a/src/lib/tools/horizontallistwidget.h +++ b/src/lib/tools/horizontallistwidget.h @@ -26,10 +26,10 @@ public: explicit HorizontalListWidget(QWidget* parent = 0); private: - void mousePressEvent(QMouseEvent* event); - void mouseMoveEvent(QMouseEvent* event); - void mouseReleaseEvent(QMouseEvent* event); - void wheelEvent(QWheelEvent* event); + void mousePressEvent(QMouseEvent* event) override; + void mouseMoveEvent(QMouseEvent* event) override; + void mouseReleaseEvent(QMouseEvent* event) override; + void wheelEvent(QWheelEvent* event) override; bool m_mouseDown; }; diff --git a/src/lib/tools/listitemdelegate.h b/src/lib/tools/listitemdelegate.h index 393c62ecd..c4b9923f2 100644 --- a/src/lib/tools/listitemdelegate.h +++ b/src/lib/tools/listitemdelegate.h @@ -32,8 +32,8 @@ public: int itemHeight() const; - void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; private: int m_iconSize; diff --git a/src/lib/tools/progressbar.h b/src/lib/tools/progressbar.h index 6bc29c424..66a8412b0 100644 --- a/src/lib/tools/progressbar.h +++ b/src/lib/tools/progressbar.h @@ -34,7 +34,7 @@ public Q_SLOTS: void setValue(int value); protected: - void paintEvent(QPaintEvent* e); + void paintEvent(QPaintEvent* e) override; void initStyleOption(QStyleOptionProgressBar* option); private: diff --git a/src/lib/tools/toolbutton.h b/src/lib/tools/toolbutton.h index 6ab017699..fe0e2d8fb 100644 --- a/src/lib/tools/toolbutton.h +++ b/src/lib/tools/toolbutton.h @@ -87,11 +87,11 @@ private Q_SLOTS: void showMenu(); protected: - void mousePressEvent(QMouseEvent* e); - void mouseReleaseEvent(QMouseEvent* e); - void mouseDoubleClickEvent(QMouseEvent* e); - void contextMenuEvent(QContextMenuEvent *e); - void paintEvent(QPaintEvent* e); + void mousePressEvent(QMouseEvent* e) override; + void mouseReleaseEvent(QMouseEvent* e) override; + void mouseDoubleClickEvent(QMouseEvent* e) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void paintEvent(QPaintEvent* e) override; private: QImage m_multiIcon; diff --git a/src/lib/tools/treewidget.h b/src/lib/tools/treewidget.h index 1d2cfadbc..ad9b50810 100644 --- a/src/lib/tools/treewidget.h +++ b/src/lib/tools/treewidget.h @@ -57,7 +57,7 @@ private Q_SLOTS: void sheduleRefresh(); private: - void mousePressEvent(QMouseEvent* event); + void mousePressEvent(QMouseEvent* event) override; void iterateAllItems(QTreeWidgetItem* parent); bool m_refreshAllItemsNeeded; diff --git a/src/lib/webengine/webinspector.h b/src/lib/webengine/webinspector.h index 830415c46..67b5c30b0 100644 --- a/src/lib/webengine/webinspector.h +++ b/src/lib/webengine/webinspector.h @@ -45,8 +45,8 @@ private Q_SLOTS: void loadFinished(); private: - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; static QList s_views; diff --git a/src/lib/webengine/webpage.h b/src/lib/webengine/webpage.h index 0b1aa8944..80061184d 100644 --- a/src/lib/webengine/webpage.h +++ b/src/lib/webengine/webpage.h @@ -57,9 +57,9 @@ public: void scroll(int x, int y); void setScrollPosition(const QPointF &pos); - bool javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, const QString &defaultValue, QString* result) Q_DECL_OVERRIDE; - bool javaScriptConfirm(const QUrl &securityOrigin, const QString &msg) Q_DECL_OVERRIDE; - void javaScriptAlert(const QUrl &securityOrigin, const QString &msg) Q_DECL_OVERRIDE; + bool javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, const QString &defaultValue, QString* result) override; + bool javaScriptConfirm(const QUrl &securityOrigin, const QString &msg) override; + void javaScriptAlert(const QUrl &securityOrigin, const QString &msg) override; void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID) override; QStringList autoFillUsernames() const; @@ -94,10 +94,10 @@ private Q_SLOTS: void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode); private: - bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) Q_DECL_OVERRIDE; - bool certificateError(const QWebEngineCertificateError &error) Q_DECL_OVERRIDE; - QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes) Q_DECL_OVERRIDE; - QWebEnginePage* createWindow(QWebEnginePage::WebWindowType type) Q_DECL_OVERRIDE; + bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) override; + bool certificateError(const QWebEngineCertificateError &error) override; + QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes) override; + QWebEnginePage* createWindow(QWebEnginePage::WebWindowType type) override; void handleUnknownProtocol(const QUrl &url); void desktopServicesOpen(const QUrl &url); diff --git a/src/lib/webtab/searchtoolbar.h b/src/lib/webtab/searchtoolbar.h index 6abf78cc6..d018c74c4 100644 --- a/src/lib/webtab/searchtoolbar.h +++ b/src/lib/webtab/searchtoolbar.h @@ -42,7 +42,7 @@ public: void showMinimalInPopupWindow(); void focusSearchLine(); - bool eventFilter(QObject* obj, QEvent* event); + bool eventFilter(QObject* obj, QEvent* event) override; public Q_SLOTS: void setText(const QString &text); diff --git a/src/lib/webtab/tabbedwebview.h b/src/lib/webtab/tabbedwebview.h index 8e896487d..09a8c22ef 100644 --- a/src/lib/webtab/tabbedwebview.h +++ b/src/lib/webtab/tabbedwebview.h @@ -48,12 +48,12 @@ public: QString getIp() const; int tabIndex() const; - QWidget* overlayWidget() Q_DECL_OVERRIDE; - void closeView() Q_DECL_OVERRIDE; - void loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position) Q_DECL_OVERRIDE; + QWidget* overlayWidget() override; + void closeView() override; + void loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position) override; - bool isFullScreen() Q_DECL_OVERRIDE; - void requestFullScreen(bool enable) Q_DECL_OVERRIDE; + bool isFullScreen() override; + void requestFullScreen(bool enable) override; Q_SIGNALS: void wantsCloseTab(int); @@ -73,8 +73,8 @@ private Q_SLOTS: void inspectElement(); private: - void _contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; - void _mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void _contextMenuEvent(QContextMenuEvent *event) override; + void _mouseMoveEvent(QMouseEvent *event) override; BrowserWindow* m_window; WebTab* m_webTab; diff --git a/src/plugins/AutoScroll/autoscroller.h b/src/plugins/AutoScroll/autoscroller.h index b63262277..d0a396bc6 100644 --- a/src/plugins/AutoScroll/autoscroller.h +++ b/src/plugins/AutoScroll/autoscroller.h @@ -58,7 +58,7 @@ public: void setScrollDivider(double divider); private: - bool eventFilter(QObject* obj, QEvent* event); + bool eventFilter(QObject* obj, QEvent* event) override; bool showIndicator(WebView* view, const QPoint &pos); void stopScrolling(); diff --git a/src/plugins/FlashCookieManager/fcm_dialog.h b/src/plugins/FlashCookieManager/fcm_dialog.h index 5400290c6..7b36dec4a 100644 --- a/src/plugins/FlashCookieManager/fcm_dialog.h +++ b/src/plugins/FlashCookieManager/fcm_dialog.h @@ -69,8 +69,8 @@ private Q_SLOTS: void cookieTreeContextMenuRequested(const QPoint &pos); private: - void closeEvent(QCloseEvent* e); - void keyPressEvent(QKeyEvent* e); + void closeEvent(QCloseEvent* e) override; + void keyPressEvent(QKeyEvent* e) override; Ui::FCM_Dialog* ui; diff --git a/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h b/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h index c5a50cedc..bbecc61c3 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h +++ b/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h @@ -27,8 +27,8 @@ public: int padding() const; - void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; private: QPixmap m_removePixmap; diff --git a/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h b/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h index 0c38b2ac4..8c6f1cdb1 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h +++ b/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h @@ -38,8 +38,8 @@ private: bool containsRemoveIcon(const QPoint &pos) const; bool containsUpdateIcon(const QPoint &pos) const; - void mousePressEvent(QMouseEvent* event); - void mouseDoubleClickEvent(QMouseEvent* event); + void mousePressEvent(QMouseEvent* event) override; + void mouseDoubleClickEvent(QMouseEvent* event) override; GM_SettingsListDelegate* m_delegate; diff --git a/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.cpp b/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.cpp index 345fa2659..b9ec4d855 100644 --- a/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.cpp +++ b/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.cpp @@ -55,7 +55,7 @@ public: m_object = object; } - void callback() { + void callback() override { m_object->emitGestured(); } diff --git a/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.h b/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.h index 5cfb7a0f6..cf5ee1c2f 100644 --- a/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.h +++ b/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.h @@ -82,7 +82,7 @@ public: bool mouseMoveEvent(QMouseEvent* event, QObject* obj = 0); protected: - bool eventFilter(QObject* obj, QEvent* event); + bool eventFilter(QObject* obj, QEvent* event) override; private: bool paintEvent(QObject* obj, QPaintEvent* event); diff --git a/src/plugins/StatusBarIcons/sbi_networkicon.h b/src/plugins/StatusBarIcons/sbi_networkicon.h index 710df4456..cbe9d8c05 100644 --- a/src/plugins/StatusBarIcons/sbi_networkicon.h +++ b/src/plugins/StatusBarIcons/sbi_networkicon.h @@ -40,7 +40,7 @@ private Q_SLOTS: private: void updateToolTip(); - void enterEvent(QEvent* event); + void enterEvent(QEvent* event) override; QNetworkConfigurationManager* m_networkConfiguration; }; diff --git a/src/plugins/TabManager/tabmanagerdelegate.h b/src/plugins/TabManager/tabmanagerdelegate.h index f8a08bce4..24e76a88e 100644 --- a/src/plugins/TabManager/tabmanagerdelegate.h +++ b/src/plugins/TabManager/tabmanagerdelegate.h @@ -25,7 +25,7 @@ class TabManagerDelegate : public QStyledItemDelegate public: explicit TabManagerDelegate(QObject* parent = 0); - void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; private: void viewItemDrawText(QPainter *p, const QStyleOptionViewItem *option, const QRect &rect, diff --git a/src/plugins/TabManager/tabmanagersettings.h b/src/plugins/TabManager/tabmanagersettings.h index caf2c32c3..a4b39aae0 100644 --- a/src/plugins/TabManager/tabmanagersettings.h +++ b/src/plugins/TabManager/tabmanagersettings.h @@ -17,7 +17,7 @@ public: ~TabManagerSettings(); public Q_SLOTS: - void accept(); + void accept() override; private: Ui::TabManagerSettings* ui; diff --git a/src/plugins/TabManager/tabmanagerwidget.cpp b/src/plugins/TabManager/tabmanagerwidget.cpp index 23d972d79..516e84d95 100644 --- a/src/plugins/TabManager/tabmanagerwidget.cpp +++ b/src/plugins/TabManager/tabmanagerwidget.cpp @@ -880,7 +880,7 @@ QStringList TabTreeWidget::mimeTypes() const return types; } -QMimeData *TabTreeWidget::mimeData(const QList &items) const +QMimeData *TabTreeWidget::mimeData(const QList items) const { QMimeData* mimeData = new QMimeData(); QByteArray encodedData; diff --git a/src/plugins/TabManager/tabmanagerwidget.h b/src/plugins/TabManager/tabmanagerwidget.h index 2c5ce202d..318416c90 100644 --- a/src/plugins/TabManager/tabmanagerwidget.h +++ b/src/plugins/TabManager/tabmanagerwidget.h @@ -42,10 +42,10 @@ class TabTreeWidget : public QTreeWidget public: TabTreeWidget(QWidget* parent = 0); - Qt::DropActions supportedDropActions() const; - QStringList mimeTypes() const; - QMimeData* mimeData(const QList &items) const; - bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action); + Qt::DropActions supportedDropActions() const override; + QStringList mimeTypes() const override; + QMimeData* mimeData(const QList items) const override; + bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action) override; void setEnableDragTabs(bool enable); @@ -110,7 +110,7 @@ private Q_SLOTS: void filterBarClosed(); protected: - bool eventFilter(QObject* obj, QEvent* event); + bool eventFilter(QObject* obj, QEvent* event) override; Q_SIGNALS: void showSideBySide(); diff --git a/src/plugins/TabManager/tabmanagerwidgetcontroller.h b/src/plugins/TabManager/tabmanagerwidgetcontroller.h index 4f7ada950..66e3eea2b 100644 --- a/src/plugins/TabManager/tabmanagerwidgetcontroller.h +++ b/src/plugins/TabManager/tabmanagerwidgetcontroller.h @@ -32,9 +32,9 @@ public: explicit TabManagerWidgetController(QObject* parent = 0); ~TabManagerWidgetController(); - QString title() const; - QAction* createMenuAction(); - QWidget* createSideBarWidget(BrowserWindow* mainWindow); + QString title() const override; + QAction* createMenuAction() override; + QWidget* createSideBarWidget(BrowserWindow* mainWindow) override; AbstractButtonInterface* createStatusBarIcon(BrowserWindow* mainWindow);