Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

Fix all override warnings

Browse Source
This commit is contained in:
David Rosca 2019-03-01 17:08:50 +01:00
parent 66857748c2
commit b87ccf714c
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
61 changed files with 186 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autotests/databaseencryptedpasswordbackendtest.h
View File

@ -28,7 +28,7 @@ private:
QByteArray m_testMasterPassword; QByteArray m_testMasterPassword;
protected: protected:
void reloadBackend(); void reloadBackend() override;
void init(); void init() override;
void cleanup(); void cleanup() override;
}; };

6
autotests/databasepasswordbackendtest.h
View File

@ -25,7 +25,7 @@ class DatabasePasswordBackendTest : public PasswordBackendTest
Q_OBJECT Q_OBJECT
protected: protected:
void reloadBackend(); void reloadBackend() override;
void init(); void init() override;
void cleanup(); void cleanup() override;
}; };

2
src/lib/3rdparty/fancytabwidget.cpp vendored
View File

@ -476,7 +476,7 @@ public:
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
} }
void mousePressEvent(QMouseEvent* ev) { void mousePressEvent(QMouseEvent* ev) override {
if (ev->modifiers() & Qt::ShiftModifier) { if (ev->modifiers() & Qt::ShiftModifier) {
Utils::StyleHelper::setBaseColor(QColorDialog::getColor(Utils::StyleHelper::requestedBaseColor(), m_parent)); Utils::StyleHelper::setBaseColor(QColorDialog::getColor(Utils::StyleHelper::requestedBaseColor(), m_parent));
} }

2
src/lib/3rdparty/lineedit.h vendored
View File

@ -155,7 +155,7 @@ public:
SideWidget(QWidget* parent = 0); SideWidget(QWidget* parent = 0);
protected: protected:
bool event(QEvent* event); bool event(QEvent* event) override;
}; };

2
src/lib/3rdparty/qtsingleapplication/qtlockedfile.h vendored
View File

@ -73,7 +73,7 @@ public:
QtLockedFile(const QString &name); QtLockedFile(const QString &name);
~QtLockedFile(); ~QtLockedFile();
bool open(OpenMode mode); bool open(OpenMode mode) override;
bool lock(LockMode mode, bool block = true); bool lock(LockMode mode, bool block = true);
bool unlock(); bool unlock();

14
src/lib/adblock/adblocksubscription.h
View File

@ -118,18 +118,18 @@ class AdBlockCustomList : public AdBlockSubscription
public: public:
explicit AdBlockCustomList(QObject* parent = nullptr); explicit AdBlockCustomList(QObject* parent = nullptr);
void loadSubscription(const QStringList &disabledRules); void loadSubscription(const QStringList &disabledRules) override;
void saveSubscription(); void saveSubscription() override;
bool canEditRules() const; bool canEditRules() const override;
bool canBeRemoved() const; bool canBeRemoved() const override;
bool containsFilter(const QString &filter) const; bool containsFilter(const QString &filter) const;
bool removeFilter(const QString &filter); bool removeFilter(const QString &filter);
int addRule(AdBlockRule* rule); int addRule(AdBlockRule* rule) override;
bool removeRule(int offset); bool removeRule(int offset) override;
const AdBlockRule* replaceRule(AdBlockRule* rule, int offset); const AdBlockRule* replaceRule(AdBlockRule* rule, int offset) override;
}; };
#endif // ADBLOCKSUBSCRIPTION_H #endif // ADBLOCKSUBSCRIPTION_H

2
src/lib/adblock/adblocktreewidget.h
View File

@ -49,7 +49,7 @@ private Q_SLOTS:
private: private:
void adjustItemFeatures(QTreeWidgetItem* item, const AdBlockRule* rule); void adjustItemFeatures(QTreeWidgetItem* item, const AdBlockRule* rule);
void keyPressEvent(QKeyEvent* event); void keyPressEvent(QKeyEvent* event) override;
AdBlockSubscription* m_subscription; AdBlockSubscription* m_subscription;
QTreeWidgetItem* m_topItem; QTreeWidgetItem* m_topItem;

2
src/lib/adblock/adblockurlinterceptor.h
View File

@ -32,7 +32,7 @@ class FALKON_EXPORT AdBlockUrlInterceptor : public UrlInterceptor
public: public:
explicit AdBlockUrlInterceptor(AdBlockManager *manager); explicit AdBlockUrlInterceptor(AdBlockManager *manager);
void interceptRequest(QWebEngineUrlRequestInfo &request); void interceptRequest(QWebEngineUrlRequestInfo &request) override;
Q_SIGNALS: Q_SIGNALS:
void requestBlocked(const AdBlockedRequest &request); void requestBlocked(const AdBlockedRequest &request);

28
src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h
View File

