From 883f24aeba80fc4f8f2b2f1cd34d0a04e1fac269 Mon Sep 17 00:00:00 2001 From: Juraj Oravec Date: Tue, 21 Nov 2023 01:12:28 +0100 Subject: [PATCH] Always use nullptr for zero pointer Signed-off-by: Juraj Oravec --- src/lib/3rdparty/lineedit.cpp | 6 ++--- .../qtsingleapplication/qtlocalpeer.h | 2 +- .../qtsingleapplication.cpp | 2 +- src/lib/adblock/adblockmatcher.cpp | 6 ++--- src/lib/adblock/adblocksearchtree.cpp | 6 ++--- src/lib/adblock/adblocksearchtree.h | 2 +- src/lib/adblock/adblocksubscription.cpp | 4 +-- src/lib/adblock/adblocktreewidget.cpp | 4 +-- src/lib/app/browserwindow.cpp | 18 ++++++------- src/lib/app/browserwindow.h | 4 +-- src/lib/app/mainapplication.cpp | 4 +-- src/lib/app/profilemanager.cpp | 2 +- src/lib/app/proxystyle.h | 2 +- src/lib/app/settings.cpp | 4 +-- src/lib/autofill/autofillnotification.cpp | 2 +- .../bookmarksexport/bookmarksexportdialog.cpp | 2 +- src/lib/bookmarks/bookmarksicon.cpp | 6 ++--- .../bookmarksimport/operaimporter.cpp | 2 +- src/lib/bookmarks/bookmarksmanager.h | 8 +++--- src/lib/bookmarks/bookmarksmenu.cpp | 2 +- src/lib/bookmarks/bookmarkstoolbar.cpp | 10 +++---- src/lib/bookmarks/bookmarkstoolbarbutton.cpp | 2 +- src/lib/bookmarks/bookmarkstoolbarbutton.h | 6 ++--- src/lib/bookmarks/bookmarkstools.cpp | 2 +- src/lib/bookmarks/bookmarkstools.h | 6 ++--- src/lib/bookmarks/bookmarkstreeview.cpp | 2 +- src/lib/history/history.cpp | 2 +- src/lib/history/historyitem.cpp | 2 +- src/lib/history/historymenu.cpp | 2 +- src/lib/history/historymodel.cpp | 20 +++++++------- .../completer/locationcompleter.cpp | 8 +++--- .../completer/locationcompleterdelegate.cpp | 2 +- .../completer/locationcompleterdelegate.h | 2 +- src/lib/navigation/locationbar.cpp | 2 +- src/lib/navigation/navigationbar.cpp | 6 ++--- src/lib/navigation/navigationcontainer.cpp | 2 +- src/lib/navigation/siteicon.cpp | 2 +- src/lib/notifications/desktopnotification.cpp | 2 +- src/lib/opensearch/opensearchengine.cpp | 10 +++---- src/lib/opensearch/searchenginesmanager.cpp | 4 +-- src/lib/other/protocolhandlerdialog.h | 2 +- src/lib/other/registerqappassociation.h | 4 +-- src/lib/other/siteinfo.cpp | 2 +- src/lib/plugins/plugininterface.h | 2 +- src/lib/plugins/speeddial.cpp | 2 +- src/lib/popupwindow/popuplocationbar.cpp | 2 +- src/lib/popupwindow/popupwindow.cpp | 2 +- src/lib/preferences/autofillmanager.cpp | 2 +- src/lib/preferences/pluginlistdelegate.cpp | 2 +- src/lib/preferences/preferences.cpp | 6 ++--- src/lib/session/sessionmanagerdialog.h | 2 +- src/lib/sidebar/bookmarkssidebar.h | 8 +++--- src/lib/sidebar/sidebarinterface.h | 2 +- src/lib/tabwidget/combotabbar.cpp | 14 +++++----- src/lib/tabwidget/tabbar.cpp | 4 +-- src/lib/tabwidget/tabicon.cpp | 2 +- src/lib/tabwidget/tabstackedwidget.cpp | 6 ++--- src/lib/tabwidget/tabwidget.h | 2 +- src/lib/tools/aesinterface.cpp | 4 +-- .../html5permissionsnotification.cpp | 2 +- src/lib/tools/listitemdelegate.cpp | 4 +-- src/lib/tools/qztools.cpp | 6 ++--- src/lib/tools/toolbutton.cpp | 2 +- src/lib/tools/treewidget.cpp | 2 +- src/lib/webengine/webpage.cpp | 12 ++++----- src/lib/webengine/webscrollbarmanager.h | 2 +- src/lib/webengine/webview.cpp | 2 +- src/lib/webtab/tabbedwebview.cpp | 2 +- src/plugins/AutoScroll/autoscroller.cpp | 4 +-- src/plugins/AutoScroll/autoscroller.h | 2 +- src/plugins/AutoScroll/autoscrollplugin.cpp | 2 +- src/plugins/AutoScroll/autoscrollsettings.h | 2 +- src/plugins/AutoScroll/framescroller.cpp | 2 +- src/plugins/AutoScroll/framescroller.h | 2 +- src/plugins/FlashCookieManager/fcm_dialog.h | 2 +- .../FlashCookieManager/fcm_notification.cpp | 2 +- src/plugins/FlashCookieManager/fcm_plugin.cpp | 2 +- .../gnomekeyringplugin.cpp | 2 +- src/plugins/GreaseMonkey/gm_jsobject.cpp | 2 +- src/plugins/GreaseMonkey/gm_jsobject.h | 2 +- src/plugins/GreaseMonkey/gm_manager.h | 2 +- src/plugins/GreaseMonkey/gm_notification.cpp | 4 +-- src/plugins/GreaseMonkey/gm_plugin.cpp | 2 +- src/plugins/GreaseMonkey/gm_plugin.h | 2 +- .../GreaseMonkey/settings/gm_settings.cpp | 2 +- .../GreaseMonkey/settings/gm_settings.h | 2 +- .../settings/gm_settingslistdelegate.cpp | 2 +- .../settings/gm_settingslistdelegate.h | 2 +- .../settings/gm_settingslistwidget.h | 2 +- .../settings/gm_settingsscriptinfo.h | 2 +- .../kwalletpasswordbackend.cpp | 2 +- .../MouseGestures/3rdparty/QjtMouseGesture.h | 2 +- .../3rdparty/QjtMouseGestureFilter.h | 8 +++--- .../MouseGestures/3rdparty/ring_buffer.h | 2 +- src/plugins/MouseGestures/mousegestures.cpp | 2 +- src/plugins/MouseGestures/mousegestures.h | 2 +- .../mousegesturessettingsdialog.h | 2 +- src/plugins/PIM/PIM_handler.h | 4 +-- src/plugins/PIM/PIM_plugin.cpp | 2 +- src/plugins/PIM/PIM_settings.h | 2 +- src/plugins/StatusBarIcons/sbi_icon.cpp | 4 +-- .../StatusBarIcons/sbi_iconsmanager.cpp | 2 +- src/plugins/StatusBarIcons/sbi_iconsmanager.h | 2 +- src/plugins/StatusBarIcons/sbi_imagesicon.cpp | 2 +- .../StatusBarIcons/sbi_javascripticon.cpp | 2 +- .../StatusBarIcons/sbi_networkicondialog.h | 2 +- .../StatusBarIcons/sbi_networkmanager.h | 2 +- src/plugins/StatusBarIcons/sbi_proxywidget.h | 2 +- .../StatusBarIcons/sbi_settingsdialog.h | 2 +- src/plugins/StatusBarIcons/sbi_zoomwidget.h | 2 +- .../StatusBarIcons/statusbariconsplugin.cpp | 2 +- src/plugins/TabManager/tabmanagerdelegate.cpp | 2 +- src/plugins/TabManager/tabmanagerdelegate.h | 2 +- src/plugins/TabManager/tabmanagerplugin.cpp | 8 +++--- src/plugins/TabManager/tabmanagersettings.h | 2 +- src/plugins/TabManager/tabmanagerwidget.cpp | 26 +++++++++---------- src/plugins/TabManager/tabmanagerwidget.h | 8 +++--- .../TabManager/tabmanagerwidgetcontroller.cpp | 6 ++--- .../TabManager/tabmanagerwidgetcontroller.h | 6 ++--- .../TabManager/tldextractor/tldextractor.cpp | 10 +++---- .../TabManager/tldextractor/tldextractor.h | 2 +- src/plugins/TestPlugin/testplugin.cpp | 2 +- src/plugins/TestPlugin/testplugin_sidebar.h | 2 +- tests/modeltest/modeltest.h | 2 +- 124 files changed, 232 insertions(+), 232 deletions(-) diff --git a/src/lib/3rdparty/lineedit.cpp b/src/lib/3rdparty/lineedit.cpp index 6aef036d2..bc3217f2b 100644 --- a/src/lib/3rdparty/lineedit.cpp +++ b/src/lib/3rdparty/lineedit.cpp @@ -57,8 +57,8 @@ bool SideWidget::event(QEvent* event) LineEdit::LineEdit(QWidget* parent) : QLineEdit(parent) - , m_leftLayout(0) - , m_rightLayout(0) + , m_leftLayout(nullptr) + , m_rightLayout(nullptr) , m_minHeight(0) , m_leftMargin(-1) , m_ignoreMousePress(false) @@ -219,7 +219,7 @@ QMenu* LineEdit::createContextMenu() QMenu* tmp = createStandardContextMenu(); tmp->setParent(popup); tmp->hide(); - QAction* lastAction = !tmp->actions().isEmpty() ? tmp->actions().constLast() : 0; + QAction* lastAction = !tmp->actions().isEmpty() ? tmp->actions().constLast() : nullptr; if (lastAction && lastAction->menu() && lastAction->menu()->inherits("QUnicodeControlCharacterMenu")) { popup->addAction(lastAction); diff --git a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.h b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.h index e7c2e2efb..4fd7fe30c 100644 --- a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.h +++ b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.h @@ -52,7 +52,7 @@ class QtLocalPeer : public QObject Q_OBJECT public: - QtLocalPeer(QObject *parent = 0, const QString &appId = QString()); + QtLocalPeer(QObject *parent = nullptr, const QString &appId = QString()); bool isClient(); bool sendMessage(const QString &message, int timeout); QString applicationId() const diff --git a/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.cpp b/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.cpp index 10cc90237..89fafd78b 100644 --- a/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.cpp +++ b/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.cpp @@ -135,7 +135,7 @@ void QtSingleApplication::sysInit(const QString &appId) { - actWin = 0; + actWin = nullptr; peer = new QtLocalPeer(this, appId); connect(peer, &QtLocalPeer::messageReceived, this, &QtSingleApplication::messageReceived); } diff --git a/src/lib/adblock/adblockmatcher.cpp b/src/lib/adblock/adblockmatcher.cpp index 4e55179c7..a59bdc223 100644 --- a/src/lib/adblock/adblockmatcher.cpp +++ b/src/lib/adblock/adblockmatcher.cpp @@ -35,13 +35,13 @@ const AdBlockRule* AdBlockMatcher::match(const QWebEngineUrlRequestInfo &request { // Exception rules if (m_networkExceptionTree.find(request, urlDomain, urlString)) - return 0; + return nullptr; int count = m_networkExceptionRules.count(); for (int i = 0; i < count; ++i) { const AdBlockRule* rule = m_networkExceptionRules.at(i); if (rule->networkMatch(request, urlDomain, urlString)) - return 0; + return nullptr; } // Block rules @@ -55,7 +55,7 @@ const AdBlockRule* AdBlockMatcher::match(const QWebEngineUrlRequestInfo &request return rule; } - return 0; + return nullptr; } bool AdBlockMatcher::adBlockDisabledForUrl(const QUrl &url) const diff --git a/src/lib/adblock/adblocksearchtree.cpp b/src/lib/adblock/adblocksearchtree.cpp index 6e5cf9200..9a0675926 100644 --- a/src/lib/adblock/adblocksearchtree.cpp +++ b/src/lib/adblock/adblocksearchtree.cpp @@ -73,7 +73,7 @@ const AdBlockRule* AdBlockSearchTree::find(const QWebEngineUrlRequestInfo &reque int len = urlString.size(); if (len <= 0) { - return 0; + return nullptr; } const QChar* string = urlString.constData(); @@ -85,13 +85,13 @@ const AdBlockRule* AdBlockSearchTree::find(const QWebEngineUrlRequestInfo &reque } } - return 0; + return nullptr; } const AdBlockRule* AdBlockSearchTree::prefixSearch(const QWebEngineUrlRequestInfo &request, const QString &domain, const QString &urlString, const QChar* string, int len) const { if (len <= 0) { - return 0; + return nullptr; } QChar c = string[0]; diff --git a/src/lib/adblock/adblocksearchtree.h b/src/lib/adblock/adblocksearchtree.h index c98480201..200dc7319 100644 --- a/src/lib/adblock/adblocksearchtree.h +++ b/src/lib/adblock/adblocksearchtree.h @@ -44,7 +44,7 @@ private: const AdBlockRule* rule; QHash children; - Node() : c(0) , rule(0) { } + Node() : c(0) , rule(nullptr) { } }; const AdBlockRule* prefixSearch(const QWebEngineUrlRequestInfo &request, const QString &domain, diff --git a/src/lib/adblock/adblocksubscription.cpp b/src/lib/adblock/adblocksubscription.cpp index a2e21987c..3ec510f0a 100644 --- a/src/lib/adblock/adblocksubscription.cpp +++ b/src/lib/adblock/adblocksubscription.cpp @@ -167,7 +167,7 @@ void AdBlockSubscription::subscriptionDownloaded() } m_reply->deleteLater(); - m_reply = 0; + m_reply = nullptr; if (error) { Q_EMIT subscriptionError(tr("Cannot load subscription!")); @@ -412,7 +412,7 @@ bool AdBlockCustomList::removeRule(int offset) const AdBlockRule* AdBlockCustomList::replaceRule(AdBlockRule* rule, int offset) { if (!QzTools::containsIndex(m_rules, offset)) { - return 0; + return nullptr; } AdBlockRule* oldRule = m_rules.at(offset); diff --git a/src/lib/adblock/adblocktreewidget.cpp b/src/lib/adblock/adblocktreewidget.cpp index 191ee9175..b4ddd6ca9 100644 --- a/src/lib/adblock/adblocktreewidget.cpp +++ b/src/lib/adblock/adblocktreewidget.cpp @@ -27,7 +27,7 @@ AdBlockTreeWidget::AdBlockTreeWidget(AdBlockSubscription* subscription, QWidget* parent) : TreeWidget(parent) , m_subscription(subscription) - , m_topItem(0) + , m_topItem(nullptr) , m_itemChangingBlock(false) { setContextMenuPolicy(Qt::CustomContextMenu); @@ -266,6 +266,6 @@ void AdBlockTreeWidget::refresh() ++index; } - showRule(0); + showRule(nullptr); m_itemChangingBlock = false; } diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index 884e5a97d..a0b3f736c 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -1565,7 +1565,7 @@ static xcb_connection_t *getXcbConnection() { const QNativeInterface::QX11Application *x11App = qApp->nativeInterface(); if (x11App == nullptr) - return 0; + return nullptr; return x11App->connection(); } @@ -1575,18 +1575,18 @@ int BrowserWindow::getCurrentVirtualDesktop() const return 0; xcb_connection_t *connection = getXcbConnection(); - if (connection == 0) + if (connection == nullptr) return 0; xcb_intern_atom_cookie_t intern_atom; - xcb_intern_atom_reply_t *atom_reply = 0; + xcb_intern_atom_reply_t *atom_reply = nullptr; xcb_atom_t atom; xcb_get_property_cookie_t cookie; - xcb_get_property_reply_t *reply = 0; + xcb_get_property_reply_t *reply = nullptr; uint32_t value; intern_atom = xcb_intern_atom(connection, false, qstrlen("_NET_WM_DESKTOP"), "_NET_WM_DESKTOP"); - atom_reply = xcb_intern_atom_reply(connection, intern_atom, 0); + atom_reply = xcb_intern_atom_reply(connection, intern_atom, nullptr); if (!atom_reply) goto error; @@ -1594,7 +1594,7 @@ int BrowserWindow::getCurrentVirtualDesktop() const atom = atom_reply->atom; cookie = xcb_get_property(connection, false, winId(), atom, XCB_ATOM_CARDINAL, 0, 1); - reply = xcb_get_property_reply(connection, cookie, 0); + reply = xcb_get_property_reply(connection, cookie, nullptr); if (!reply || reply->type != XCB_ATOM_CARDINAL || reply->value_len != 1 || reply->format != sizeof(uint32_t) * 8) goto error; @@ -1621,15 +1621,15 @@ void BrowserWindow::moveToVirtualDesktop(int desktopId) return; xcb_connection_t *connection = getXcbConnection(); - if (connection == 0) + if (connection == nullptr) return; xcb_intern_atom_cookie_t intern_atom; - xcb_intern_atom_reply_t *atom_reply = 0; + xcb_intern_atom_reply_t *atom_reply = nullptr; xcb_atom_t atom; intern_atom = xcb_intern_atom(connection, false, qstrlen("_NET_WM_DESKTOP"), "_NET_WM_DESKTOP"); - atom_reply = xcb_intern_atom_reply(connection, intern_atom, 0); + atom_reply = xcb_intern_atom_reply(connection, intern_atom, nullptr); if (!atom_reply) goto error; diff --git a/src/lib/app/browserwindow.h b/src/lib/app/browserwindow.h index 016022263..6cd64f942 100644 --- a/src/lib/app/browserwindow.h +++ b/src/lib/app/browserwindow.h @@ -155,8 +155,8 @@ public Q_SLOTS: void toggleFullScreen(); void requestHtmlFullScreen(TabbedWebView *view, bool enable); - void loadActionUrl(QObject* obj = 0); - void loadActionUrlInNewTab(QObject* obj = 0); + void loadActionUrl(QObject* obj = nullptr); + void loadActionUrlInNewTab(QObject* obj = nullptr); void bookmarkPage(); void bookmarkAllTabs(); diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index fc14dfd06..db4119d19 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -448,7 +448,7 @@ BrowserWindow* MainApplication::getWindow() const return m_lastActiveWindow.data(); } - return m_windows.isEmpty() ? 0 : m_windows.at(0); + return m_windows.isEmpty() ? nullptr : m_windows.at(0); } BrowserWindow* MainApplication::createWindow(Qz::BrowserWindowType type, const QUrl &startUrl) @@ -516,7 +516,7 @@ void MainApplication::destroyRestoreManager() } delete m_restoreManager; - m_restoreManager = 0; + m_restoreManager = nullptr; } void MainApplication::reloadSettings() diff --git a/src/lib/app/profilemanager.cpp b/src/lib/app/profilemanager.cpp index 4aa962c9f..177876049 100644 --- a/src/lib/app/profilemanager.cpp +++ b/src/lib/app/profilemanager.cpp @@ -249,7 +249,7 @@ void ProfileManager::copyDataToProfile() const QString text = QSL("Incompatible profile version has been detected. To avoid losing your profile data, they were " "backed up in following file:

") + browseDataBackup + QSL("
"); - QMessageBox::warning(0, QStringLiteral("Falkon: Incompatible profile version"), text); + QMessageBox::warning(nullptr, QStringLiteral("Falkon: Incompatible profile version"), text); } } diff --git a/src/lib/app/proxystyle.h b/src/lib/app/proxystyle.h index fce6479ad..8f4d405c4 100644 --- a/src/lib/app/proxystyle.h +++ b/src/lib/app/proxystyle.h @@ -27,7 +27,7 @@ class FALKON_EXPORT ProxyStyle : public QProxyStyle public: explicit ProxyStyle(); - int styleHint(StyleHint hint, const QStyleOption* option = 0, const QWidget* widget = 0, QStyleHintReturn* returnData = 0) const override; + int styleHint(StyleHint hint, const QStyleOption* option = nullptr, const QWidget* widget = nullptr, QStyleHintReturn* returnData = nullptr) const override; int pixelMetric(PixelMetric metric, const QStyleOption* option, const QWidget* widget) const override; void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = nullptr) const override; diff --git a/src/lib/app/settings.cpp b/src/lib/app/settings.cpp index 5da6a6386..a06877395 100644 --- a/src/lib/app/settings.cpp +++ b/src/lib/app/settings.cpp @@ -20,8 +20,8 @@ #include -QSettings* Settings::s_settings = 0; -QzSettings* Settings::s_qzSettings = 0; +QSettings* Settings::s_settings = nullptr; +QzSettings* Settings::s_qzSettings = nullptr; Settings::Settings() { diff --git a/src/lib/autofill/autofillnotification.cpp b/src/lib/autofill/autofillnotification.cpp index 776044b44..6a4211095 100644 --- a/src/lib/autofill/autofillnotification.cpp +++ b/src/lib/autofill/autofillnotification.cpp @@ -21,7 +21,7 @@ #include "iconprovider.h" AutoFillNotification::AutoFillNotification(const QUrl &url, const PageFormData &formData, const PasswordEntry &updateData) - : AnimatedWidget(AnimatedWidget::Down, 300, 0) + : AnimatedWidget(AnimatedWidget::Down, 300, nullptr) , ui(new Ui::AutoFillNotification) , m_url(url) , m_formData(formData) diff --git a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.cpp b/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.cpp index b6279ad04..6b9fec03e 100644 --- a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.cpp +++ b/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.cpp @@ -26,7 +26,7 @@ BookmarksExportDialog::BookmarksExportDialog(QWidget* parent) : QDialog(parent) , ui(new Ui::BookmarksExportDialog) - , m_currentExporter(0) + , m_currentExporter(nullptr) { setAttribute(Qt::WA_DeleteOnClose); ui->setupUi(this); diff --git a/src/lib/bookmarks/bookmarksicon.cpp b/src/lib/bookmarks/bookmarksicon.cpp index 716609975..bfba06c27 100644 --- a/src/lib/bookmarks/bookmarksicon.cpp +++ b/src/lib/bookmarks/bookmarksicon.cpp @@ -29,8 +29,8 @@ BookmarksIcon::BookmarksIcon(QWidget* parent) : ClickableLabel(parent) - , m_view(0) - , m_bookmark(0) + , m_view(nullptr) + , m_bookmark(nullptr) { setObjectName("locationbar-bookmarkicon"); setCursor(Qt::PointingHandCursor); @@ -60,7 +60,7 @@ void BookmarksIcon::checkBookmark(const QUrl &url, bool forceCheck) } QList items = mApp->bookmarks()->searchBookmarks(url); - m_bookmark = items.isEmpty() ? 0 : items.at(0); + m_bookmark = items.isEmpty() ? nullptr : items.at(0); if (m_bookmark || mApp->plugins()->speedDial()->pageForUrl(url).isValid()) { setBookmarkSaved(); diff --git a/src/lib/bookmarks/bookmarksimport/operaimporter.cpp b/src/lib/bookmarks/bookmarksimport/operaimporter.cpp index 427952f83..eb62519a5 100644 --- a/src/lib/bookmarks/bookmarksimport/operaimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/operaimporter.cpp @@ -81,7 +81,7 @@ BookmarkItem* OperaImporter::importBookmarks() QList folders; folders.append(root); - BookmarkItem* item = 0; + BookmarkItem* item = nullptr; #define PARENT folders.isEmpty() ? root : folders.last() diff --git a/src/lib/bookmarks/bookmarksmanager.h b/src/lib/bookmarks/bookmarksmanager.h index 6192fdf01..b33983cde 100644 --- a/src/lib/bookmarks/bookmarksmanager.h +++ b/src/lib/bookmarks/bookmarksmanager.h @@ -55,10 +55,10 @@ private Q_SLOTS: void bookmarksSelected(const QList &items); void createContextMenu(const QPoint &pos); - void openBookmark(BookmarkItem* item = 0); - void openBookmarkInNewTab(BookmarkItem* item = 0); - void openBookmarkInNewWindow(BookmarkItem* item = 0); - void openBookmarkInNewPrivateWindow(BookmarkItem* item = 0); + void openBookmark(BookmarkItem* item = nullptr); + void openBookmarkInNewTab(BookmarkItem* item = nullptr); + void openBookmarkInNewWindow(BookmarkItem* item = nullptr); + void openBookmarkInNewPrivateWindow(BookmarkItem* item = nullptr); void addBookmark(); void addFolder(); diff --git a/src/lib/bookmarks/bookmarksmenu.cpp b/src/lib/bookmarks/bookmarksmenu.cpp index 3e6e6ab07..370badbac 100644 --- a/src/lib/bookmarks/bookmarksmenu.cpp +++ b/src/lib/bookmarks/bookmarksmenu.cpp @@ -28,7 +28,7 @@ BookmarksMenu::BookmarksMenu(QWidget* parent) : Menu(parent) - , m_window(0) + , m_window(nullptr) , m_changed(true) { init(); diff --git a/src/lib/bookmarks/bookmarkstoolbar.cpp b/src/lib/bookmarks/bookmarkstoolbar.cpp index 53934a881..8d9a86f50 100644 --- a/src/lib/bookmarks/bookmarkstoolbar.cpp +++ b/src/lib/bookmarks/bookmarkstoolbar.cpp @@ -36,7 +36,7 @@ BookmarksToolbar::BookmarksToolbar(BrowserWindow* window, QWidget* parent) : QWidget(parent) , m_window(window) , m_bookmarks(mApp->bookmarks()) - , m_clickedBookmark(0) + , m_clickedBookmark(nullptr) , m_dropRow(-1) { setObjectName("bookmarksbar"); @@ -44,10 +44,10 @@ BookmarksToolbar::BookmarksToolbar(BrowserWindow* window, QWidget* parent) setContextMenuPolicy(Qt::CustomContextMenu); m_layout = new QHBoxLayout(this); - auto contentsMargin = style()->pixelMetric(QStyle::PM_ToolBarItemMargin, 0, this) - + style()->pixelMetric(QStyle::PM_ToolBarFrameWidth, 0, this); + auto contentsMargin = style()->pixelMetric(QStyle::PM_ToolBarItemMargin, nullptr, this) + + style()->pixelMetric(QStyle::PM_ToolBarFrameWidth, nullptr, this); m_layout->setContentsMargins(contentsMargin, contentsMargin, contentsMargin, contentsMargin); - m_layout->setSpacing(style()->pixelMetric(QStyle::PM_ToolBarItemSpacing, 0, this)); + m_layout->setSpacing(style()->pixelMetric(QStyle::PM_ToolBarItemSpacing, nullptr, this)); setLayout(m_layout); m_updateTimer = new QTimer(this); @@ -68,7 +68,7 @@ BookmarksToolbar::BookmarksToolbar(BrowserWindow* window, QWidget* parent) void BookmarksToolbar::contextMenuRequested(const QPoint &pos) { BookmarksToolbarButton* button = buttonAt(pos); - m_clickedBookmark = button ? button->bookmark() : 0; + m_clickedBookmark = button ? button->bookmark() : nullptr; QMenu menu; QAction* actNewTab = menu.addAction(IconProvider::newTabIcon(), tr("Open in new tab")); diff --git a/src/lib/bookmarks/bookmarkstoolbarbutton.cpp b/src/lib/bookmarks/bookmarkstoolbarbutton.cpp index 1b16160be..c9290c5e6 100644 --- a/src/lib/bookmarks/bookmarkstoolbarbutton.cpp +++ b/src/lib/bookmarks/bookmarkstoolbarbutton.cpp @@ -38,7 +38,7 @@ BookmarksToolbarButton::BookmarksToolbarButton(BookmarkItem* bookmark, QWidget* parent) : QPushButton(parent) , m_bookmark(bookmark) - , m_window(0) + , m_window(nullptr) , m_showOnlyIcon(false) { init(); diff --git a/src/lib/bookmarks/bookmarkstoolbarbutton.h b/src/lib/bookmarks/bookmarkstoolbarbutton.h index c3e5a6a6e..8a57f1eba 100644 --- a/src/lib/bookmarks/bookmarkstoolbarbutton.h +++ b/src/lib/bookmarks/bookmarkstoolbarbutton.h @@ -50,9 +50,9 @@ private Q_SLOTS: void menuAboutToShow(); void menuMiddleClicked(Menu* menu); - void bookmarkActivated(BookmarkItem* item = 0); - void bookmarkCtrlActivated(BookmarkItem* item = 0); - void bookmarkShiftActivated(BookmarkItem* item = 0); + void bookmarkActivated(BookmarkItem* item = nullptr); + void bookmarkCtrlActivated(BookmarkItem* item = nullptr); + void bookmarkShiftActivated(BookmarkItem* item = nullptr); void openFolder(BookmarkItem* item); void openBookmark(BookmarkItem* item); diff --git a/src/lib/bookmarks/bookmarkstools.cpp b/src/lib/bookmarks/bookmarkstools.cpp index dfc59b27c..e8ac1a3ed 100644 --- a/src/lib/bookmarks/bookmarkstools.cpp +++ b/src/lib/bookmarks/bookmarkstools.cpp @@ -40,7 +40,7 @@ // BookmarksFoldersMenu BookmarksFoldersMenu::BookmarksFoldersMenu(QWidget* parent) : QMenu(parent) - , m_selectedFolder(0) + , m_selectedFolder(nullptr) { init(); } diff --git a/src/lib/bookmarks/bookmarkstools.h b/src/lib/bookmarks/bookmarkstools.h index 6408bf187..0e8d8c336 100644 --- a/src/lib/bookmarks/bookmarkstools.h +++ b/src/lib/bookmarks/bookmarkstools.h @@ -53,7 +53,7 @@ class FALKON_EXPORT BookmarksFoldersButton : public QPushButton Q_OBJECT public: - explicit BookmarksFoldersButton(QWidget* parent, BookmarkItem* folder = 0); + explicit BookmarksFoldersButton(QWidget* parent, BookmarkItem* folder = nullptr); BookmarkItem* selectedFolder() const; @@ -79,8 +79,8 @@ class FALKON_EXPORT BookmarksTools { public: // Add Bookmark Dialogs - static bool addBookmarkDialog(QWidget* parent, const QUrl &url, const QString &title, BookmarkItem* folder = 0); - static bool bookmarkAllTabsDialog(QWidget* parent, TabWidget* tabWidget, BookmarkItem* folder = 0); + static bool addBookmarkDialog(QWidget* parent, const QUrl &url, const QString &title, BookmarkItem* folder = nullptr); + static bool bookmarkAllTabsDialog(QWidget* parent, TabWidget* tabWidget, BookmarkItem* folder = nullptr); // Edit Bookmark Dialog static bool editBookmarkDialog(QWidget* parent, BookmarkItem* item); diff --git a/src/lib/bookmarks/bookmarkstreeview.cpp b/src/lib/bookmarks/bookmarkstreeview.cpp index 6e2bb1af6..66b026bde 100644 --- a/src/lib/bookmarks/bookmarkstreeview.cpp +++ b/src/lib/bookmarks/bookmarkstreeview.cpp @@ -78,7 +78,7 @@ void BookmarksTreeView::setViewType(BookmarksTreeView::ViewType type) BookmarkItem* BookmarksTreeView::selectedBookmark() const { QList items = selectedBookmarks(); - return items.count() == 1 ? items.at(0) : 0; + return items.count() == 1 ? items.at(0) : nullptr; } QList BookmarksTreeView::selectedBookmarks() const diff --git a/src/lib/history/history.cpp b/src/lib/history/history.cpp index 721c366d4..a441e8fb5 100644 --- a/src/lib/history/history.cpp +++ b/src/lib/history/history.cpp @@ -29,7 +29,7 @@ History::History(QObject* parent) : QObject(parent) , m_isSaving(true) - , m_model(0) + , m_model(nullptr) { loadSettings(); } diff --git a/src/lib/history/historyitem.cpp b/src/lib/history/historyitem.cpp index 7672054c5..b90e8676f 100644 --- a/src/lib/history/historyitem.cpp +++ b/src/lib/history/historyitem.cpp @@ -97,7 +97,7 @@ HistoryItem* HistoryItem::child(int row) const return m_children.at(row); } - return 0; + return nullptr; } int HistoryItem::childCount() const diff --git a/src/lib/history/historymenu.cpp b/src/lib/history/historymenu.cpp index 9fa4084b1..6136ce36b 100644 --- a/src/lib/history/historymenu.cpp +++ b/src/lib/history/historymenu.cpp @@ -73,7 +73,7 @@ void HistoryMenu::showHistoryManager() void HistoryMenu::aboutToShow() { // Set enabled states for Back/Forward actions according to current WebView - TabbedWebView* view = m_window ? m_window->weView() : 0; + TabbedWebView* view = m_window ? m_window->weView() : nullptr; if (view) { actions().at(0)->setEnabled(view->history()->canGoBack()); diff --git a/src/lib/history/historymodel.cpp b/src/lib/history/historymodel.cpp index 389f725a2..b98992cb8 100644 --- a/src/lib/history/historymodel.cpp +++ b/src/lib/history/historymodel.cpp @@ -37,8 +37,8 @@ static QString dateTimeToString(const QDateTime &dateTime) HistoryModel::HistoryModel(History* history) : QAbstractItemModel(history) - , m_rootItem(new HistoryItem(0)) - , m_todayItem(0) + , m_rootItem(new HistoryItem(nullptr)) + , m_todayItem(nullptr) , m_history(history) { init(); @@ -254,7 +254,7 @@ void HistoryModel::removeTopLevelIndexes(const QList &ind endRemoveRows(); if (item == m_todayItem) { - m_todayItem = 0; + m_todayItem = nullptr; } } } @@ -264,8 +264,8 @@ void HistoryModel::resetHistory() beginResetModel(); delete m_rootItem; - m_todayItem = 0; - m_rootItem = new HistoryItem(0); + m_todayItem = nullptr; + m_rootItem = new HistoryItem(nullptr); init(); @@ -335,7 +335,7 @@ void HistoryModel::historyEntryAdded(const HistoryEntry &entry) if (!m_todayItem) { beginInsertRows(QModelIndex(), 0, 0); - m_todayItem = new HistoryItem(0); + m_todayItem = new HistoryItem(nullptr); m_todayItem->setStartTimestamp(-1); m_todayItem->setEndTimestamp(QDateTime(QDate::currentDate(), QTime(), QTimeZone::systemTimeZone()).toMSecsSinceEpoch()); m_todayItem->title = tr("Today"); @@ -401,7 +401,7 @@ void HistoryModel::historyEntryEdited(const HistoryEntry &before, const HistoryE HistoryItem* HistoryModel::findHistoryItem(const HistoryEntry &entry) { - HistoryItem* parentItem = 0; + HistoryItem* parentItem = nullptr; qint64 timestamp = entry.date.toMSecsSinceEpoch(); for (int i = 0; i < m_rootItem->childCount(); ++i) { @@ -414,7 +414,7 @@ HistoryItem* HistoryModel::findHistoryItem(const HistoryEntry &entry) } if (!parentItem) { - return 0; + return nullptr; } for (int i = 0; i < parentItem->childCount(); ++i) { @@ -424,7 +424,7 @@ HistoryItem* HistoryModel::findHistoryItem(const HistoryEntry &entry) } } - return 0; + return nullptr; } void HistoryModel::checkEmptyParentItem(HistoryItem* item) @@ -437,7 +437,7 @@ void HistoryModel::checkEmptyParentItem(HistoryItem* item) endRemoveRows(); if (item == m_todayItem) { - m_todayItem = 0; + m_todayItem = nullptr; } } } diff --git a/src/lib/navigation/completer/locationcompleter.cpp b/src/lib/navigation/completer/locationcompleter.cpp index d07af975b..4a70de925 100644 --- a/src/lib/navigation/completer/locationcompleter.cpp +++ b/src/lib/navigation/completer/locationcompleter.cpp @@ -34,13 +34,13 @@ #include -LocationCompleterView* LocationCompleter::s_view = 0; -LocationCompleterModel* LocationCompleter::s_model = 0; +LocationCompleterView* LocationCompleter::s_view = nullptr; +LocationCompleterModel* LocationCompleter::s_model = nullptr; LocationCompleter::LocationCompleter(QObject* parent) : QObject(parent) - , m_window(0) - , m_locationBar(0) + , m_window(nullptr) + , m_locationBar(nullptr) , m_lastRefreshTimestamp(0) , m_popupClosed(false) { diff --git a/src/lib/navigation/completer/locationcompleterdelegate.cpp b/src/lib/navigation/completer/locationcompleterdelegate.cpp index 436423896..b36cd389f 100644 --- a/src/lib/navigation/completer/locationcompleterdelegate.cpp +++ b/src/lib/navigation/completer/locationcompleterdelegate.cpp @@ -219,7 +219,7 @@ QSize LocationCompleterDelegate::sizeHint(const QStyleOptionViewItem &option, co const QWidget* w = opt.widget; const QStyle* style = w ? w->style() : QApplication::style(); - const int padding = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0) + 1; + const int padding = style->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr) + 1; m_padding = padding > 3 ? padding : 3; m_rowHeight = 4 * m_padding + qMax(16, opt.fontMetrics.height()); diff --git a/src/lib/navigation/completer/locationcompleterdelegate.h b/src/lib/navigation/completer/locationcompleterdelegate.h index 3bf4886cb..be8027840 100644 --- a/src/lib/navigation/completer/locationcompleterdelegate.h +++ b/src/lib/navigation/completer/locationcompleterdelegate.h @@ -26,7 +26,7 @@ class FALKON_EXPORT LocationCompleterDelegate : public QStyledItemDelegate { Q_OBJECT public: - explicit LocationCompleterDelegate(QObject *parent = 0); + explicit LocationCompleterDelegate(QObject *parent = nullptr); void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; diff --git a/src/lib/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp index 19c96c3aa..6dbfcbaf5 100644 --- a/src/lib/navigation/locationbar.cpp +++ b/src/lib/navigation/locationbar.cpp @@ -46,7 +46,7 @@ LocationBar::LocationBar(QWidget *parent) : LineEdit(parent) , m_window(nullptr) - , m_webView(0) + , m_webView(nullptr) , m_holdingAlt(false) , m_oldTextLength(0) , m_currentTextLength(0) diff --git a/src/lib/navigation/navigationbar.cpp b/src/lib/navigation/navigationbar.cpp index 1612a5b9a..79d598997 100644 --- a/src/lib/navigation/navigationbar.cpp +++ b/src/lib/navigation/navigationbar.cpp @@ -66,10 +66,10 @@ NavigationBar::NavigationBar(BrowserWindow* window) setObjectName(QSL("navigationbar")); m_layout = new QHBoxLayout(this); - auto contentsMargin = style()->pixelMetric(QStyle::PM_ToolBarItemMargin, 0, this) - + style()->pixelMetric(QStyle::PM_ToolBarFrameWidth, 0, this); + auto contentsMargin = style()->pixelMetric(QStyle::PM_ToolBarItemMargin, nullptr, this) + + style()->pixelMetric(QStyle::PM_ToolBarFrameWidth, nullptr, this); m_layout->setContentsMargins(contentsMargin, contentsMargin, contentsMargin, contentsMargin); - m_layout->setSpacing(style()->pixelMetric(QStyle::PM_ToolBarItemSpacing, 0, this)); + m_layout->setSpacing(style()->pixelMetric(QStyle::PM_ToolBarItemSpacing, nullptr, this)); setLayout(m_layout); m_buttonBack = new ToolButton(this); diff --git a/src/lib/navigation/navigationcontainer.cpp b/src/lib/navigation/navigationcontainer.cpp index cf4ffdc5e..aaf37f726 100644 --- a/src/lib/navigation/navigationcontainer.cpp +++ b/src/lib/navigation/navigationcontainer.cpp @@ -24,7 +24,7 @@ NavigationContainer::NavigationContainer(QWidget* parent) : QWidget(parent) - , m_tabBar(0) + , m_tabBar(nullptr) { m_layout = new QVBoxLayout(this); m_layout->setContentsMargins(0, 0, 0, 0); diff --git a/src/lib/navigation/siteicon.cpp b/src/lib/navigation/siteicon.cpp index 06e73d502..e297137ee 100644 --- a/src/lib/navigation/siteicon.cpp +++ b/src/lib/navigation/siteicon.cpp @@ -32,7 +32,7 @@ SiteIcon::SiteIcon(LocationBar *parent) : ToolButton(parent) , m_window(nullptr) , m_locationBar(parent) - , m_view(0) + , m_view(nullptr) { setObjectName("locationbar-siteicon"); setToolButtonStyle(Qt::ToolButtonIconOnly); diff --git a/src/lib/notifications/desktopnotification.cpp b/src/lib/notifications/desktopnotification.cpp index b55a98d1d..21ee0a872 100644 --- a/src/lib/notifications/desktopnotification.cpp +++ b/src/lib/notifications/desktopnotification.cpp @@ -22,7 +22,7 @@ #include DesktopNotification::DesktopNotification(bool setPosition) - : QWidget(0) + : QWidget(nullptr) , ui(new Ui::DesktopNotification) , m_settingPosition(setPosition) , m_timeout(6000) diff --git a/src/lib/opensearch/opensearchengine.cpp b/src/lib/opensearch/opensearchengine.cpp index 5421d89ad..d0a12549f 100644 --- a/src/lib/opensearch/opensearchengine.cpp +++ b/src/lib/opensearch/opensearchengine.cpp @@ -103,9 +103,9 @@ OpenSearchEngine::OpenSearchEngine(QObject* parent) : QObject(parent) , m_searchMethod(QLatin1String("get")) , m_suggestionsMethod(QLatin1String("get")) - , m_networkAccessManager(0) - , m_suggestionsReply(0) - , m_delegate(0) + , m_networkAccessManager(nullptr) + , m_suggestionsReply(nullptr) + , m_delegate(nullptr) { m_requestMethods.insert(QLatin1String("get"), QNetworkAccessManager::GetOperation); m_requestMethods.insert(QLatin1String("post"), QNetworkAccessManager::PostOperation); @@ -563,7 +563,7 @@ void OpenSearchEngine::requestSuggestions(const QString &searchTerm) m_suggestionsReply->disconnect(this); m_suggestionsReply->abort(); m_suggestionsReply->deleteLater(); - m_suggestionsReply = 0; + m_suggestionsReply = nullptr; } Q_ASSERT(m_requestMethods.contains(m_suggestionsMethod)); @@ -627,7 +627,7 @@ void OpenSearchEngine::suggestionsObtained() m_suggestionsReply->close(); m_suggestionsReply->deleteLater(); - m_suggestionsReply = 0; + m_suggestionsReply = nullptr; QJsonParseError err; QJsonDocument json = QJsonDocument::fromJson(response, &err); diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp index 85090b2e4..78828f421 100644 --- a/src/lib/opensearch/searchenginesmanager.cpp +++ b/src/lib/opensearch/searchenginesmanager.cpp @@ -398,7 +398,7 @@ void SearchEnginesManager::replyFinished() if (checkEngine(engine)) { addEngine(engine); - QMessageBox::information(0, tr("Search Engine Added"), tr("Search Engine \"%1\" has been successfully added.").arg(engine->name())); + QMessageBox::information(nullptr, tr("Search Engine Added"), tr("Search Engine \"%1\" has been successfully added.").arg(engine->name())); } } @@ -406,7 +406,7 @@ bool SearchEnginesManager::checkEngine(OpenSearchEngine* engine) { if (!engine->isValid()) { QString errorString = tr("Search Engine is not valid!"); - QMessageBox::warning(0, tr("Error"), tr("Error while adding Search Engine
Error Message: %1").arg(errorString)); + QMessageBox::warning(nullptr, tr("Error"), tr("Error while adding Search Engine
Error Message: %1").arg(errorString)); return false; } diff --git a/src/lib/other/protocolhandlerdialog.h b/src/lib/other/protocolhandlerdialog.h index 34458f2ed..33702967d 100644 --- a/src/lib/other/protocolhandlerdialog.h +++ b/src/lib/other/protocolhandlerdialog.h @@ -29,7 +29,7 @@ class ProtocolHandlerDialog : public QDialog Q_OBJECT public: - explicit ProtocolHandlerDialog(QWidget *parent = 0); + explicit ProtocolHandlerDialog(QWidget *parent = nullptr); ~ProtocolHandlerDialog(); private: diff --git a/src/lib/other/registerqappassociation.h b/src/lib/other/registerqappassociation.h index edaa257b2..bd7ce9058 100644 --- a/src/lib/other/registerqappassociation.h +++ b/src/lib/other/registerqappassociation.h @@ -29,9 +29,9 @@ class FALKON_EXPORT RegisterQAppAssociation : public QObject { Q_OBJECT public: - explicit RegisterQAppAssociation(QObject* parent = 0); + explicit RegisterQAppAssociation(QObject* parent = nullptr); explicit RegisterQAppAssociation(const QString &appRegisteredName, const QString &appPath, - const QString &appIcon = QString(), const QString &appDesc = QString(), QObject* parent = 0); + const QString &appIcon = QString(), const QString &appDesc = QString(), QObject* parent = nullptr); ~RegisterQAppAssociation(); enum AssociationType { diff --git a/src/lib/other/siteinfo.cpp b/src/lib/other/siteinfo.cpp index 962c386db..256a12064 100644 --- a/src/lib/other/siteinfo.cpp +++ b/src/lib/other/siteinfo.cpp @@ -41,7 +41,7 @@ SiteInfo::SiteInfo(WebView *view) : QDialog(view) , ui(new Ui::SiteInfo) - , m_certWidget(0) + , m_certWidget(nullptr) , m_view(view) , m_imageReply(nullptr) , m_baseUrl(view->url()) diff --git a/src/lib/plugins/plugininterface.h b/src/lib/plugins/plugininterface.h index 3cbbbb124..404295adc 100644 --- a/src/lib/plugins/plugininterface.h +++ b/src/lib/plugins/plugininterface.h @@ -47,7 +47,7 @@ public: virtual void unload() = 0; virtual bool testPlugin() = 0; - virtual void showSettings(QWidget* parent = 0) { Q_UNUSED(parent) } + virtual void showSettings(QWidget* parent = nullptr) { Q_UNUSED(parent) } virtual void populateWebViewMenu(QMenu* menu, WebView* view, const WebHitTestResult &r) { Q_UNUSED(menu) Q_UNUSED(view) Q_UNUSED(r) } virtual void populateExtensionsMenu(QMenu *menu) { Q_UNUSED(menu) } diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp index 8a52b941b..d0ddeba05 100644 --- a/src/lib/plugins/speeddial.cpp +++ b/src/lib/plugins/speeddial.cpp @@ -283,7 +283,7 @@ void SpeedDial::removeImageForUrl(const QString &url) QStringList SpeedDial::getOpenFileName() { const QString fileTypes = QSL("%3(*.png *.jpg *.jpeg *.bmp *.gif *.svg *.tiff)").arg(tr("Image files")); - const QString image = QzTools::getOpenFileName(QSL("SpeedDial-GetOpenFileName"), 0, tr("Click to select image..."), QDir::homePath(), fileTypes); + const QString image = QzTools::getOpenFileName(QSL("SpeedDial-GetOpenFileName"), nullptr, tr("Click to select image..."), QDir::homePath(), fileTypes); if (image.isEmpty()) return {}; diff --git a/src/lib/popupwindow/popuplocationbar.cpp b/src/lib/popupwindow/popuplocationbar.cpp index 3fe303a96..92c97816e 100644 --- a/src/lib/popupwindow/popuplocationbar.cpp +++ b/src/lib/popupwindow/popuplocationbar.cpp @@ -44,7 +44,7 @@ private: PopupLocationBar::PopupLocationBar(QWidget* parent) : LineEdit(parent) - , m_view(0) + , m_view(nullptr) { m_siteIcon = new PopupSiteIcon(this); m_siteIcon->setIcon(IconProvider::emptyWebIcon()); diff --git a/src/lib/popupwindow/popupwindow.cpp b/src/lib/popupwindow/popupwindow.cpp index 196031b58..77b5b12d4 100644 --- a/src/lib/popupwindow/popupwindow.cpp +++ b/src/lib/popupwindow/popupwindow.cpp @@ -35,7 +35,7 @@ PopupWindow::PopupWindow(PopupWebView* view) : QWidget() , m_view(view) - , m_search(0) + , m_search(nullptr) { m_layout = new QVBoxLayout(this); m_layout->setContentsMargins(0, 0, 0, 0); diff --git a/src/lib/preferences/autofillmanager.cpp b/src/lib/preferences/autofillmanager.cpp index a2bff89ff..55ae751e6 100644 --- a/src/lib/preferences/autofillmanager.cpp +++ b/src/lib/preferences/autofillmanager.cpp @@ -131,7 +131,7 @@ void AutoFillManager::changePasswordBackend() // Switch backends if (!item.isEmpty()) { - PasswordBackend* backend = 0; + PasswordBackend* backend = nullptr; QHashIterator i(backends); while (i.hasNext()) { diff --git a/src/lib/preferences/pluginlistdelegate.cpp b/src/lib/preferences/pluginlistdelegate.cpp index 09bbad9f0..a738f23b7 100644 --- a/src/lib/preferences/pluginlistdelegate.cpp +++ b/src/lib/preferences/pluginlistdelegate.cpp @@ -111,7 +111,7 @@ QSize PluginListDelegate::sizeHint(const QStyleOptionViewItem &option, const QMo const QWidget* w = opt.widget; const QStyle* style = w ? w->style() : QApplication::style(); - const int padding = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0) + 1; + const int padding = style->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr) + 1; QFont titleFont = opt.font; titleFont.setBold(true); diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp index febb2a657..0699f6303 100644 --- a/src/lib/preferences/preferences.cpp +++ b/src/lib/preferences/preferences.cpp @@ -98,8 +98,8 @@ Preferences::Preferences(BrowserWindow* window) : QDialog(window) , ui(new Ui::Preferences) , m_window(window) - , m_autoFillManager(0) - , m_pluginsList(0) + , m_autoFillManager(nullptr) + , m_pluginsList(nullptr) { setAttribute(Qt::WA_DeleteOnClose); ui->setupUi(this); @@ -225,7 +225,7 @@ Preferences::Preferences(BrowserWindow* window) connect(ui->instantBookmarksToolbar, &QAbstractButton::toggled, ui->showBookmarksToolbar, &QWidget::setDisabled); connect(ui->showBookmarksToolbar, &QAbstractButton::toggled, ui->instantBookmarksToolbar, &QWidget::setDisabled); ui->showNavigationToolbar->setChecked(settings.value(QSL("showNavigationToolbar"), true).toBool()); - int currentSettingsPage = settings.value(QSL("settingsDialogPage"), 0).toInt(0); + int currentSettingsPage = settings.value(QSL("settingsDialogPage"), 0).toInt(nullptr); settings.endGroup(); //TABS diff --git a/src/lib/session/sessionmanagerdialog.h b/src/lib/session/sessionmanagerdialog.h index 6622c895a..c3318d330 100644 --- a/src/lib/session/sessionmanagerdialog.h +++ b/src/lib/session/sessionmanagerdialog.h @@ -31,7 +31,7 @@ class SessionManagerDialog : public QDialog Q_OBJECT public: - explicit SessionManagerDialog(QWidget *parent = 0); + explicit SessionManagerDialog(QWidget *parent = nullptr); ~SessionManagerDialog() override; private: diff --git a/src/lib/sidebar/bookmarkssidebar.h b/src/lib/sidebar/bookmarkssidebar.h index 18bab8294..fc01c10d6 100644 --- a/src/lib/sidebar/bookmarkssidebar.h +++ b/src/lib/sidebar/bookmarkssidebar.h @@ -44,10 +44,10 @@ private Q_SLOTS: void bookmarkCtrlActivated(BookmarkItem* item); void bookmarkShiftActivated(BookmarkItem* item); - void openBookmark(BookmarkItem* item = 0); - void openBookmarkInNewTab(BookmarkItem* item = 0); - void openBookmarkInNewWindow(BookmarkItem* item = 0); - void openBookmarkInNewPrivateWindow(BookmarkItem* item = 0); + void openBookmark(BookmarkItem* item = nullptr); + void openBookmarkInNewTab(BookmarkItem* item = nullptr); + void openBookmarkInNewWindow(BookmarkItem* item = nullptr); + void openBookmarkInNewPrivateWindow(BookmarkItem* item = nullptr); void deleteBookmarks(); void createContextMenu(const QPoint &pos); diff --git a/src/lib/sidebar/sidebarinterface.h b/src/lib/sidebar/sidebarinterface.h index bf63c1116..f091136fe 100644 --- a/src/lib/sidebar/sidebarinterface.h +++ b/src/lib/sidebar/sidebarinterface.h @@ -29,7 +29,7 @@ class BrowserWindow; class FALKON_EXPORT SideBarInterface : public QObject { public: - explicit SideBarInterface(QObject* parent = 0) : QObject(parent) { } + explicit SideBarInterface(QObject* parent = nullptr) : QObject(parent) { } virtual QString title() const = 0; diff --git a/src/lib/tabwidget/combotabbar.cpp b/src/lib/tabwidget/combotabbar.cpp index eeebe8570..c1744f428 100644 --- a/src/lib/tabwidget/combotabbar.cpp +++ b/src/lib/tabwidget/combotabbar.cpp @@ -45,8 +45,8 @@ public: ComboTabBar::ComboTabBar(QWidget* parent) : QWidget(parent) - , m_mainTabBar(0) - , m_pinnedTabBar(0) + , m_mainTabBar(nullptr) + , m_pinnedTabBar(nullptr) , m_mainBarOverFlowed(false) , m_lastAppliedOverflow(false) , m_usesScrollButtons(false) @@ -755,7 +755,7 @@ QTabBar::ButtonPosition ComboTabBar::iconButtonPosition() const QTabBar::ButtonPosition ComboTabBar::closeButtonPosition() const { - return (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, m_mainTabBar); + return (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, nullptr, m_mainTabBar); } QSize ComboTabBar::iconButtonSize() const @@ -768,8 +768,8 @@ QSize ComboTabBar::iconButtonSize() const QSize ComboTabBar::closeButtonSize() const { - int width = style()->pixelMetric(QStyle::PM_TabCloseIndicatorWidth, 0, this); - int height = style()->pixelMetric(QStyle::PM_TabCloseIndicatorHeight, 0, this); + int width = style()->pixelMetric(QStyle::PM_TabCloseIndicatorWidth, nullptr, this); + int height = style()->pixelMetric(QStyle::PM_TabCloseIndicatorHeight, nullptr, this); return QSize(width, height); } @@ -1000,7 +1000,7 @@ void ComboTabBar::setMinimumWidths() TabBarHelper::TabBarHelper(bool isPinnedTabBar, ComboTabBar* comboTabBar) : QTabBar(comboTabBar) , m_comboTabBar(comboTabBar) - , m_scrollArea(0) + , m_scrollArea(nullptr) , m_pressedIndex(-1) , m_dragInProgress(false) , m_activeTabBar(false) @@ -1851,7 +1851,7 @@ void CloseButton::paintEvent(QPaintEvent*) if (auto* tb = qobject_cast(parent())) { int index = tb->currentIndex(); - auto closeSide = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, tb); + auto closeSide = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, nullptr, tb); if (tb->tabButton(index, closeSide) == this && tb->isActiveTabBar()) { opt.state |= QStyle::State_Selected; } diff --git a/src/lib/tabwidget/tabbar.cpp b/src/lib/tabwidget/tabbar.cpp index 70876ce1d..05a8e98fb 100644 --- a/src/lib/tabwidget/tabbar.cpp +++ b/src/lib/tabwidget/tabbar.cpp @@ -129,7 +129,7 @@ void TabBar::loadSettings() settings.beginGroup(QSL("Browser-Tabs-Settings")); m_hideTabBarWithOneTab = settings.value(QSL("hideTabsWithOneTab"), false).toBool(); bool activateLastTab = settings.value(QSL("ActivateLastTabWhenClosingActual"), false).toBool(); - m_showCloseOnInactive = settings.value(QSL("showCloseOnInactiveTabs"), 0).toInt(0); + m_showCloseOnInactive = settings.value(QSL("showCloseOnInactiveTabs"), 0).toInt(nullptr); settings.endGroup(); setSelectionBehaviorOnRemove(activateLastTab ? QTabBar::SelectPreviousTab : QTabBar::SelectRightTab); @@ -367,7 +367,7 @@ void TabBar::hideCloseButton(int index) return; } - setTabButton(index, closeButtonPosition(), 0); + setTabButton(index, closeButtonPosition(), nullptr); button->deleteLater(); } diff --git a/src/lib/tabwidget/tabicon.cpp b/src/lib/tabwidget/tabicon.cpp index 7a361d253..13b150d94 100644 --- a/src/lib/tabwidget/tabicon.cpp +++ b/src/lib/tabwidget/tabicon.cpp @@ -28,7 +28,7 @@ TabIcon::TabIcon(QWidget* parent) : QWidget(parent) - , m_tab(0) + , m_tab(nullptr) , m_currentFrame(0) , m_animationRunning(false) , m_audioIconDisplayed(false) diff --git a/src/lib/tabwidget/tabstackedwidget.cpp b/src/lib/tabwidget/tabstackedwidget.cpp index 7f649c395..f4655b6a7 100644 --- a/src/lib/tabwidget/tabstackedwidget.cpp +++ b/src/lib/tabwidget/tabstackedwidget.cpp @@ -31,8 +31,8 @@ TabStackedWidget::TabStackedWidget(QWidget* parent) : QWidget(parent) - , m_stack(0) - , m_tabBar(0) + , m_stack(nullptr) + , m_tabBar(nullptr) , m_currentIndex(-1) , m_previousIndex(-1) { @@ -265,7 +265,7 @@ int TabStackedWidget::pinUnPinTab(int index, const QString &title) QString toolTip = tabToolTip(index); m_tabBar->m_blockCurrentChangedSignal = true; - m_tabBar->setTabButton(index, m_tabBar->iconButtonPosition(), 0); + m_tabBar->setTabButton(index, m_tabBar->iconButtonPosition(), nullptr); m_stack->removeWidget(widget); int newIndex = insertTab(makePinned ? 0 : m_tabBar->pinnedTabsCount(), widget, title, makePinned); diff --git a/src/lib/tabwidget/tabwidget.h b/src/lib/tabwidget/tabwidget.h index 8da6d09f6..9352fe552 100644 --- a/src/lib/tabwidget/tabwidget.h +++ b/src/lib/tabwidget/tabwidget.h @@ -124,7 +124,7 @@ public Q_SLOTS: void detachTab(int index); void loadTab(int index); void unloadTab(int index); - void restoreClosedTab(QObject* obj = 0); + void restoreClosedTab(QObject* obj = nullptr); void restoreAllClosedTabs(); void clearClosedTabsList(); diff --git a/src/lib/tools/aesinterface.cpp b/src/lib/tools/aesinterface.cpp index 92cb62b4f..89535bc47 100644 --- a/src/lib/tools/aesinterface.cpp +++ b/src/lib/tools/aesinterface.cpp @@ -71,7 +71,7 @@ bool AesInterface::init(int evpMode, const QByteArray &password, const QByteArra // Gen "key" for AES 256 CBC mode. A SHA1 digest is used to hash the supplied // key material. nrounds is the number of times that we hash the material. // More rounds are more secure but slower. - i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha256(), 0, (uchar*)password.data(), password.size(), nrounds, key, 0); + i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha256(), nullptr, (uchar*)password.data(), password.size(), nrounds, key, nullptr); if (i != 32) { qWarning("Key size is %d bits - should be 256 bits", i * 8); @@ -143,7 +143,7 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray } if (cipherSections.at(0).toInt() > AesInterface::VERSION) { - QMessageBox::information(0, tr("Warning!"), tr("Data has been encrypted with a newer version of Falkon." + QMessageBox::information(nullptr, tr("Warning!"), tr("Data has been encrypted with a newer version of Falkon." "\nPlease install latest version of Falkon.")); return {}; } diff --git a/src/lib/tools/html5permissions/html5permissionsnotification.cpp b/src/lib/tools/html5permissions/html5permissionsnotification.cpp index 92a0e14b7..3f89e42fa 100644 --- a/src/lib/tools/html5permissions/html5permissionsnotification.cpp +++ b/src/lib/tools/html5permissions/html5permissionsnotification.cpp @@ -28,7 +28,7 @@ HTML5PermissionsNotification::HTML5PermissionsNotification(const QUrl &origin, QWebEnginePage* page, const QWebEnginePage::Feature &feature) - : AnimatedWidget(AnimatedWidget::Down, 300, 0) + : AnimatedWidget(AnimatedWidget::Down, 300, nullptr) , ui(new Ui::HTML5PermissionsNotification) , m_origin(origin) , m_page(page) diff --git a/src/lib/tools/listitemdelegate.cpp b/src/lib/tools/listitemdelegate.cpp index 573f85380..95b585f3c 100644 --- a/src/lib/tools/listitemdelegate.cpp +++ b/src/lib/tools/listitemdelegate.cpp @@ -102,7 +102,7 @@ QSize ListItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QMode const QWidget* w = opt.widget; const QStyle* style = w ? w->style() : QApplication::style(); - const int padding = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0) + 1; + const int padding = style->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr) + 1; m_padding = padding > 5 ? padding : 5; @@ -111,7 +111,7 @@ QSize ListItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QMode // Update height of parent widget QWidget* p = qobject_cast(parent()); if (p && m_updateParentHeight) { - int frameWidth = p->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, 0, p); + int frameWidth = p->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, nullptr, p); p->setFixedHeight(m_itemHeight + 2 * frameWidth); } } diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp index ebd04ee49..e38dd29c0 100644 --- a/src/lib/tools/qztools.cpp +++ b/src/lib/tools/qztools.cpp @@ -851,7 +851,7 @@ bool QzTools::startExternalProcess(const QString &executable, const QString &arg info = info.arg(QObject::tr("Executable: "), executable, QObject::tr("Arguments: "), arguments.join(QLatin1Char(' '))); - QMessageBox::critical(0, QObject::tr("Cannot start external program"), + QMessageBox::critical(nullptr, QObject::tr("Cannot start external program"), QObject::tr("Cannot start external program! %1").arg(info)); } @@ -863,7 +863,7 @@ static xcb_connection_t *getXcbConnection() { const QNativeInterface::QX11Application *x11App = qApp->nativeInterface(); if (x11App == nullptr) - return 0; + return nullptr; return x11App->connection(); } #endif @@ -875,7 +875,7 @@ void QzTools::setWmClass(const QString &name, const QWidget* widget) return; xcb_connection_t *connection = getXcbConnection(); - if (connection == 0) + if (connection == nullptr) return; const QByteArray nameData = name.toUtf8(); diff --git a/src/lib/tools/toolbutton.cpp b/src/lib/tools/toolbutton.cpp index ee1b123b9..ffbd10cbf 100644 --- a/src/lib/tools/toolbutton.cpp +++ b/src/lib/tools/toolbutton.cpp @@ -26,7 +26,7 @@ ToolButton::ToolButton(QWidget* parent) : QToolButton(parent) - , m_menu(0) + , m_menu(nullptr) { setMinimumWidth(16); diff --git a/src/lib/tools/treewidget.cpp b/src/lib/tools/treewidget.cpp index c5433eb1a..fadc28315 100644 --- a/src/lib/tools/treewidget.cpp +++ b/src/lib/tools/treewidget.cpp @@ -94,7 +94,7 @@ QList TreeWidget::allItems() { if (m_refreshAllItemsNeeded) { m_allTreeItems.clear(); - iterateAllItems(0); + iterateAllItems(nullptr); m_refreshAllItemsNeeded = false; } diff --git a/src/lib/webengine/webpage.cpp b/src/lib/webengine/webpage.cpp index ec7b86623..910780750 100644 --- a/src/lib/webengine/webpage.cpp +++ b/src/lib/webengine/webpage.cpp @@ -72,8 +72,8 @@ static const bool kEnableJsNonBlockDialogs = qEnvironmentVariableIsSet("FALKON_E WebPage::WebPage(QObject* parent) : QWebEnginePage(mApp->webProfile(), parent) - , m_fileWatcher(0) - , m_runningLoop(0) + , m_fileWatcher(nullptr) + , m_runningLoop(nullptr) , m_loadProgress(100) , m_blockAlerts(false) , m_secureStatus(false) @@ -132,7 +132,7 @@ WebPage::~WebPage() if (m_runningLoop) { m_runningLoop->exit(1); - m_runningLoop = 0; + m_runningLoop = nullptr; } } @@ -555,7 +555,7 @@ bool WebPage::javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, c if (eLoop.exec() == 1) { return result; } - m_runningLoop = 0; + m_runningLoop = nullptr; QString x = ui->lineEdit->text(); bool _result = ui->buttonBox->buttonRole(clicked) == QDialogButtonBox::AcceptRole; @@ -601,7 +601,7 @@ bool WebPage::javaScriptConfirm(const QUrl &securityOrigin, const QString &msg) if (eLoop.exec() == 1) { return false; } - m_runningLoop = 0; + m_runningLoop = nullptr; bool result = ui->buttonBox->buttonRole(clicked) == QDialogButtonBox::AcceptRole; @@ -656,7 +656,7 @@ void WebPage::javaScriptAlert(const QUrl &securityOrigin, const QString &msg) if (eLoop.exec() == 1) { return; } - m_runningLoop = 0; + m_runningLoop = nullptr; m_blockAlerts = ui->preventAlerts->isChecked(); diff --git a/src/lib/webengine/webscrollbarmanager.h b/src/lib/webengine/webscrollbarmanager.h index 20e674b1c..a1b70f855 100644 --- a/src/lib/webengine/webscrollbarmanager.h +++ b/src/lib/webengine/webscrollbarmanager.h @@ -31,7 +31,7 @@ class WebScrollBarManager : public QObject Q_OBJECT public: - explicit WebScrollBarManager(QObject *parent = 0); + explicit WebScrollBarManager(QObject *parent = nullptr); void loadSettings(); diff --git a/src/lib/webengine/webview.cpp b/src/lib/webengine/webview.cpp index a7ae34389..901f3687a 100644 --- a/src/lib/webengine/webview.cpp +++ b/src/lib/webengine/webview.cpp @@ -58,7 +58,7 @@ WebView::WebView(QWidget* parent) : QWebEngineView(parent) , m_progress(100) , m_backgroundActivity(false) - , m_page(0) + , m_page(nullptr) , m_firstLoad(false) { connect(this, &QWebEngineView::loadStarted, this, &WebView::slotLoadStarted); diff --git a/src/lib/webtab/tabbedwebview.cpp b/src/lib/webtab/tabbedwebview.cpp index 115ab8e05..be8ba52fd 100644 --- a/src/lib/webtab/tabbedwebview.cpp +++ b/src/lib/webtab/tabbedwebview.cpp @@ -37,7 +37,7 @@ TabbedWebView::TabbedWebView(WebTab* webTab) : WebView(webTab) - , m_window(0) + , m_window(nullptr) , m_webTab(webTab) , m_menu(new Menu(this)) { diff --git a/src/plugins/AutoScroll/autoscroller.cpp b/src/plugins/AutoScroll/autoscroller.cpp index 341eee881..32e3e3e23 100644 --- a/src/plugins/AutoScroll/autoscroller.cpp +++ b/src/plugins/AutoScroll/autoscroller.cpp @@ -81,7 +81,7 @@ void ScrollIndicator::paintEvent(QPaintEvent *event) AutoScroller::AutoScroller(const QString &settingsFile, QObject* parent) : QObject(parent) - , m_view(0) + , m_view(nullptr) , m_settingsFile(settingsFile) { m_indicator = new ScrollIndicator; @@ -272,7 +272,7 @@ void AutoScroller::stopScrolling() QApplication::restoreOverrideCursor(); m_indicator->hide(); - m_indicator->setParent(0); + m_indicator->setParent(nullptr); m_frameScroller->stopScrolling(); } diff --git a/src/plugins/AutoScroll/autoscroller.h b/src/plugins/AutoScroll/autoscroller.h index 73f6af8d0..8b7fc7024 100644 --- a/src/plugins/AutoScroll/autoscroller.h +++ b/src/plugins/AutoScroll/autoscroller.h @@ -46,7 +46,7 @@ class AutoScroller : public QObject { Q_OBJECT public: - explicit AutoScroller(const QString &settingsFile, QObject* parent = 0); + explicit AutoScroller(const QString &settingsFile, QObject* parent = nullptr); ~AutoScroller() override; bool mouseMove(QObject* obj, QMouseEvent* event); diff --git a/src/plugins/AutoScroll/autoscrollplugin.cpp b/src/plugins/AutoScroll/autoscrollplugin.cpp index c905acd3d..d6948d509 100644 --- a/src/plugins/AutoScroll/autoscrollplugin.cpp +++ b/src/plugins/AutoScroll/autoscrollplugin.cpp @@ -25,7 +25,7 @@ AutoScrollPlugin::AutoScrollPlugin() : QObject() - , m_scroller(0) + , m_scroller(nullptr) { } diff --git a/src/plugins/AutoScroll/autoscrollsettings.h b/src/plugins/AutoScroll/autoscrollsettings.h index 31b087ac7..0d790a02d 100644 --- a/src/plugins/AutoScroll/autoscrollsettings.h +++ b/src/plugins/AutoScroll/autoscrollsettings.h @@ -32,7 +32,7 @@ class AutoScrollSettings : public QDialog Q_OBJECT public: - explicit AutoScrollSettings(AutoScroller* scroller, QWidget* parent = 0); + explicit AutoScrollSettings(AutoScroller* scroller, QWidget* parent = nullptr); ~AutoScrollSettings(); private Q_SLOTS: diff --git a/src/plugins/AutoScroll/framescroller.cpp b/src/plugins/AutoScroll/framescroller.cpp index 152f5c226..96078ec86 100644 --- a/src/plugins/AutoScroll/framescroller.cpp +++ b/src/plugins/AutoScroll/framescroller.cpp @@ -23,7 +23,7 @@ FrameScroller::FrameScroller(QObject* parent) : QObject(parent) - , m_page(0) + , m_page(nullptr) , m_lengthX(0) , m_lengthY(0) , m_divider(8.0) diff --git a/src/plugins/AutoScroll/framescroller.h b/src/plugins/AutoScroll/framescroller.h index 165924de6..20c400e15 100644 --- a/src/plugins/AutoScroll/framescroller.h +++ b/src/plugins/AutoScroll/framescroller.h @@ -29,7 +29,7 @@ class FrameScroller : public QObject Q_OBJECT public: - explicit FrameScroller(QObject* parent = 0); + explicit FrameScroller(QObject* parent = nullptr); void setPage(WebPage *page); diff --git a/src/plugins/FlashCookieManager/fcm_dialog.h b/src/plugins/FlashCookieManager/fcm_dialog.h index b105441e8..06a8b05ab 100644 --- a/src/plugins/FlashCookieManager/fcm_dialog.h +++ b/src/plugins/FlashCookieManager/fcm_dialog.h @@ -39,7 +39,7 @@ class FCM_Dialog : public QDialog Q_OBJECT public: - explicit FCM_Dialog(FCM_Plugin* manager, QWidget* parent = 0); + explicit FCM_Dialog(FCM_Plugin* manager, QWidget* parent = nullptr); ~FCM_Dialog() override; void refreshView(bool forceReload = false); diff --git a/src/plugins/FlashCookieManager/fcm_notification.cpp b/src/plugins/FlashCookieManager/fcm_notification.cpp index 3f8545523..8bac8f08e 100644 --- a/src/plugins/FlashCookieManager/fcm_notification.cpp +++ b/src/plugins/FlashCookieManager/fcm_notification.cpp @@ -21,7 +21,7 @@ #include "fcm_plugin.h" FCM_Notification::FCM_Notification(FCM_Plugin* manager, int newOriginsCount) - : AnimatedWidget(AnimatedWidget::Down, 300, 0) + : AnimatedWidget(AnimatedWidget::Down, 300, nullptr) , ui(new Ui::FCM_Notification) , m_manager(manager) { diff --git a/src/plugins/FlashCookieManager/fcm_plugin.cpp b/src/plugins/FlashCookieManager/fcm_plugin.cpp index 1ebd90593..9313dbea0 100644 --- a/src/plugins/FlashCookieManager/fcm_plugin.cpp +++ b/src/plugins/FlashCookieManager/fcm_plugin.cpp @@ -322,7 +322,7 @@ void FCM_Plugin::mainWindowDeleted(BrowserWindow *window) } if (m_fcmDialog && m_fcmDialog->parent() == window) { - m_fcmDialog->setParent(0); + m_fcmDialog->setParent(nullptr); } window->statusBar()->removeButton(m_statusBarIcons.value(window)); diff --git a/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp b/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp index 2ff8320cf..8c751e724 100644 --- a/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp +++ b/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp @@ -26,7 +26,7 @@ GnomeKeyringPlugin::GnomeKeyringPlugin() : QObject() - , m_backend(0) + , m_backend(nullptr) { } diff --git a/src/plugins/GreaseMonkey/gm_jsobject.cpp b/src/plugins/GreaseMonkey/gm_jsobject.cpp index 569ab0c16..15ccb5334 100644 --- a/src/plugins/GreaseMonkey/gm_jsobject.cpp +++ b/src/plugins/GreaseMonkey/gm_jsobject.cpp @@ -24,7 +24,7 @@ GM_JSObject::GM_JSObject(QObject* parent) : QObject(parent) - , m_settings(0) + , m_settings(nullptr) { } diff --git a/src/plugins/GreaseMonkey/gm_jsobject.h b/src/plugins/GreaseMonkey/gm_jsobject.h index 3d207df0c..e2e291b20 100644 --- a/src/plugins/GreaseMonkey/gm_jsobject.h +++ b/src/plugins/GreaseMonkey/gm_jsobject.h @@ -27,7 +27,7 @@ class GM_JSObject : public QObject { Q_OBJECT public: - explicit GM_JSObject(QObject* parent = 0); + explicit GM_JSObject(QObject* parent = nullptr); ~GM_JSObject(); void setSettingsFile(const QString &name); diff --git a/src/plugins/GreaseMonkey/gm_manager.h b/src/plugins/GreaseMonkey/gm_manager.h index e255f3179..1acfbe73f 100644 --- a/src/plugins/GreaseMonkey/gm_manager.h +++ b/src/plugins/GreaseMonkey/gm_manager.h @@ -36,7 +36,7 @@ class GM_Manager : public QObject { Q_OBJECT public: - explicit GM_Manager(const QString &sPath, QObject* parent = 0); + explicit GM_Manager(const QString &sPath, QObject* parent = nullptr); ~GM_Manager(); void showSettings(QWidget* parent); diff --git a/src/plugins/GreaseMonkey/gm_notification.cpp b/src/plugins/GreaseMonkey/gm_notification.cpp index 2f80a0c9b..1a84a3e3f 100644 --- a/src/plugins/GreaseMonkey/gm_notification.cpp +++ b/src/plugins/GreaseMonkey/gm_notification.cpp @@ -25,7 +25,7 @@ #include GM_Notification::GM_Notification(GM_Manager* manager, const QString &tmpfileName, const QString &fileName) - : AnimatedWidget(AnimatedWidget::Down, 300, 0) + : AnimatedWidget(AnimatedWidget::Down, 300, nullptr) , ui(new Ui::GM_Notification) , m_manager(manager) , m_tmpFileName(tmpfileName) @@ -47,7 +47,7 @@ void GM_Notification::installScript() { bool success = false; - GM_Script* script = 0; + GM_Script* script = nullptr; QString message = tr("Cannot install script"); if (QFile::copy(m_tmpFileName, m_fileName)) { diff --git a/src/plugins/GreaseMonkey/gm_plugin.cpp b/src/plugins/GreaseMonkey/gm_plugin.cpp index 1ead624d6..9e6a5c04c 100644 --- a/src/plugins/GreaseMonkey/gm_plugin.cpp +++ b/src/plugins/GreaseMonkey/gm_plugin.cpp @@ -29,7 +29,7 @@ GM_Plugin::GM_Plugin() : QObject() - , m_manager(0) + , m_manager(nullptr) { } diff --git a/src/plugins/GreaseMonkey/gm_plugin.h b/src/plugins/GreaseMonkey/gm_plugin.h index a4c0a2a6d..8e999130a 100644 --- a/src/plugins/GreaseMonkey/gm_plugin.h +++ b/src/plugins/GreaseMonkey/gm_plugin.h @@ -34,7 +34,7 @@ public: void init(InitState state, const QString &settingsPath) override; void unload() override; bool testPlugin() override; - void showSettings(QWidget* parent = 0) override; + void showSettings(QWidget* parent = nullptr) override; bool acceptNavigationRequest(WebPage *page, const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame) override; diff --git a/src/plugins/GreaseMonkey/settings/gm_settings.cpp b/src/plugins/GreaseMonkey/settings/gm_settings.cpp index 388fe45f6..58707ee8e 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settings.cpp +++ b/src/plugins/GreaseMonkey/settings/gm_settings.cpp @@ -195,7 +195,7 @@ void GM_Settings::loadScripts() GM_Script* GM_Settings::getScript(QListWidgetItem* item) { if (!item) { - return 0; + return nullptr; } GM_Script* script = static_cast(item->data(Qt::UserRole + 10).value()); diff --git a/src/plugins/GreaseMonkey/settings/gm_settings.h b/src/plugins/GreaseMonkey/settings/gm_settings.h index c20070541..46c6e2fd3 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settings.h +++ b/src/plugins/GreaseMonkey/settings/gm_settings.h @@ -35,7 +35,7 @@ class GM_Settings : public QDialog Q_OBJECT public: - explicit GM_Settings(GM_Manager* manager, QWidget* parent = 0); + explicit GM_Settings(GM_Manager* manager, QWidget* parent = nullptr); ~GM_Settings(); private Q_SLOTS: diff --git a/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.cpp b/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.cpp index 356d40c62..ea099c5ee 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.cpp +++ b/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.cpp @@ -157,7 +157,7 @@ QSize GM_SettingsListDelegate::sizeHint(const QStyleOptionViewItem &option, cons const QWidget* w = opt.widget; const QStyle* style = w ? w->style() : QApplication::style(); - const int padding = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0) + 1; + const int padding = style->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr) + 1; QFont titleFont = opt.font; titleFont.setBold(true); diff --git a/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h b/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h index bbecc61c3..bcad0be64 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h +++ b/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h @@ -23,7 +23,7 @@ class GM_SettingsListDelegate : public QStyledItemDelegate { public: - explicit GM_SettingsListDelegate(QObject* parent = 0); + explicit GM_SettingsListDelegate(QObject* parent = nullptr); int padding() const; diff --git a/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h b/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h index 8c6f1cdb1..7a4b72bc3 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h +++ b/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h @@ -26,7 +26,7 @@ class GM_SettingsListWidget : public QListWidget { Q_OBJECT public: - explicit GM_SettingsListWidget(QWidget* parent = 0); + explicit GM_SettingsListWidget(QWidget* parent = nullptr); Q_SIGNALS: void removeItemRequested(QListWidgetItem* item); diff --git a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h index 460cf5480..b1f80b8f7 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h +++ b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h @@ -32,7 +32,7 @@ class GM_SettingsScriptInfo : public QDialog Q_OBJECT public: - explicit GM_SettingsScriptInfo(GM_Script* script, QWidget* parent = 0); + explicit GM_SettingsScriptInfo(GM_Script* script, QWidget* parent = nullptr); ~GM_SettingsScriptInfo(); private Q_SLOTS: diff --git a/src/plugins/KDEFrameworksIntegration/kwalletpasswordbackend.cpp b/src/plugins/KDEFrameworksIntegration/kwalletpasswordbackend.cpp index 7b4afb058..0b5da37f6 100644 --- a/src/plugins/KDEFrameworksIntegration/kwalletpasswordbackend.cpp +++ b/src/plugins/KDEFrameworksIntegration/kwalletpasswordbackend.cpp @@ -48,7 +48,7 @@ static QMap encodeEntry(const PasswordEntry &entry) KWalletPasswordBackend::KWalletPasswordBackend() : PasswordBackend() - , m_wallet(0) + , m_wallet(nullptr) { } diff --git a/src/plugins/MouseGestures/3rdparty/QjtMouseGesture.h b/src/plugins/MouseGestures/3rdparty/QjtMouseGesture.h index c7819f4dd..118bb8fe1 100644 --- a/src/plugins/MouseGestures/3rdparty/QjtMouseGesture.h +++ b/src/plugins/MouseGestures/3rdparty/QjtMouseGesture.h @@ -92,7 +92,7 @@ class QjtMouseGesture : public QObject { Q_OBJECT public: - QjtMouseGesture(const DirectionList &directions, QObject* parent = 0); + QjtMouseGesture(const DirectionList &directions, QObject* parent = nullptr); ~QjtMouseGesture(); const DirectionList directions() const; diff --git a/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.h b/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.h index 0d1fbf287..fb16e13d3 100644 --- a/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.h +++ b/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.h @@ -62,7 +62,7 @@ public: * Notice that this all events for this button are * swallowed by the filter. */ - QjtMouseGestureFilter(bool allowDiagonals = false, Qt::MouseButton gestureButton = Qt::RightButton, int minimumMovement = 5, double minimumMatch = 0.9, QObject* parent = 0); + QjtMouseGestureFilter(bool allowDiagonals = false, Qt::MouseButton gestureButton = Qt::RightButton, int minimumMovement = 5, double minimumMatch = 0.9, QObject* parent = nullptr); ~QjtMouseGestureFilter() override; /* @@ -77,9 +77,9 @@ public: */ void clearGestures(bool deleteGestures = false); - bool mouseButtonPressEvent(QMouseEvent* event, QObject* obj = 0); - bool mouseButtonReleaseEvent(QMouseEvent* event, QObject* obj = 0); - bool mouseMoveEvent(QMouseEvent* event, QObject* obj = 0); + bool mouseButtonPressEvent(QMouseEvent* event, QObject* obj = nullptr); + bool mouseButtonReleaseEvent(QMouseEvent* event, QObject* obj = nullptr); + bool mouseMoveEvent(QMouseEvent* event, QObject* obj = nullptr); protected: bool eventFilter(QObject* obj, QEvent* event) override; diff --git a/src/plugins/MouseGestures/3rdparty/ring_buffer.h b/src/plugins/MouseGestures/3rdparty/ring_buffer.h index d8912fdd2..03a55d692 100644 --- a/src/plugins/MouseGestures/3rdparty/ring_buffer.h +++ b/src/plugins/MouseGestures/3rdparty/ring_buffer.h @@ -51,7 +51,7 @@ public: typedef const T* const_iterator; RingBuffer() { - array = 0; + array = nullptr; size = 0; read = 0; write = 0; diff --git a/src/plugins/MouseGestures/mousegestures.cpp b/src/plugins/MouseGestures/mousegestures.cpp index 4e1e068b8..abbdd606b 100644 --- a/src/plugins/MouseGestures/mousegestures.cpp +++ b/src/plugins/MouseGestures/mousegestures.cpp @@ -33,7 +33,7 @@ MouseGestures::MouseGestures(const QString &settingsPath, QObject* parent) : QObject(parent) - , m_filter(0) + , m_filter(nullptr) , m_settingsFile(settingsPath + QL1S("/extensions.ini")) , m_button(Qt::MiddleButton) { diff --git a/src/plugins/MouseGestures/mousegestures.h b/src/plugins/MouseGestures/mousegestures.h index e080d323a..dff1355a2 100644 --- a/src/plugins/MouseGestures/mousegestures.h +++ b/src/plugins/MouseGestures/mousegestures.h @@ -31,7 +31,7 @@ class MouseGestures : public QObject { Q_OBJECT public: - explicit MouseGestures(const QString &settingsPath, QObject* parent = 0); + explicit MouseGestures(const QString &settingsPath, QObject* parent = nullptr); ~MouseGestures(); bool mousePress(QObject* obj, QMouseEvent* event); diff --git a/src/plugins/MouseGestures/mousegesturessettingsdialog.h b/src/plugins/MouseGestures/mousegesturessettingsdialog.h index cde3496f4..aa96347a1 100644 --- a/src/plugins/MouseGestures/mousegesturessettingsdialog.h +++ b/src/plugins/MouseGestures/mousegesturessettingsdialog.h @@ -33,7 +33,7 @@ class MouseGesturesSettingsDialog : public QDialog Q_OBJECT public: - explicit MouseGesturesSettingsDialog(MouseGestures* gestures, QWidget* parent = 0); + explicit MouseGesturesSettingsDialog(MouseGestures* gestures, QWidget* parent = nullptr); ~MouseGesturesSettingsDialog(); private Q_SLOTS: diff --git a/src/plugins/PIM/PIM_handler.h b/src/plugins/PIM/PIM_handler.h index cc38dbbbf..d970697d2 100644 --- a/src/plugins/PIM/PIM_handler.h +++ b/src/plugins/PIM/PIM_handler.h @@ -35,7 +35,7 @@ class PIM_Handler : public QObject { Q_OBJECT public: - explicit PIM_Handler(const QString &sPath, QObject* parent = 0); + explicit PIM_Handler(const QString &sPath, QObject* parent = nullptr); void populateWebViewMenu(QMenu* menu, WebView* view, const WebHitTestResult &hitTest); bool keyPress(WebView* view, QKeyEvent* event); @@ -44,7 +44,7 @@ public: public Q_SLOTS: void webPageCreated(WebPage* page); - void showSettings(QWidget* parent = 0); + void showSettings(QWidget* parent = nullptr); private Q_SLOTS: void loadSettings(); diff --git a/src/plugins/PIM/PIM_plugin.cpp b/src/plugins/PIM/PIM_plugin.cpp index 4389f2f5c..e207b9ff7 100644 --- a/src/plugins/PIM/PIM_plugin.cpp +++ b/src/plugins/PIM/PIM_plugin.cpp @@ -27,7 +27,7 @@ PIM_Plugin::PIM_Plugin() : QObject() - , m_handler(0) + , m_handler(nullptr) { } diff --git a/src/plugins/PIM/PIM_settings.h b/src/plugins/PIM/PIM_settings.h index cb38cbcef..cfdea289f 100644 --- a/src/plugins/PIM/PIM_settings.h +++ b/src/plugins/PIM/PIM_settings.h @@ -33,7 +33,7 @@ class PIM_Settings : public QDialog Q_OBJECT public: - explicit PIM_Settings(const QString &settingsFile, QWidget* parent = 0); + explicit PIM_Settings(const QString &settingsFile, QWidget* parent = nullptr); ~PIM_Settings(); private Q_SLOTS: diff --git a/src/plugins/StatusBarIcons/sbi_icon.cpp b/src/plugins/StatusBarIcons/sbi_icon.cpp index 8b16548df..25fb4f127 100644 --- a/src/plugins/StatusBarIcons/sbi_icon.cpp +++ b/src/plugins/StatusBarIcons/sbi_icon.cpp @@ -42,7 +42,7 @@ void SBI_Icon::setCurrentPageWebAttribute(QWebEngineSettings::WebAttribute attr, QWebEngineSettings* SBI_Icon::currentPageSettings() const { if (!m_window->weView()) { - return 0; + return nullptr; } return m_window->weView()->page()->settings(); @@ -51,7 +51,7 @@ QWebEngineSettings* SBI_Icon::currentPageSettings() const WebPage* SBI_Icon::currentPage() const { if (!m_window->weView()) { - return 0; + return nullptr; } return m_window->weView()->page(); diff --git a/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp b/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp index efdf816d9..83d0c3524 100644 --- a/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp +++ b/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp @@ -33,7 +33,7 @@ SBI_IconsManager::SBI_IconsManager(const QString &settingsPath, QObject* parent) , m_showJavaScriptIcon(false) , m_showNetworkIcon(false) , m_showZoomWidget(false) - , m_networkManager(0) + , m_networkManager(nullptr) { loadSettings(); } diff --git a/src/plugins/StatusBarIcons/sbi_iconsmanager.h b/src/plugins/StatusBarIcons/sbi_iconsmanager.h index fa252ba9a..8af94dc3f 100644 --- a/src/plugins/StatusBarIcons/sbi_iconsmanager.h +++ b/src/plugins/StatusBarIcons/sbi_iconsmanager.h @@ -28,7 +28,7 @@ class SBI_IconsManager : public QObject { Q_OBJECT public: - explicit SBI_IconsManager(const QString &settingsPath, QObject* parent = 0); + explicit SBI_IconsManager(const QString &settingsPath, QObject* parent = nullptr); ~SBI_IconsManager(); void loadSettings(); diff --git a/src/plugins/StatusBarIcons/sbi_imagesicon.cpp b/src/plugins/StatusBarIcons/sbi_imagesicon.cpp index 0328e362f..f7a69c1de 100644 --- a/src/plugins/StatusBarIcons/sbi_imagesicon.cpp +++ b/src/plugins/StatusBarIcons/sbi_imagesicon.cpp @@ -110,7 +110,7 @@ void SBI_ImagesIcon::setGlobalLoadingImages(bool enable) void SBI_ImagesIcon::updateIcon() { if (testCurrentPageWebAttribute(QWebEngineSettings::AutoLoadImages)) { - setGraphicsEffect(0); + setGraphicsEffect(nullptr); } else { auto* effect = new QGraphicsColorizeEffect(this); diff --git a/src/plugins/StatusBarIcons/sbi_javascripticon.cpp b/src/plugins/StatusBarIcons/sbi_javascripticon.cpp index d515c06e2..4f0a2c7f8 100644 --- a/src/plugins/StatusBarIcons/sbi_javascripticon.cpp +++ b/src/plugins/StatusBarIcons/sbi_javascripticon.cpp @@ -71,7 +71,7 @@ void SBI_JavaScriptIcon::showMenu(const QPoint &point) void SBI_JavaScriptIcon::updateIcon() { if (testCurrentPageWebAttribute(QWebEngineSettings::JavascriptEnabled)) { - setGraphicsEffect(0); + setGraphicsEffect(nullptr); } else { auto* effect = new QGraphicsColorizeEffect(this); diff --git a/src/plugins/StatusBarIcons/sbi_networkicondialog.h b/src/plugins/StatusBarIcons/sbi_networkicondialog.h index b0ff7511e..ee668007e 100644 --- a/src/plugins/StatusBarIcons/sbi_networkicondialog.h +++ b/src/plugins/StatusBarIcons/sbi_networkicondialog.h @@ -32,7 +32,7 @@ class SBI_NetworkIconDialog : public QDialog Q_OBJECT public: - explicit SBI_NetworkIconDialog(QWidget* parent = 0); + explicit SBI_NetworkIconDialog(QWidget* parent = nullptr); ~SBI_NetworkIconDialog(); private Q_SLOTS: diff --git a/src/plugins/StatusBarIcons/sbi_networkmanager.h b/src/plugins/StatusBarIcons/sbi_networkmanager.h index 112fcdef0..6c939e52f 100644 --- a/src/plugins/StatusBarIcons/sbi_networkmanager.h +++ b/src/plugins/StatusBarIcons/sbi_networkmanager.h @@ -27,7 +27,7 @@ class SBI_NetworkManager : public QObject { Q_OBJECT public: - explicit SBI_NetworkManager(const QString &settingsPath, QObject* parent = 0); + explicit SBI_NetworkManager(const QString &settingsPath, QObject* parent = nullptr); ~SBI_NetworkManager(); static SBI_NetworkManager* instance(); diff --git a/src/plugins/StatusBarIcons/sbi_proxywidget.h b/src/plugins/StatusBarIcons/sbi_proxywidget.h index 3e97c3bde..548deed95 100644 --- a/src/plugins/StatusBarIcons/sbi_proxywidget.h +++ b/src/plugins/StatusBarIcons/sbi_proxywidget.h @@ -32,7 +32,7 @@ class SBI_ProxyWidget : public QWidget Q_OBJECT public: - explicit SBI_ProxyWidget(QWidget* parent = 0); + explicit SBI_ProxyWidget(QWidget* parent = nullptr); ~SBI_ProxyWidget(); SBI_NetworkProxy* getProxy() const; diff --git a/src/plugins/StatusBarIcons/sbi_settingsdialog.h b/src/plugins/StatusBarIcons/sbi_settingsdialog.h index a42c6d66c..155113fc4 100644 --- a/src/plugins/StatusBarIcons/sbi_settingsdialog.h +++ b/src/plugins/StatusBarIcons/sbi_settingsdialog.h @@ -32,7 +32,7 @@ class SBI_SettingsDialog : public QDialog Q_OBJECT public: - explicit SBI_SettingsDialog(SBI_IconsManager* manager, QWidget* parent = 0); + explicit SBI_SettingsDialog(SBI_IconsManager* manager, QWidget* parent = nullptr); ~SBI_SettingsDialog(); private Q_SLOTS: diff --git a/src/plugins/StatusBarIcons/sbi_zoomwidget.h b/src/plugins/StatusBarIcons/sbi_zoomwidget.h index 7bcf652bc..a1d71e278 100644 --- a/src/plugins/StatusBarIcons/sbi_zoomwidget.h +++ b/src/plugins/StatusBarIcons/sbi_zoomwidget.h @@ -27,7 +27,7 @@ class SBI_ZoomWidget : public QSlider Q_OBJECT public: - explicit SBI_ZoomWidget(BrowserWindow* parent = 0); + explicit SBI_ZoomWidget(BrowserWindow* parent = nullptr); private Q_SLOTS: void valueChanged(int value); diff --git a/src/plugins/StatusBarIcons/statusbariconsplugin.cpp b/src/plugins/StatusBarIcons/statusbariconsplugin.cpp index ade13b863..310a0da12 100644 --- a/src/plugins/StatusBarIcons/statusbariconsplugin.cpp +++ b/src/plugins/StatusBarIcons/statusbariconsplugin.cpp @@ -25,7 +25,7 @@ StatusBarIconsPlugin::StatusBarIconsPlugin() : QObject() - , m_manager(0) + , m_manager(nullptr) { } diff --git a/src/plugins/TabManager/tabmanagerdelegate.cpp b/src/plugins/TabManager/tabmanagerdelegate.cpp index 7bf7f9a0c..e5556c730 100644 --- a/src/plugins/TabManager/tabmanagerdelegate.cpp +++ b/src/plugins/TabManager/tabmanagerdelegate.cpp @@ -169,7 +169,7 @@ void TabManagerDelegate::viewItemDrawText(QPainter *p, const QStyleOptionViewIte const QWidget* widget = option->widget; const bool isRtlLayout = widget ? widget->isRightToLeft() : QApplication::isRightToLeft(); const QStyle* proxyStyle = widget ? widget->style()->proxy() : QApplication::style()->proxy(); - const int textMargin = proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, widget) + 1; + const int textMargin = proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr, widget) + 1; QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding const QFontMetrics fontMetrics(p->font()); diff --git a/src/plugins/TabManager/tabmanagerdelegate.h b/src/plugins/TabManager/tabmanagerdelegate.h index 24e76a88e..df025cebe 100644 --- a/src/plugins/TabManager/tabmanagerdelegate.h +++ b/src/plugins/TabManager/tabmanagerdelegate.h @@ -23,7 +23,7 @@ class TabManagerDelegate : public QStyledItemDelegate { public: - explicit TabManagerDelegate(QObject* parent = 0); + explicit TabManagerDelegate(QObject* parent = nullptr); void paint(QPainter* painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; diff --git a/src/plugins/TabManager/tabmanagerplugin.cpp b/src/plugins/TabManager/tabmanagerplugin.cpp index cdc97c2b7..2c004809e 100644 --- a/src/plugins/TabManager/tabmanagerplugin.cpp +++ b/src/plugins/TabManager/tabmanagerplugin.cpp @@ -36,8 +36,8 @@ QString TabManagerPlugin::s_settingsPath; TabManagerPlugin::TabManagerPlugin() : QObject() - , m_controller(0) - , m_tabManagerWidget(0) + , m_controller(nullptr) + , m_tabManagerWidget(nullptr) , m_viewType(Undefined) , m_initState(false) , m_asTabBarReplacement(false) @@ -107,7 +107,7 @@ void TabManagerPlugin::insertManagerWidget() } else if (viewType() == ShowAsWindow) { if (!m_tabManagerWidget) { - m_tabManagerWidget = m_controller->createTabManagerWidget(mApp->getWindow(), 0, true); + m_tabManagerWidget = m_controller->createTabManagerWidget(mApp->getWindow(), nullptr, true); m_tabManagerWidget->setWindowFlags(Qt::Window); } } @@ -161,7 +161,7 @@ void TabManagerPlugin::removeManagerWidget() m_tabManagerWidget->close(); delete m_tabManagerWidget; - m_tabManagerWidget = 0; + m_tabManagerWidget = nullptr; } } diff --git a/src/plugins/TabManager/tabmanagersettings.h b/src/plugins/TabManager/tabmanagersettings.h index 84f3df5cf..522204c38 100644 --- a/src/plugins/TabManager/tabmanagersettings.h +++ b/src/plugins/TabManager/tabmanagersettings.h @@ -13,7 +13,7 @@ class TabManagerSettings : public QDialog Q_OBJECT public: - explicit TabManagerSettings(TabManagerPlugin* plugin, QWidget *parent = 0); + explicit TabManagerSettings(TabManagerPlugin* plugin, QWidget *parent = nullptr); ~TabManagerSettings() override; public Q_SLOTS: diff --git a/src/plugins/TabManager/tabmanagerwidget.cpp b/src/plugins/TabManager/tabmanagerwidget.cpp index bd0093c4f..9ad058e1a 100644 --- a/src/plugins/TabManager/tabmanagerwidget.cpp +++ b/src/plugins/TabManager/tabmanagerwidget.cpp @@ -43,19 +43,19 @@ #include -TLDExtractor* TabManagerWidget::s_tldExtractor = 0; +TLDExtractor* TabManagerWidget::s_tldExtractor = nullptr; TabManagerWidget::TabManagerWidget(BrowserWindow* mainClass, QWidget* parent, bool defaultWidget) : QWidget(parent) , ui(new Ui::TabManagerWidget) , m_window(mainClass) - , m_webPage(0) + , m_webPage(nullptr) , m_isRefreshing(false) , m_refreshBlocked(false) , m_waitForRefresh(false) , m_isDefaultWidget(defaultWidget) { - if(s_tldExtractor == 0) + if(s_tldExtractor == nullptr) { s_tldExtractor = TLDExtractor::instance(); s_tldExtractor->setDataSearchPaths(QStringList() << TabManagerPlugin::settingsPath()); @@ -393,7 +393,7 @@ void TabManagerWidget::filterBarClosed() { ui->filterBar->clear(); ui->filterBar->hide(); - ui->treeWidget->setFocusProxy(0); + ui->treeWidget->setFocusProxy(nullptr); ui->treeWidget->setFocus(); } @@ -544,7 +544,7 @@ static void detachTabsTo(BrowserWindow* targetWindow, const QMultiHashtabCount() == 0) { mainWindow->close(); - mainWindow = 0; + mainWindow = nullptr; } targetWindow->tabWidget()->addView(webTab, Qz::NT_NotSelectedTab); @@ -646,13 +646,13 @@ QTreeWidgetItem* TabManagerWidget::groupByDomainName(bool useHostName) for (int tab = 0; tab < tabs.count(); ++tab) { WebTab* webTab = tabs.at(tab); if (webTab->webView() && m_webPage == webTab->webView()->page()) { - m_webPage = 0; + m_webPage = nullptr; continue; } QString domain = domainFromUrl(webTab->url(), useHostName); if (!tabsGroupedByDomain.contains(domain)) { - auto* groupItem = new TabItem(ui->treeWidget, false, false, 0, false); + auto* groupItem = new TabItem(ui->treeWidget, false, false, nullptr, false); groupItem->setTitle(domain); groupItem->setIsActiveOrCaption(true); @@ -712,7 +712,7 @@ QTreeWidgetItem* TabManagerWidget::groupByWindow() for (int tab = 0; tab < tabs.count(); ++tab) { WebTab* webTab = tabs.at(tab); if (webTab->webView() && m_webPage == webTab->webView()->page()) { - m_webPage = 0; + m_webPage = nullptr; continue; } auto* tabItem = new TabItem(ui->treeWidget, true, true, winItem); @@ -746,10 +746,10 @@ BrowserWindow* TabManagerWidget::getWindow() TabItem::TabItem(QTreeWidget* treeWidget, bool supportDrag, bool isTab, QTreeWidgetItem* parent, bool addToTree) : QObject() - , QTreeWidgetItem(addToTree ? (parent ? parent : treeWidget->invisibleRootItem()) : 0, 1) + , QTreeWidgetItem(addToTree ? (parent ? parent : treeWidget->invisibleRootItem()) : nullptr, 1) , m_treeWidget(treeWidget) - , m_window(0) - , m_webTab(0) + , m_window(nullptr) + , m_webTab(nullptr) , m_isTab(isTab) { Qt::ItemFlags flgs = flags() | (parent ? Qt::ItemIsUserCheckable : Qt::ItemIsUserCheckable | Qt::ItemIsAutoTristate); @@ -891,7 +891,7 @@ QMimeData *TabTreeWidget::mimeData(const QList &items) const if (items.size() > 0) { auto* tabItem = static_cast(items.at(0)); if (!tabItem || !tabItem->isTab()) - return 0; + return nullptr; stream << (quintptr) tabItem->window() << (quintptr) tabItem->webTab(); @@ -900,7 +900,7 @@ QMimeData *TabTreeWidget::mimeData(const QList &items) const return mimeData; } - return 0; + return nullptr; } bool TabTreeWidget::dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action) diff --git a/src/plugins/TabManager/tabmanagerwidget.h b/src/plugins/TabManager/tabmanagerwidget.h index a2f41d1c6..9bf302898 100644 --- a/src/plugins/TabManager/tabmanagerwidget.h +++ b/src/plugins/TabManager/tabmanagerwidget.h @@ -40,7 +40,7 @@ class TabTreeWidget : public QTreeWidget Q_OBJECT public: - TabTreeWidget(QWidget* parent = 0); + TabTreeWidget(QWidget* parent = nullptr); Qt::DropActions supportedDropActions() const override; QStringList mimeTypes() const override; @@ -65,7 +65,7 @@ public: GroupByHost = 2 }; - explicit TabManagerWidget(BrowserWindow* mainClass, QWidget* parent = 0, bool defaultWidget = false); + explicit TabManagerWidget(BrowserWindow* mainClass, QWidget* parent = nullptr, bool defaultWidget = false); ~TabManagerWidget() override; void closeSelectedTabs(const QMultiHash &tabsHash); @@ -78,7 +78,7 @@ public: static QString domainFromUrl(const QUrl &url, bool useHostName = false); public Q_SLOTS: - void delayedRefreshTree(WebPage* p = 0); + void delayedRefreshTree(WebPage* p = nullptr); void changeGroupType(); private: @@ -127,7 +127,7 @@ public: SavedRole = Qt::UserRole + 2 }; - TabItem(QTreeWidget* treeWidget, bool supportDrag = true, bool isTab = true, QTreeWidgetItem* parent = 0, bool addToTree = true); + TabItem(QTreeWidget* treeWidget, bool supportDrag = true, bool isTab = true, QTreeWidgetItem* parent = nullptr, bool addToTree = true); BrowserWindow* window() const; void setBrowserWindow(BrowserWindow* window); diff --git a/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp b/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp index 98ad592a4..653632b20 100644 --- a/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp +++ b/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp @@ -54,7 +54,7 @@ public: TabManagerWidgetController::TabManagerWidgetController(QObject* parent) : SideBarInterface(parent) - , m_defaultTabManager(0) + , m_defaultTabManager(nullptr) , m_groupType(TabManagerWidget::GroupByWindow) { } @@ -86,7 +86,7 @@ QWidget* TabManagerWidgetController::createSideBarWidget(BrowserWindow* mainWind AbstractButtonInterface* TabManagerWidgetController::createStatusBarIcon(BrowserWindow* mainWindow) { if (!defaultTabManager()) { - return 0; + return nullptr; } if (m_statusBarIcons.contains(mainWindow)) { @@ -152,7 +152,7 @@ TabManagerWidget* TabManagerWidgetController::createTabManagerWidget(BrowserWind connect(tabManagerWidget, SIGNAL(showSideBySide()), this, SLOT(showSideBySide())); } else { - m_defaultTabManager = 0; + m_defaultTabManager = nullptr; } connect(tabManagerWidget, SIGNAL(groupTypeChanged(TabManagerWidget::GroupType)), this, SLOT(setGroupType(TabManagerWidget::GroupType))); diff --git a/src/plugins/TabManager/tabmanagerwidgetcontroller.h b/src/plugins/TabManager/tabmanagerwidgetcontroller.h index 6bdd11397..c9a389f92 100644 --- a/src/plugins/TabManager/tabmanagerwidgetcontroller.h +++ b/src/plugins/TabManager/tabmanagerwidgetcontroller.h @@ -29,7 +29,7 @@ class TabManagerWidgetController : public SideBarInterface { Q_OBJECT public: - explicit TabManagerWidgetController(QObject* parent = 0); + explicit TabManagerWidgetController(QObject* parent = nullptr); ~TabManagerWidgetController() override; QString title() const override; @@ -39,7 +39,7 @@ public: AbstractButtonInterface* createStatusBarIcon(BrowserWindow* mainWindow); TabManagerWidget::GroupType groupType(); - TabManagerWidget* createTabManagerWidget(BrowserWindow* mainClass, QWidget* parent = 0, bool defaultWidget = false); + TabManagerWidget* createTabManagerWidget(BrowserWindow* mainClass, QWidget* parent = nullptr, bool defaultWidget = false); TabManagerWidget* defaultTabManager(); @@ -61,7 +61,7 @@ private: QHash m_actions; Q_SIGNALS: - void requestRefreshTree(WebPage* p = 0); + void requestRefreshTree(WebPage* p = nullptr); }; #endif // TABMANAGERWIDGETCONTROLLER_H diff --git a/src/plugins/TabManager/tldextractor/tldextractor.cpp b/src/plugins/TabManager/tldextractor/tldextractor.cpp index 610d2a011..96ea44c34 100644 --- a/src/plugins/TabManager/tldextractor/tldextractor.cpp +++ b/src/plugins/TabManager/tldextractor/tldextractor.cpp @@ -24,7 +24,7 @@ #include #include -TLDExtractor* TLDExtractor::s_instance = 0; +TLDExtractor* TLDExtractor::s_instance = nullptr; TLDExtractor::TLDExtractor(QObject* parent) : QObject(parent) @@ -39,7 +39,7 @@ QStringList TLDExtractor::defaultDataSearchPaths() TLDExtractor* TLDExtractor::instance() { - if(s_instance == 0) + if(s_instance == nullptr) { s_instance = new TLDExtractor(qApp); } @@ -49,7 +49,7 @@ TLDExtractor* TLDExtractor::instance() TLDExtractor::~TLDExtractor() { - s_instance = 0; + s_instance = nullptr; } bool TLDExtractor::isDataLoaded() @@ -258,7 +258,7 @@ void TLDExtractor::loadData() if (!parsedDataFileExist) { const QString tldDataFileDownloadLink = QLatin1String("http://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_names.dat?raw=1"); - QMessageBox::information(0, tr("File not found!"), + QMessageBox::information(nullptr, tr("File not found!"), tr("File \'effective_tld_names.dat\' was not found!\n" "You can download it from \'here\' to one of the following paths:\n%2") .arg(tldDataFileDownloadLink, m_dataSearchPaths.join(QStringLiteral("\n")))); @@ -361,7 +361,7 @@ bool TLDExtractor::test() if (!testDataFileExist) { const QString testFileDownloadLink = QLatin1String("http://mxr.mozilla.org/mozilla-central/source/netwerk/test/unit/data/test_psl.txt?raw=1"); - QMessageBox::information(0, tr("File not found!"), + QMessageBox::information(nullptr, tr("File not found!"), tr("File \'test_psl.txt\' was not found!\n" "You can download it from \'here\' to one of the following paths:\n%2") .arg(testFileDownloadLink, m_dataSearchPaths.join(QStringLiteral("\n")))); diff --git a/src/plugins/TabManager/tldextractor/tldextractor.h b/src/plugins/TabManager/tldextractor/tldextractor.h index 7dc520421..ef7877c38 100644 --- a/src/plugins/TabManager/tldextractor/tldextractor.h +++ b/src/plugins/TabManager/tldextractor/tldextractor.h @@ -58,7 +58,7 @@ private: Q_DISABLE_COPY(TLDExtractor) static TLDExtractor* s_instance; - TLDExtractor(QObject* parent = 0); + TLDExtractor(QObject* parent = nullptr); static QStringList defaultDataSearchPaths(); diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp index 23d71527c..318e7c4d3 100644 --- a/src/plugins/TestPlugin/testplugin.cpp +++ b/src/plugins/TestPlugin/testplugin.cpp @@ -30,7 +30,7 @@ TestPlugin::TestPlugin() : QObject() - , m_view(0) + , m_view(nullptr) { } diff --git a/src/plugins/TestPlugin/testplugin_sidebar.h b/src/plugins/TestPlugin/testplugin_sidebar.h index 906e1bbe2..823156cef 100644 --- a/src/plugins/TestPlugin/testplugin_sidebar.h +++ b/src/plugins/TestPlugin/testplugin_sidebar.h @@ -24,7 +24,7 @@ class TestPlugin_Sidebar : public SideBarInterface { Q_OBJECT public: - explicit TestPlugin_Sidebar(QObject* parent = 0); + explicit TestPlugin_Sidebar(QObject* parent = nullptr); QString title() const override; QAction* createMenuAction() override; diff --git a/tests/modeltest/modeltest.h b/tests/modeltest/modeltest.h index 7202e4cef..e04581acd 100644 --- a/tests/modeltest/modeltest.h +++ b/tests/modeltest/modeltest.h @@ -52,7 +52,7 @@ class ModelTest : public QObject Q_OBJECT public: - ModelTest(QAbstractItemModel* model, QObject* parent = 0); + ModelTest(QAbstractItemModel* model, QObject* parent = nullptr); private Q_SLOTS: void nonDestructiveBasicTest();