@ -40,23 +40,23 @@ public:
~DatabaseEncryptedPasswordBackend(); ~DatabaseEncryptedPasswordBackend();
QStringList getUsernames(const QUrl &url); QStringList getUsernames(const QUrl &url) override;
QVector<PasswordEntry> getEntries(const QUrl &url); QVector<PasswordEntry> getEntries(const QUrl &url) override;
QVector<PasswordEntry> getAllEntries(); QVector<PasswordEntry> getAllEntries() override;
void setActive(bool active); void setActive(bool active) override;
void addEntry(const PasswordEntry &entry); void addEntry(const PasswordEntry &entry) override;
bool updateEntry(const PasswordEntry &entry); bool updateEntry(const PasswordEntry &entry) override;
void updateLastUsed(PasswordEntry &entry); void updateLastUsed(PasswordEntry &entry) override;
void removeEntry(const PasswordEntry &entry); void removeEntry(const PasswordEntry &entry) override;
void removeAll(); void removeAll() override;
QString name() const; QString name() const override;
bool hasSettings() const; bool hasSettings() const override;
void showSettings(QWidget* parent); void showSettings(QWidget* parent) override;
bool isMasterPasswordSetted(); bool isMasterPasswordSetted();
@ -107,8 +107,8 @@ public:
void delayedExec(); void delayedExec();
public Q_SLOTS: public Q_SLOTS:
void accept(); void accept() override;
void reject(); void reject() override;
void showSettingPage(); void showSettingPage();
void showSetMasterPasswordPage(); void showSetMasterPasswordPage();
void clearMasterPasswordAndConvert(bool forcedAskPass = true); void clearMasterPasswordAndConvert(bool forcedAskPass = true);

16
src/lib/autofill/passwordbackends/databasepasswordbackend.h
View File

@ -26,17 +26,17 @@ class FALKON_EXPORT DatabasePasswordBackend : public PasswordBackend
public: public:
explicit DatabasePasswordBackend(); explicit DatabasePasswordBackend();
QString name() const; QString name() const override;
QVector<PasswordEntry> getEntries(const QUrl &url); QVector<PasswordEntry> getEntries(const QUrl &url) override;
QVector<PasswordEntry> getAllEntries(); QVector<PasswordEntry> getAllEntries() override;
void addEntry(const PasswordEntry &entry); void addEntry(const PasswordEntry &entry) override;
bool updateEntry(const PasswordEntry &entry); bool updateEntry(const PasswordEntry &entry) override;
void updateLastUsed(PasswordEntry &entry); void updateLastUsed(PasswordEntry &entry) override;
void removeEntry(const PasswordEntry &entry); void removeEntry(const PasswordEntry &entry) override;
void removeAll(); void removeAll() override;
}; };
#endif // DATABASEPASSWORDBACKEND_H #endif // DATABASEPASSWORDBACKEND_H

6
src/lib/bookmarks/bookmarksexport/htmlexporter.h
View File

@ -29,9 +29,9 @@ class HtmlExporter : public BookmarksExporter
public: public:
explicit HtmlExporter(QObject* parent = 0); explicit HtmlExporter(QObject* parent = 0);
QString name() const; QString name() const override;
QString getPath(QWidget* parent); QString getPath(QWidget* parent) override;
bool exportBookmarks(BookmarkItem* root); bool exportBookmarks(BookmarkItem* root) override;
private: private:
void writeBookmark(BookmarkItem* item, QTextStream &stream, int level); void writeBookmark(BookmarkItem* item, QTextStream &stream, int level);

10
src/lib/bookmarks/bookmarksimport/chromeimporter.h
View File

@ -28,13 +28,13 @@ class FALKON_EXPORT ChromeImporter : public BookmarksImporter
public: public:
explicit ChromeImporter(QObject* parent = 0); explicit ChromeImporter(QObject* parent = 0);
QString description() const; QString description() const override;
QString standardPath() const; QString standardPath() const override;
QString getPath(QWidget* parent); QString getPath(QWidget* parent) override;
bool prepareImport(); bool prepareImport() override;
BookmarkItem* importBookmarks(); BookmarkItem* importBookmarks() override;
private: private:
void readBookmarks(const QVariantList &list, BookmarkItem* parent); void readBookmarks(const QVariantList &list, BookmarkItem* parent);

10
src/lib/bookmarks/bookmarksimport/firefoximporter.h
View File

@ -29,13 +29,13 @@ public:
explicit FirefoxImporter(QObject* parent = 0); explicit FirefoxImporter(QObject* parent = 0);
~FirefoxImporter(); ~FirefoxImporter();
QString description() const; QString description() const override;
QString standardPath() const; QString standardPath() const override;
QString getPath(QWidget* parent); QString getPath(QWidget* parent) override;
bool prepareImport(); bool prepareImport() override;
BookmarkItem* importBookmarks(); BookmarkItem* importBookmarks() override;
private: private:
enum Type { enum Type {

10
src/lib/bookmarks/bookmarksimport/htmlimporter.h
View File

@ -27,13 +27,13 @@ class FALKON_EXPORT HtmlImporter : public BookmarksImporter
public: public:
explicit HtmlImporter(QObject* parent = 0); explicit HtmlImporter(QObject* parent = 0);
QString description() const; QString description() const override;
QString standardPath() const; QString standardPath() const override;
QString getPath(QWidget* parent); QString getPath(QWidget* parent) override;
bool prepareImport(); bool prepareImport() override;
BookmarkItem* importBookmarks(); BookmarkItem* importBookmarks() override;
private: private:
QString m_path; QString m_path;

10
src/lib/bookmarks/bookmarksimport/ieimporter.h
View File

@ -27,13 +27,13 @@ class IeImporter : public BookmarksImporter
public: public:
explicit IeImporter(QObject* parent = 0); explicit IeImporter(QObject* parent = 0);
QString description() const; QString description() const override;
QString standardPath() const; QString standardPath() const override;
QString getPath(QWidget* parent); QString getPath(QWidget* parent) override;
bool prepareImport(); bool prepareImport() override;
BookmarkItem* importBookmarks(); BookmarkItem* importBookmarks() override;
private: private:
void readDir(const QDir &dir, BookmarkItem* parent); void readDir(const QDir &dir, BookmarkItem* parent);

10
src/lib/bookmarks/bookmarksimport/operaimporter.h
View File

@ -28,13 +28,13 @@ class FALKON_EXPORT OperaImporter : public BookmarksImporter
public: public:
explicit OperaImporter(QObject* parent = 0); explicit OperaImporter(QObject* parent = 0);
QString description() const; QString description() const override;
QString standardPath() const; QString standardPath() const override;
QString getPath(QWidget* parent); QString getPath(QWidget* parent) override;
bool prepareImport(); bool prepareImport() override;
BookmarkItem* importBookmarks(); BookmarkItem* importBookmarks() override;
private: private:
enum Token { EmptyLine, enum Token { EmptyLine,

1
src/lib/downloads/downloadmanager.cpp
View File

@ -134,6 +134,7 @@ void DownloadManager::closeDownloadTab(QWebEngineDownloadItem *item) const
return false; return false;
} }
#if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 12, 0) #if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 12, 0)
Q_UNUSED(url)
return true; return true;
#else #else
if (page->url() != QUrl()) { if (page->url() != QUrl()) {

2
src/lib/downloads/downloadoptionsdialog.h
View File

@ -44,7 +44,7 @@ public:
void setLastDownloadOption(const DownloadManager::DownloadOption &option); void setLastDownloadOption(const DownloadManager::DownloadOption &option);
int exec(); int exec() override;
private Q_SLOTS: private Q_SLOTS:
void copyDownloadLink(); void copyDownloadLink();

4
src/lib/navigation/completer/locationcompleterdelegate.h
View File

@ -27,8 +27,8 @@ class FALKON_EXPORT LocationCompleterDelegate : public QStyledItemDelegate
public: public:
explicit LocationCompleterDelegate(QObject *parent = 0); explicit LocationCompleterDelegate(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;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setForceVisitItem(bool enable); void setForceVisitItem(bool enable);

2
src/lib/navigation/completer/locationcompleterview.h
View File

@ -44,7 +44,7 @@ public:
void adjustSize(); void adjustSize();
bool eventFilter(QObject* object, QEvent* event); bool eventFilter(QObject* object, QEvent* event) override;
Q_SIGNALS: Q_SIGNALS:
void closed(); void closed();

4
src/lib/plugins/qml/api/browseraction/qmlbrowseraction.h
View File

@ -189,9 +189,9 @@ class QmlBrowserActionButton : public AbstractButtonInterface
Q_OBJECT Q_OBJECT
public: public:
explicit QmlBrowserActionButton(QObject *parent = nullptr); explicit QmlBrowserActionButton(QObject *parent = nullptr);
QString id() const; QString id() const override;
void setId(const QString &id); void setId(const QString &id);
QString name() const; QString name() const override;
void setName(const QString &name); void setName(const QString &name);
void setTitle(const QString &title); void setTitle(const QString &title);
void setToolTip(const QString &toolTip); void setToolTip(const QString &toolTip);

2
src/lib/plugins/qml/api/extensionscheme/qmlextensionscheme.h
View File

@ -57,7 +57,7 @@ class QmlExtensionSchemeHandler : public ExtensionSchemeHandler
{ {
Q_OBJECT Q_OBJECT
public: public:
void requestStarted(QWebEngineUrlRequestJob *job); void requestStarted(QWebEngineUrlRequestJob *job) override;
Q_SIGNALS: Q_SIGNALS:
void _requestStarted(QWebEngineUrlRequestJob *job); void _requestStarted(QWebEngineUrlRequestJob *job);
}; };

6
src/lib/plugins/qml/api/sidebar/qmlsidebar.h
View File

@ -140,9 +140,9 @@ class QmlSideBarHelper : public SideBarInterface
Q_OBJECT Q_OBJECT
public: public:
explicit QmlSideBarHelper(QObject *parent = nullptr); explicit QmlSideBarHelper(QObject *parent = nullptr);
QString title() const; QString title() const override;
QAction *createMenuAction(); QAction *createMenuAction() override;
QWidget *createSideBarWidget(BrowserWindow *mainWindow); QWidget *createSideBarWidget(BrowserWindow *mainWindow) override;
void setTitle(const QString &title); void setTitle(const QString &title);
void setIcon(const QString &icon); void setIcon(const QString &icon);

2
src/lib/popupwindow/popuplocationbar.cpp
View File

@ -36,7 +36,7 @@ public:
private: private:
QIcon m_icon; QIcon m_icon;
void paintEvent(QPaintEvent*) { void paintEvent(QPaintEvent*) override {
QPainter p(this); QPainter p(this);
m_icon.paint(&p, rect()); m_icon.paint(&p, rect());
} }

12
src/lib/popupwindow/popupwebview.h
View File

@ -33,18 +33,18 @@ class FALKON_EXPORT PopupWebView : public WebView
public: public:
explicit PopupWebView(QWidget* parent = 0); explicit PopupWebView(QWidget* parent = 0);
QWidget* overlayWidget() Q_DECL_OVERRIDE; QWidget* overlayWidget() override;
void loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position) Q_DECL_OVERRIDE; void loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position) override;
void closeView() Q_DECL_OVERRIDE; void closeView() override;
bool isFullScreen() Q_DECL_OVERRIDE; bool isFullScreen() override;
void requestFullScreen(bool enable) Q_DECL_OVERRIDE; void requestFullScreen(bool enable) override;
public Q_SLOTS: public Q_SLOTS:
void inspectElement(); void inspectElement();
private: private:
void _contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; void _contextMenuEvent(QContextMenuEvent *event) override;
Menu* m_menu; Menu* m_menu;
QPointer<WebInspector> m_inspector; QPointer<WebInspector> m_inspector;

2
src/lib/preferences/acceptlanguage.h
View File

@ -40,7 +40,7 @@ public:
static QByteArray generateHeader(const QStringList &langs); static QByteArray generateHeader(const QStringList &langs);
public Q_SLOTS: public Q_SLOTS:
void accept(); void accept() override;
private Q_SLOTS: private Q_SLOTS:
void addLanguage(); void addLanguage();

2
src/lib/preferences/jsoptions.h
View File

@ -37,7 +37,7 @@ public:
~JsOptions(); ~JsOptions();
public Q_SLOTS: public Q_SLOTS:
void accept(); void accept() override;
private: private:
Ui::JsOptions* ui; Ui::JsOptions* ui;

4
src/lib/preferences/pluginlistdelegate.h
View File

@ -29,8 +29,8 @@ class FALKON_EXPORT PluginListDelegate : public QStyledItemDelegate
public: public:
explicit PluginListDelegate(QListWidget* parent); explicit PluginListDelegate(QListWidget* parent);
void paint(QPainter* painter, 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; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private: private:
mutable int m_rowHeight; mutable int m_rowHeight;

2
src/lib/preferences/preferences.h
View File

@ -89,7 +89,7 @@ private Q_SLOTS:
void makeFalkonDefault(); void makeFalkonDefault();
private: private:
void closeEvent(QCloseEvent* event); void closeEvent(QCloseEvent* event) override;
Ui::Preferences* ui; Ui::Preferences* ui;
BrowserWindow* m_window; BrowserWindow* m_window;

2
src/lib/preferences/useragentdialog.h
View File

@ -43,7 +43,7 @@ private Q_SLOTS:
void removeSite(); void removeSite();
void editSite(); void editSite();
void accept(); void accept() override;
void enableGlobalComboBox(bool enable); void enableGlobalComboBox(bool enable);
void enablePerSiteFrame(bool enable); void enablePerSiteFrame(bool enable);

24
src/lib/tabwidget/combotabbar.h
View File

@ -182,10 +182,10 @@ protected:
int mainTabBarWidth() const; int mainTabBarWidth() const;
int pinTabBarWidth() const; int pinTabBarWidth() const;
bool event(QEvent *event); bool event(QEvent *event) override;
void wheelEvent(QWheelEvent* event); void wheelEvent(QWheelEvent* event) override;
bool eventFilter(QObject* obj, QEvent* ev); bool eventFilter(QObject* obj, QEvent* ev) override;
void paintEvent(QPaintEvent* ev); void paintEvent(QPaintEvent* ev) override;
virtual int comboTabBarPixelMetric(SizeType sizeType) const; virtual int comboTabBarPixelMetric(SizeType sizeType) const;
virtual QSize tabSizeHint(int index, bool fast = false) const; virtual QSize tabSizeHint(int index, bool fast = false) const;
@ -241,7 +241,7 @@ public:
void setTabButton(int index, QTabBar::ButtonPosition position, QWidget* widget); 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; QSize baseClassTabSizeHint(int index) const;
QRect draggedTabRect() const; QRect draggedTabRect() const;
@ -267,11 +267,11 @@ public Q_SLOTS:
void setCurrentIndex(int index); void setCurrentIndex(int index);
private: private:
bool event(QEvent* ev); bool event(QEvent* ev) override;
void paintEvent(QPaintEvent* event); void paintEvent(QPaintEvent* event) override;
void mousePressEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent* event); void mouseReleaseEvent(QMouseEvent* event) override;
int dragOffset(QStyleOptionTab *option, int tabIndex) const; int dragOffset(QStyleOptionTab *option, int tabIndex) const;
void initStyleOption(QStyleOptionTab* option, int tabIndex) const; void initStyleOption(QStyleOptionTab* option, int tabIndex) const;
@ -341,8 +341,8 @@ private Q_SLOTS:
void updateScrollButtonsState(); void updateScrollButtonsState();
private: private:
void mouseMoveEvent(QMouseEvent* event); void mouseMoveEvent(QMouseEvent* event) override;
void resizeEvent(QResizeEvent* event); void resizeEvent(QResizeEvent* event) override;
QTabBar* m_tabBar; QTabBar* m_tabBar;
QScrollArea* m_scrollArea; QScrollArea* m_scrollArea;

30
src/lib/tabwidget/tabbar.h
View File

@ -36,12 +36,12 @@ public:
void loadSettings(); void loadSettings();
TabWidget* tabWidget() const; TabWidget* tabWidget() const;
void setVisible(bool visible); void setVisible(bool visible) override;
void setForceHidden(bool hidden); void setForceHidden(bool hidden);
void setTabText(int index, const QString &text); void setTabText(int index, const QString &text);
void wheelEvent(QWheelEvent* event); void wheelEvent(QWheelEvent* event) override;
Q_SIGNALS: Q_SIGNALS:
void moveAddTabButton(int posX); void moveAddTabButton(int posX);
@ -54,26 +54,26 @@ private Q_SLOTS:
private: private:
inline bool validIndex(int index) const { return index >= 0 && index < count(); } inline bool validIndex(int index) const { return index >= 0 && index < count(); }
void tabInserted(int index); void tabInserted(int index) override;
void tabRemoved(int index); void tabRemoved(int index) override;
void hideCloseButton(int index); void hideCloseButton(int index);
void showCloseButton(int index); void showCloseButton(int index);
void updatePinnedTabCloseButton(int index); void updatePinnedTabCloseButton(int index);
void contextMenuEvent(QContextMenuEvent* event); void contextMenuEvent(QContextMenuEvent* event) override;
void mouseDoubleClickEvent(QMouseEvent* event); void mouseDoubleClickEvent(QMouseEvent* event) override;
void mousePressEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent* event); void mouseMoveEvent(QMouseEvent* event) override;
void mouseReleaseEvent(QMouseEvent* event); void mouseReleaseEvent(QMouseEvent* event) override;
void dragEnterEvent(QDragEnterEvent* event); void dragEnterEvent(QDragEnterEvent* event) override;
void dragMoveEvent(QDragMoveEvent *event); void dragMoveEvent(QDragMoveEvent *event) override;
void dragLeaveEvent(QDragLeaveEvent *event); void dragLeaveEvent(QDragLeaveEvent *event) override;
void dropEvent(QDropEvent* event); void dropEvent(QDropEvent* event) override;
QSize tabSizeHint(int index, bool fast) const; QSize tabSizeHint(int index, bool fast) const override;
int comboTabBarPixelMetric(ComboTabBar::SizeType sizeType) const; int comboTabBarPixelMetric(ComboTabBar::SizeType sizeType) const override;
WebTab* webTab(int index = -1) const; WebTab* webTab(int index = -1) const;
BrowserWindow* m_window; BrowserWindow* m_window;

4
src/lib/tabwidget/tabstackedwidget.h
View File

@ -78,8 +78,8 @@ private Q_SLOTS:
void tabWasRemoved(int index); void tabWasRemoved(int index);
protected: protected:
bool eventFilter(QObject* obj, QEvent* event); bool eventFilter(QObject* obj, QEvent* event) override;
void keyPressEvent(QKeyEvent* event); void keyPressEvent(QKeyEvent* event) override;
private: private:
bool validIndex(int index) const; bool validIndex(int index) const;

6
src/lib/tabwidget/tabwidget.h
View File

@ -42,8 +42,8 @@ public:
explicit AddTabButton(TabWidget* tabWidget, TabBar* tabBar); explicit AddTabButton(TabWidget* tabWidget, TabBar* tabBar);
private: private:
void wheelEvent(QWheelEvent* event); void wheelEvent(QWheelEvent* event) override;
void mouseReleaseEvent(QMouseEvent* event); void mouseReleaseEvent(QMouseEvent* event) override;
TabBar* m_tabBar; TabBar* m_tabBar;
TabWidget* m_tabWidget; TabWidget* m_tabWidget;
@ -59,7 +59,7 @@ Q_SIGNALS:
void closeTab(int); void closeTab(int);
private: private:
void mouseReleaseEvent(QMouseEvent* event); void mouseReleaseEvent(QMouseEvent* event) override;
}; };
class FALKON_EXPORT TabWidget : public TabStackedWidget class FALKON_EXPORT TabWidget : public TabStackedWidget

2
src/lib/tools/animatedwidget.h
View File

@ -42,7 +42,7 @@ private Q_SLOTS:
void animateFrame(int frame); void animateFrame(int frame);
private: private:
void resizeEvent(QResizeEvent* e); void resizeEvent(QResizeEvent* e) override;
Direction m_direction; Direction m_direction;
QTimeLine m_timeLine; QTimeLine m_timeLine;

4
src/lib/tools/buttonwithmenu.h
View File

@ -82,8 +82,8 @@ private Q_SLOTS:
void generateMenu(); void generateMenu();
private: private:
void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event) override;
void wheelEvent(QWheelEvent* event); void wheelEvent(QWheelEvent* event) override;
QMenu* m_menu; QMenu* m_menu;
QVector<Item> m_items; QVector<Item> m_items;

4
src/lib/tools/clickablelabel.h
View File

@ -50,8 +50,8 @@ Q_SIGNALS:
private: private:
void updateIcon(); void updateIcon();
void resizeEvent(QResizeEvent *ev); void resizeEvent(QResizeEvent *ev) override;
void mouseReleaseEvent(QMouseEvent* ev); void mouseReleaseEvent(QMouseEvent* ev) override;
QString m_themeIcon; QString m_themeIcon;
QIcon m_fallbackIcon; QIcon m_fallbackIcon;

4
src/lib/tools/enhancedmenu.h
View File

@ -42,8 +42,8 @@ Q_SIGNALS:
public Q_SLOTS: public Q_SLOTS:
private: private:
void mouseReleaseEvent(QMouseEvent* e); void mouseReleaseEvent(QMouseEvent* e) override;
void keyPressEvent(QKeyEvent* e); void keyPressEvent(QKeyEvent* e) override;
void closeAllMenus(); void closeAllMenus();

4
src/lib/tools/focusselectlineedit.h
View File

@ -32,8 +32,8 @@ public Q_SLOTS:
void setFocus(); void setFocus();
protected: protected:
void focusInEvent(QFocusEvent* event); void focusInEvent(QFocusEvent* event) override;
void mousePressEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event) override;
bool m_mouseFocusReason; bool m_mouseFocusReason;

4
src/lib/tools/headerview.h
View File

@ -39,8 +39,8 @@ private Q_SLOTS:
void toggleSectionVisibility(); void toggleSectionVisibility();
private: private:
void showEvent(QShowEvent* event); void showEvent(QShowEvent* event) override;
void contextMenuEvent(QContextMenuEvent* event); void contextMenuEvent(QContextMenuEvent* event) override;
QAbstractItemView* m_parent; QAbstractItemView* m_parent;
QMenu* m_menu; QMenu* m_menu;

8
src/lib/tools/horizontallistwidget.h
View File

@ -26,10 +26,10 @@ public:
explicit HorizontalListWidget(QWidget* parent = 0); explicit HorizontalListWidget(QWidget* parent = 0);
private: private:
void mousePressEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent* event); void mouseMoveEvent(QMouseEvent* event) override;
void mouseReleaseEvent(QMouseEvent* event); void mouseReleaseEvent(QMouseEvent* event) override;
void wheelEvent(QWheelEvent* event); void wheelEvent(QWheelEvent* event) override;
bool m_mouseDown; bool m_mouseDown;
}; };

4
src/lib/tools/listitemdelegate.h
View File

@ -32,8 +32,8 @@ public:
int itemHeight() const; int itemHeight() const;
void paint(QPainter* painter, 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; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private: private:
int m_iconSize; int m_iconSize;

2
src/lib/tools/progressbar.h
View File

@ -34,7 +34,7 @@ public Q_SLOTS:
void setValue(int value); void setValue(int value);
protected: protected:
void paintEvent(QPaintEvent* e); void paintEvent(QPaintEvent* e) override;
void initStyleOption(QStyleOptionProgressBar* option); void initStyleOption(QStyleOptionProgressBar* option);
private: private:

10
src/lib/tools/toolbutton.h
View File

@ -87,11 +87,11 @@ private Q_SLOTS:
void showMenu(); void showMenu();
protected: protected:
void mousePressEvent(QMouseEvent* e); void mousePressEvent(QMouseEvent* e) override;
void mouseReleaseEvent(QMouseEvent* e); void mouseReleaseEvent(QMouseEvent* e) override;
void mouseDoubleClickEvent(QMouseEvent* e); void mouseDoubleClickEvent(QMouseEvent* e) override;
void contextMenuEvent(QContextMenuEvent *e); void contextMenuEvent(QContextMenuEvent *e) override;
void paintEvent(QPaintEvent* e); void paintEvent(QPaintEvent* e) override;
private: private:
QImage m_multiIcon; QImage m_multiIcon;

2
src/lib/tools/treewidget.h
View File

@ -57,7 +57,7 @@ private Q_SLOTS:
void sheduleRefresh(); void sheduleRefresh();
private: private:
void mousePressEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event) override;
void iterateAllItems(QTreeWidgetItem* parent); void iterateAllItems(QTreeWidgetItem* parent);
bool m_refreshAllItemsNeeded; bool m_refreshAllItemsNeeded;

4
src/lib/webengine/webinspector.h
View File

@ -45,8 +45,8 @@ private Q_SLOTS:
void loadFinished(); void loadFinished();
private: private:
void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent *event) override;
void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent *event) override;
static QList<QWebEngineView*> s_views; static QList<QWebEngineView*> s_views;

14
src/lib/webengine/webpage.h
View File

@ -57,9 +57,9 @@ public:
void scroll(int x, int y); void scroll(int x, int y);
void setScrollPosition(const QPointF &pos); void setScrollPosition(const QPointF &pos);
bool javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, const QString &defaultValue, QString* result) 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) Q_DECL_OVERRIDE; bool javaScriptConfirm(const QUrl &securityOrigin, const QString &msg) override;
void javaScriptAlert(const QUrl &securityOrigin, const QString &msg) Q_DECL_OVERRIDE; void javaScriptAlert(const QUrl &securityOrigin, const QString &msg) override;
void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID) override; void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID) override;
QStringList autoFillUsernames() const; QStringList autoFillUsernames() const;
@ -94,10 +94,10 @@ private Q_SLOTS:
void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode); void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode);
private: private:
bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) Q_DECL_OVERRIDE; bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) override;
bool certificateError(const QWebEngineCertificateError &error) Q_DECL_OVERRIDE; bool certificateError(const QWebEngineCertificateError &error) override;
QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes) Q_DECL_OVERRIDE; QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes) override;
QWebEnginePage* createWindow(QWebEnginePage::WebWindowType type) Q_DECL_OVERRIDE; QWebEnginePage* createWindow(QWebEnginePage::WebWindowType type) override;
void handleUnknownProtocol(const QUrl &url); void handleUnknownProtocol(const QUrl &url);
void desktopServicesOpen(const QUrl &url); void desktopServicesOpen(const QUrl &url);

2
src/lib/webtab/searchtoolbar.h
View File

@ -42,7 +42,7 @@ public:
void showMinimalInPopupWindow(); void showMinimalInPopupWindow();
void focusSearchLine(); void focusSearchLine();
bool eventFilter(QObject* obj, QEvent* event); bool eventFilter(QObject* obj, QEvent* event) override;
public Q_SLOTS: public Q_SLOTS:
void setText(const QString &text); void setText(const QString &text);

14
src/lib/webtab/tabbedwebview.h
View File

@ -48,12 +48,12 @@ public:
QString getIp() const; QString getIp() const;
int tabIndex() const; int tabIndex() const;
QWidget* overlayWidget() Q_DECL_OVERRIDE; QWidget* overlayWidget() override;
void closeView() Q_DECL_OVERRIDE; void closeView() override;
void loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position) Q_DECL_OVERRIDE; void loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position) override;
bool isFullScreen() Q_DECL_OVERRIDE; bool isFullScreen() override;
void requestFullScreen(bool enable) Q_DECL_OVERRIDE; void requestFullScreen(bool enable) override;
Q_SIGNALS: Q_SIGNALS:
void wantsCloseTab(int); void wantsCloseTab(int);
@ -73,8 +73,8 @@ private Q_SLOTS:
void inspectElement(); void inspectElement();
private: private:
void _contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; void _contextMenuEvent(QContextMenuEvent *event) override;
void _mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void _mouseMoveEvent(QMouseEvent *event) override;
BrowserWindow* m_window; BrowserWindow* m_window;
WebTab* m_webTab; WebTab* m_webTab;

2
src/plugins/AutoScroll/autoscroller.h
View File

@ -58,7 +58,7 @@ public:
void setScrollDivider(double divider); void setScrollDivider(double divider);
private: private:
bool eventFilter(QObject* obj, QEvent* event); bool eventFilter(QObject* obj, QEvent* event) override;
bool showIndicator(WebView* view, const QPoint &pos); bool showIndicator(WebView* view, const QPoint &pos);
void stopScrolling(); void stopScrolling();

4
src/plugins/FlashCookieManager/fcm_dialog.h
View File

@ -69,8 +69,8 @@ private Q_SLOTS:
void cookieTreeContextMenuRequested(const QPoint &pos); void cookieTreeContextMenuRequested(const QPoint &pos);
private: private:
void closeEvent(QCloseEvent* e); void closeEvent(QCloseEvent* e) override;
void keyPressEvent(QKeyEvent* e); void keyPressEvent(QKeyEvent* e) override;
Ui::FCM_Dialog* ui; Ui::FCM_Dialog* ui;

4
src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h
View File

@ -27,8 +27,8 @@ public:
int padding() const; int padding() const;
void paint(QPainter* painter, 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; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private: private:
QPixmap m_removePixmap; QPixmap m_removePixmap;

4
src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h
View File

@ -38,8 +38,8 @@ private:
bool containsRemoveIcon(const QPoint &pos) const; bool containsRemoveIcon(const QPoint &pos) const;
bool containsUpdateIcon(const QPoint &pos) const; bool containsUpdateIcon(const QPoint &pos) const;
void mousePressEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event) override;
void mouseDoubleClickEvent(QMouseEvent* event); void mouseDoubleClickEvent(QMouseEvent* event) override;
GM_SettingsListDelegate* m_delegate; GM_SettingsListDelegate* m_delegate;

2
src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.cpp vendored
View File

@ -55,7 +55,7 @@ public:
m_object = object; m_object = object;
} }
void callback() { void callback() override {
m_object->emitGestured(); m_object->emitGestured();
} }

2
src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.h vendored
View File

@ -82,7 +82,7 @@ public:
bool mouseMoveEvent(QMouseEvent* event, QObject* obj = 0); bool mouseMoveEvent(QMouseEvent* event, QObject* obj = 0);
protected: protected:
bool eventFilter(QObject* obj, QEvent* event); bool eventFilter(QObject* obj, QEvent* event) override;
private: private:
bool paintEvent(QObject* obj, QPaintEvent* event); bool paintEvent(QObject* obj, QPaintEvent* event);

2
src/plugins/StatusBarIcons/sbi_networkicon.h
View File

@ -40,7 +40,7 @@ private Q_SLOTS:
private: private:
void updateToolTip(); void updateToolTip();
void enterEvent(QEvent* event); void enterEvent(QEvent* event) override;
QNetworkConfigurationManager* m_networkConfiguration; QNetworkConfigurationManager* m_networkConfiguration;
}; };

2
src/plugins/TabManager/tabmanagerdelegate.h
View File

@ -25,7 +25,7 @@ class TabManagerDelegate : public QStyledItemDelegate
public: public:
explicit TabManagerDelegate(QObject* parent = 0); 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: private:
void viewItemDrawText(QPainter *p, const QStyleOptionViewItem *option, const QRect &rect, void viewItemDrawText(QPainter *p, const QStyleOptionViewItem *option, const QRect &rect,

2
src/plugins/TabManager/tabmanagersettings.h
View File

@ -17,7 +17,7 @@ public:
~TabManagerSettings(); ~TabManagerSettings();
public Q_SLOTS: public Q_SLOTS:
void accept(); void accept() override;
private: private:
Ui::TabManagerSettings* ui; Ui::TabManagerSettings* ui;

2
src/plugins/TabManager/tabmanagerwidget.cpp
View File

@ -880,7 +880,7 @@ QStringList TabTreeWidget::mimeTypes() const
return types; return types;
} }
QMimeData *TabTreeWidget::mimeData(const QList<QTreeWidgetItem*> &items) const QMimeData *TabTreeWidget::mimeData(const QList<QTreeWidgetItem*> items) const
{ {
QMimeData* mimeData = new QMimeData(); QMimeData* mimeData = new QMimeData();
QByteArray encodedData; QByteArray encodedData;

10
src/plugins/TabManager/tabmanagerwidget.h
View File

@ -42,10 +42,10 @@ class TabTreeWidget : public QTreeWidget
public: public:
TabTreeWidget(QWidget* parent = 0); TabTreeWidget(QWidget* parent = 0);
Qt::DropActions supportedDropActions() const; Qt::DropActions supportedDropActions() const override;
QStringList mimeTypes() const; QStringList mimeTypes() const override;
QMimeData* mimeData(const QList<QTreeWidgetItem*> &items) const; QMimeData* mimeData(const QList<QTreeWidgetItem*> items) const override;
bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action); bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action) override;
void setEnableDragTabs(bool enable); void setEnableDragTabs(bool enable);
@ -110,7 +110,7 @@ private Q_SLOTS:
void filterBarClosed(); void filterBarClosed();
protected: protected:
bool eventFilter(QObject* obj, QEvent* event); bool eventFilter(QObject* obj, QEvent* event) override;
Q_SIGNALS: Q_SIGNALS:
void showSideBySide(); void showSideBySide();

6
src/plugins/TabManager/tabmanagerwidgetcontroller.h
View File

@ -32,9 +32,9 @@ public:
explicit TabManagerWidgetController(QObject* parent = 0); explicit TabManagerWidgetController(QObject* parent = 0);
~TabManagerWidgetController(); ~TabManagerWidgetController();
QString title() const; QString title() const override;
QAction* createMenuAction(); QAction* createMenuAction() override;
QWidget* createSideBarWidget(BrowserWindow* mainWindow); QWidget* createSideBarWidget(BrowserWindow* mainWindow) override;
AbstractButtonInterface* createStatusBarIcon(BrowserWindow* mainWindow); AbstractButtonInterface* createStatusBarIcon(BrowserWindow* mainWindow);