diff --git a/autotests/databaseencryptedpasswordbackendtest.cpp b/autotests/databaseencryptedpasswordbackendtest.cpp index 04b8e3432..d1d6ee114 100644 --- a/autotests/databaseencryptedpasswordbackendtest.cpp +++ b/autotests/databaseencryptedpasswordbackendtest.cpp @@ -25,7 +25,7 @@ void DatabaseEncryptedPasswordBackendTest::reloadBackend() { delete m_backend; - DatabaseEncryptedPasswordBackend* backend = new DatabaseEncryptedPasswordBackend; + auto* backend = new DatabaseEncryptedPasswordBackend; if (m_testMasterPassword.isEmpty()) { m_testMasterPassword = AesInterface::passwordToHash(QString::fromUtf8(AesInterface::createRandomData(8))); diff --git a/autotests/locationbartest.cpp b/autotests/locationbartest.cpp index 68303fb36..d9c99dd61 100644 --- a/autotests/locationbartest.cpp +++ b/autotests/locationbartest.cpp @@ -82,7 +82,7 @@ void LocationBarTest::loadActionBasicTest() void LocationBarTest::loadActionBookmarksTest() { - BookmarkItem* bookmark = new BookmarkItem(BookmarkItem::Url); + auto* bookmark = new BookmarkItem(BookmarkItem::Url); bookmark->setTitle("KDE Bookmark title"); bookmark->setUrl(QUrl("http://kde.org")); bookmark->setKeyword("kde-bookmark"); diff --git a/autotests/qml/qmlbookmarksapitest.cpp b/autotests/qml/qmlbookmarksapitest.cpp index 46175bbf6..5fa68e63b 100644 --- a/autotests/qml/qmlbookmarksapitest.cpp +++ b/autotests/qml/qmlbookmarksapitest.cpp @@ -49,7 +49,7 @@ void QmlBookmarksApiTest::testBookmarkTreeNode() QCOMPARE(toolbarFolder->urlString(), bookmark->property("url").toString()); QCOMPARE(toolbarFolder->description(), bookmark->property("description").toString()); QCOMPARE(!mApp->bookmarks()->canBeModified(toolbarFolder), bookmark->property("unmodifiable").toBool()); - QObject* parent = qvariant_cast(bookmark->property("parent")); + auto* parent = qvariant_cast(bookmark->property("parent")); QVERIFY(parent); QCOMPARE(mApp->bookmarks()->rootItem()->title(), parent->property("title").toString()); } @@ -69,7 +69,7 @@ void QmlBookmarksApiTest::testBookmarksCreation() QCOMPARE(qmlBookmarksSpy.count(), 1); - QObject *created = qvariant_cast(qmlBookmarksSpy.at(0).at(0)); + auto *created = qvariant_cast(qmlBookmarksSpy.at(0).at(0)); QVERIFY(created); QCOMPARE(item->title(), created->property("title").toString()); @@ -84,7 +84,7 @@ void QmlBookmarksApiTest::testBookmarksCreation() QVERIFY(out.toBool()); QCOMPARE(bookmarksSpy.count(), 1); - BookmarkItem* createdItem = qvariant_cast(bookmarksSpy.at(0).at(0)); + auto* createdItem = qvariant_cast(bookmarksSpy.at(0).at(0)); QVERIFY(createdItem); QCOMPARE(createdItem->title(), QString("Example Plugin")); } @@ -112,7 +112,7 @@ void QmlBookmarksApiTest::testBookmarksModification() QCOMPARE(qmlBookmarksSpy.count(), 1); - QObject *modified = qvariant_cast(qmlBookmarksSpy.at(0).at(0)); + auto *modified = qvariant_cast(qmlBookmarksSpy.at(0).at(0)); QVERIFY(modified); QCOMPARE(modified->property("title").toString(), QString("Modified Example Domain")); @@ -125,7 +125,7 @@ void QmlBookmarksApiTest::testBookmarksModification() QVERIFY(out.toBool()); QCOMPARE(bookmarksSpy.count(), 1); - BookmarkItem* modifiedItem = qvariant_cast(bookmarksSpy.at(0).at(0)); + auto* modifiedItem = qvariant_cast(bookmarksSpy.at(0).at(0)); QVERIFY(modifiedItem); QCOMPARE(modifiedItem->title(), QString("Modified Example Plugin")); } @@ -143,7 +143,7 @@ void QmlBookmarksApiTest::testBookmarksRemoval() QCOMPARE(qmlBookmarksSpy.count(), 1); - QObject *removed = qvariant_cast(qmlBookmarksSpy.at(0).at(0)); + auto *removed = qvariant_cast(qmlBookmarksSpy.at(0).at(0)); QVERIFY(removed); QCOMPARE(removed->property("title").toString(), QString("Modified Example Domain")); @@ -154,7 +154,7 @@ void QmlBookmarksApiTest::testBookmarksRemoval() QVERIFY(out.toBool()); QCOMPARE(bookmarksSpy.count(), 1); - BookmarkItem* removedItem = qvariant_cast(bookmarksSpy.at(0).at(0)); + auto* removedItem = qvariant_cast(bookmarksSpy.at(0).at(0)); QVERIFY(removedItem); QCOMPARE(removedItem->title(), QString("Modified Example Plugin")); } diff --git a/autotests/qml/qmlcookiesapitest.cpp b/autotests/qml/qmlcookiesapitest.cpp index 2e851f805..469e61f48 100644 --- a/autotests/qml/qmlcookiesapitest.cpp +++ b/autotests/qml/qmlcookiesapitest.cpp @@ -52,7 +52,7 @@ void QmlCookiesApiTest::testCookieAdditionRemoval() mApp->webProfile()->cookieStore()->setCookie(anotherNetCookie); QTRY_COMPARE(qmlCookieSpy.count(), 1); QVariantMap addedQmlCookieMap = QVariant(qmlCookieSpy.at(0).at(0)).toMap(); - QObject *addedQmlCookie = qvariant_cast(addedQmlCookieMap.value("cookie")); + auto *addedQmlCookie = qvariant_cast(addedQmlCookieMap.value("cookie")); bool removed = addedQmlCookieMap.value("removed").toBool(); QCOMPARE(addedQmlCookie->property("name").toString(), QSL("Hello")); QCOMPARE(removed, false); @@ -60,7 +60,7 @@ void QmlCookiesApiTest::testCookieAdditionRemoval() mApp->webProfile()->cookieStore()->deleteCookie(netCookie); QTRY_COMPARE(qmlCookieSpy.count(), 2); QVariantMap removedQmlCookieMap = QVariant(qmlCookieSpy.at(1).at(0)).toMap(); - QObject *removedQmlCookie = qvariant_cast(removedQmlCookieMap.value("cookie")); + auto *removedQmlCookie = qvariant_cast(removedQmlCookieMap.value("cookie")); removed = removedQmlCookieMap.value("removed").toBool(); QCOMPARE(removedQmlCookie->property("name").toString(), QSL("Example")); QCOMPARE(removed, true); diff --git a/autotests/qml/qmltopsitesapitest.cpp b/autotests/qml/qmltopsitesapitest.cpp index 6fbcfb54b..a4c903cd2 100644 --- a/autotests/qml/qmltopsitesapitest.cpp +++ b/autotests/qml/qmltopsitesapitest.cpp @@ -37,7 +37,7 @@ void QmlTopSitesApiTest::testTopSites() qDebug() << "Top sites list size=" << list.length(); for( const auto& site : list ) { - QObject* object = qvariant_cast(site); + auto* object = qvariant_cast(site); if (object) { qDebug() << ".." << object->property("title") << object->property("url"); @@ -48,7 +48,7 @@ void QmlTopSitesApiTest::testTopSites() } } QCOMPARE(list.length(), 1); - QObject* object = qvariant_cast(list.at(0)); + auto* object = qvariant_cast(list.at(0)); QVERIFY(object); QCOMPARE(object->property("title").toString(), QSL("Example Domain")); QCOMPARE(object->property("url").toString(), QSL("https://example.com")); diff --git a/autotests/qml/qmluserscriptapitest.cpp b/autotests/qml/qmluserscriptapitest.cpp index 2f4c56d23..6e2fc9afa 100644 --- a/autotests/qml/qmluserscriptapitest.cpp +++ b/autotests/qml/qmluserscriptapitest.cpp @@ -55,9 +55,9 @@ void QmlUserScriptApiTest::testContains() { QWebEngineScript script = mApp->webProfile()->scripts()->toList().at(0); QObject *object = m_testHelper.evaluateQObject("Falkon.UserScripts"); - QmlUserScripts *userScripts = dynamic_cast(object); + auto *userScripts = dynamic_cast(object); QVERIFY(userScripts); - QmlUserScript *userScript = new QmlUserScript(); + auto *userScript = new QmlUserScript(); userScript->setWebEngineScript(script); bool contains = userScripts->contains(userScript); QCOMPARE(contains, true); @@ -67,7 +67,7 @@ void QmlUserScriptApiTest::testFind() { QWebEngineScript script = mApp->webProfile()->scripts()->toList().at(0); QObject *object = m_testHelper.evaluateQObject("Falkon.UserScripts"); - QmlUserScripts *userScripts = dynamic_cast(object); + auto *userScripts = dynamic_cast(object); QVERIFY(userScripts); QObject *scriptFound = userScripts->findScript(script.name()); QVERIFY(scriptFound); @@ -78,9 +78,9 @@ void QmlUserScriptApiTest::testInsertRemove() { int initialCount = m_testHelper.evaluate("Falkon.UserScripts.count").toInt(); QObject *object = m_testHelper.evaluateQObject("Falkon.UserScripts"); - QmlUserScripts *userScripts = dynamic_cast(object); + auto *userScripts = dynamic_cast(object); QVERIFY(userScripts); - QmlUserScript *userScript = new QmlUserScript(); + auto *userScript = new QmlUserScript(); userScript->setProperty("name", "Hello World"); userScript->setProperty("sourceCode", "(function() {" " alert('Hello World')" diff --git a/autotests/qml/qmlwindowsapitest.cpp b/autotests/qml/qmlwindowsapitest.cpp index e780d5177..a8682040d 100644 --- a/autotests/qml/qmlwindowsapitest.cpp +++ b/autotests/qml/qmlwindowsapitest.cpp @@ -57,7 +57,7 @@ void QmlWindowsApiTest::testWindowsAPI() QTRY_COMPARE(qmlWindowCreatedSignal.count(), 2); QTRY_COMPARE(windowCreatedSingal.count(), 2); - QObject *newQmlSignalWindow = qvariant_cast(qmlWindowCreatedSignal.at(1).at(0)); + auto *newQmlSignalWindow = qvariant_cast(qmlWindowCreatedSignal.at(1).at(0)); QVERIFY(newQmlSignalWindow); QCOMPARE(newQmlWindow->property("id").toInt(), newQmlSignalWindow->property("id").toInt()); diff --git a/autotests/qztoolstest.cpp b/autotests/qztoolstest.cpp index 2b55c61f3..901cf2e5e 100644 --- a/autotests/qztoolstest.cpp +++ b/autotests/qztoolstest.cpp @@ -95,13 +95,13 @@ void QzToolsTest::splitCommandArguments_data() << QStringList(); QTest::newRow("OnlySpaces") << QString(" ") << QStringList(); - QTest::newRow("OnlyQuotes") << QString("\"\" \"\"") + QTest::newRow("OnlyQuotes") << QString(R"("" "")") << QStringList(); - QTest::newRow("EmptyQuotesAndSpace") << QString("\"\" \"\" \" \"") + QTest::newRow("EmptyQuotesAndSpace") << QString(R"("" "" " ")") << QStringList(" "); QTest::newRow("MultipleSpaces") << " /usr/foo -o foo.out " << (QStringList() << "/usr/foo" << "-o" << "foo.out"); - QTest::newRow("Quotes") << "\"/usr/foo\" \"-o\" \"foo.out\"" + QTest::newRow("Quotes") << R"("/usr/foo" "-o" "foo.out")" << (QStringList() << "/usr/foo" << "-o" << "foo.out"); QTest::newRow("SingleQuotes") << "'/usr/foo' '-o' 'foo.out'" << (QStringList() << "/usr/foo" << "-o" << "foo.out"); @@ -111,7 +111,7 @@ void QzToolsTest::splitCommandArguments_data() << (QStringList() << "/usr/foo" << "-o 'ds' " << "foo.out"); QTest::newRow("DoubleInSingleQuotes") << "/usr/foo -o 'foo\" d \".out' " << (QStringList() << "/usr/foo" << "-o" << "foo\" d \".out"); - QTest::newRow("SpacesWithQuotes") << QString(" \" \" \" \" ") + QTest::newRow("SpacesWithQuotes") << QString(R"( " " " " )") << (QStringList() << " " << " "); QTest::newRow("QuotesAndSpaces") << "/usr/foo -o \"foo - out\"" << (QStringList() << "/usr/foo" << "-o" << "foo - out"); diff --git a/autotests/sqldatabasetest.cpp b/autotests/sqldatabasetest.cpp index 079fdc537..6a6d0f399 100644 --- a/autotests/sqldatabasetest.cpp +++ b/autotests/sqldatabasetest.cpp @@ -50,7 +50,7 @@ void SqlDatabaseTest::sqlQueryJobTest() QCOMPARE(db.tables().count(), 0); - SqlQueryJob *job = new SqlQueryJob(); + auto *job = new SqlQueryJob(); job->setQuery(QSL("CREATE TABLE test1 (data TEXT, id INTEGER PRIMARY KEY)")); job->start(); QVERIFY(waitForFinished(job)); diff --git a/autotests/webviewtest.cpp b/autotests/webviewtest.cpp index 40b0a5735..997ab2cdf 100644 --- a/autotests/webviewtest.cpp +++ b/autotests/webviewtest.cpp @@ -67,7 +67,7 @@ void WebViewTest::cleanupTestCase() void WebViewTest::loadSignalsChangePageTest() { TestWebView view; - WebPage *page1 = new WebPage; + auto *page1 = new WebPage; view.setPage(page1); QSignalSpy loadStartedSpy(&view, &WebView::loadStarted); @@ -78,7 +78,7 @@ void WebViewTest::loadSignalsChangePageTest() QTRY_COMPARE(loadStartedSpy.count(), 1); loadStartedSpy.clear(); - WebPage *page2 = new WebPage; + auto *page2 = new WebPage; view.setPage(page2); // WebPage: Workaround for broken load started/finished signals in QtWebEngine 5.10 @@ -89,7 +89,7 @@ void WebViewTest::loadSignalsChangePageTest() loadFinishedSpy.clear(); QWebEngineView view2; - WebPage *page3 = new WebPage; + auto *page3 = new WebPage; view2.setPage(page3); QSignalSpy page3LoadStart(page3, &WebPage::loadStarted); diff --git a/src/lib/3rdparty/fancytabwidget.cpp b/src/lib/3rdparty/fancytabwidget.cpp index 1816ea18f..756b8379e 100644 --- a/src/lib/3rdparty/fancytabwidget.cpp +++ b/src/lib/3rdparty/fancytabwidget.cpp @@ -56,7 +56,7 @@ void FancyTabProxyStyle::drawControl( QPainter* p, const QWidget* widget) const { - const QStyleOptionTab* v_opt = qstyleoption_cast(option); + const auto* v_opt = qstyleoption_cast(option); if (element != CE_TabBarTab || !v_opt) { QProxyStyle::drawControl(element, option, p, widget); @@ -127,10 +127,10 @@ void FancyTabProxyStyle::drawControl( const QString tab_hover = widget->property("tab_hover").toString(); int fader = widget->property(fader_key.toUtf8().constData()).toInt(); - QPropertyAnimation* animation = widget->property(animation_key.toUtf8().constData()).value(); + auto* animation = widget->property(animation_key.toUtf8().constData()).value(); if (!animation) { - QWidget* mut_widget = const_cast(widget); + auto* mut_widget = const_cast(widget); fader = 0; mut_widget->setProperty(fader_key.toUtf8().constData(), fader); animation = new QPropertyAnimation(mut_widget, fader_key.toUtf8(), mut_widget); @@ -193,9 +193,9 @@ void FancyTabProxyStyle::polish(QPalette &palette) bool FancyTabProxyStyle::eventFilter(QObject* o, QEvent* e) { - QTabBar* bar = qobject_cast(o); + auto* bar = qobject_cast(o); if (bar && (e->type() == QEvent::MouseMove || e->type() == QEvent::Leave)) { - QMouseEvent* event = static_cast(e); + auto* event = static_cast(e); const QString old_hovered_tab = bar->property("tab_hover").toString(); const QString hovered_tab = e->type() == QEvent::Leave ? QString() : bar->tabText(bar->tabAt(event->pos())); bar->setProperty("tab_hover", hovered_tab); @@ -250,7 +250,7 @@ FancyTabBar::FancyTabBar(QWidget* parent) setMouseTracking(true); // Needed for hover events m_triggerTimer.setSingleShot(true); - QVBoxLayout* layout = new QVBoxLayout; + auto* layout = new QVBoxLayout; layout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding)); layout->setSpacing(0); layout->setContentsMargins(0, 0, 0, 0); @@ -366,7 +366,7 @@ void FancyTabBar::mousePressEvent(QMouseEvent* e) void FancyTabBar::addTab(const QIcon &icon, const QString &label) { - FancyTab* tab = new FancyTab(this); + auto* tab = new FancyTab(this); tab->icon = icon; tab->text = label; m_tabs.append(tab); @@ -512,7 +512,7 @@ FancyTabWidget::FancyTabWidget(QWidget* parent) top_layout_->setSpacing(0); top_layout_->addLayout(stack_); - QHBoxLayout* main_layout = new QHBoxLayout; + auto* main_layout = new QHBoxLayout; main_layout->setContentsMargins(0, 0, 0, 0); main_layout->setSpacing(1); main_layout->addWidget(side_widget_); @@ -576,10 +576,10 @@ int FancyTabWidget::current_index() const void FancyTabWidget::SetCurrentIndex(int index) { - if (FancyTabBar* bar = qobject_cast(tab_bar_)) { + if (auto* bar = qobject_cast(tab_bar_)) { bar->setCurrentIndex(index); } - else if (QTabBar* bar = qobject_cast(tab_bar_)) { + else if (auto* bar = qobject_cast(tab_bar_)) { bar->setCurrentIndex(index); } else { @@ -614,7 +614,7 @@ void FancyTabWidget::SetMode(Mode mode) // fallthrough case Mode_LargeSidebar: { - FancyTabBar* bar = new FancyTabBar(this); + auto* bar = new FancyTabBar(this); side_layout_->insertWidget(0, bar); tab_bar_ = bar; @@ -697,7 +697,7 @@ void FancyTabWidget::AddMenuItem(QSignalMapper* mapper, QActionGroup* group, void FancyTabWidget::MakeTabBar(QTabBar::Shape shape, bool text, bool icons, bool fancy) { - QTabBar* bar = new QTabBar(this); + auto* bar = new QTabBar(this); bar->setShape(shape); bar->setDocumentMode(true); bar->setUsesScrollButtons(true); diff --git a/src/lib/3rdparty/lineedit.cpp b/src/lib/3rdparty/lineedit.cpp index 8106d93e4..b877a8d53 100644 --- a/src/lib/3rdparty/lineedit.cpp +++ b/src/lib/3rdparty/lineedit.cpp @@ -99,42 +99,42 @@ void LineEdit::init() connect(m_leftWidget, &SideWidget::sizeHintChanged, this, &LineEdit::updateTextMargins); connect(m_rightWidget, &SideWidget::sizeHintChanged, this, &LineEdit::updateTextMargins); - QAction* undoAction = new QAction(QIcon::fromTheme(QSL("edit-undo")), tr("&Undo"), this); + auto* undoAction = new QAction(QIcon::fromTheme(QSL("edit-undo")), tr("&Undo"), this); undoAction->setShortcut(QKeySequence(QSL("Ctrl+Z"))); undoAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); connect(undoAction, &QAction::triggered, this, &QLineEdit::undo); - QAction* redoAction = new QAction(QIcon::fromTheme(QSL("edit-redo")), tr("&Redo"), this); + auto* redoAction = new QAction(QIcon::fromTheme(QSL("edit-redo")), tr("&Redo"), this); redoAction->setShortcut(QKeySequence(QSL("Ctrl+Shift+Z"))); redoAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); connect(redoAction, &QAction::triggered, this, &QLineEdit::redo); - QAction* cutAction = new QAction(QIcon::fromTheme(QSL("edit-cut")), tr("Cu&t"), this); + auto* cutAction = new QAction(QIcon::fromTheme(QSL("edit-cut")), tr("Cu&t"), this); cutAction->setShortcut(QKeySequence(QSL("Ctrl+X"))); cutAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); connect(cutAction, &QAction::triggered, this, &QLineEdit::cut); - QAction* copyAction = new QAction(QIcon::fromTheme(QSL("edit-copy")), tr("&Copy"), this); + auto* copyAction = new QAction(QIcon::fromTheme(QSL("edit-copy")), tr("&Copy"), this); copyAction->setShortcut(QKeySequence(QSL("Ctrl+C"))); copyAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); connect(copyAction, &QAction::triggered, this, &QLineEdit::copy); - QAction* pasteAction = new QAction(QIcon::fromTheme(QSL("edit-paste")), tr("&Paste"), this); + auto* pasteAction = new QAction(QIcon::fromTheme(QSL("edit-paste")), tr("&Paste"), this); pasteAction->setShortcut(QKeySequence(QSL("Ctrl+V"))); pasteAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); connect(pasteAction, &QAction::triggered, this, &QLineEdit::paste); - QAction* pasteAndGoAction = new QAction(this); + auto* pasteAndGoAction = new QAction(this); pasteAndGoAction->setShortcut(QKeySequence(QSL("Ctrl+Shift+V"))); pasteAndGoAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); - QAction* deleteAction = new QAction(QIcon::fromTheme(QSL("edit-delete")), tr("Delete"), this); + auto* deleteAction = new QAction(QIcon::fromTheme(QSL("edit-delete")), tr("Delete"), this); connect(deleteAction, &QAction::triggered, this, &LineEdit::slotDelete); - QAction* clearAllAction = new QAction(QIcon::fromTheme(QSL("edit-clear")), tr("Clear All"), this); + auto* clearAllAction = new QAction(QIcon::fromTheme(QSL("edit-clear")), tr("Clear All"), this); connect(clearAllAction, &QAction::triggered, this, &QLineEdit::clear); - QAction* selectAllAction = new QAction(QIcon::fromTheme(QSL("edit-select-all")), tr("Select All"), this); + auto* selectAllAction = new QAction(QIcon::fromTheme(QSL("edit-select-all")), tr("Select All"), this); selectAllAction->setShortcut(QKeySequence(QSL("Ctrl+A"))); selectAllAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); connect(selectAllAction, &QAction::triggered, this, &QLineEdit::selectAll); @@ -190,7 +190,7 @@ bool LineEdit::event(QEvent* event) // Modified QLineEdit::createStandardContextMenu to support icons and PasteAndGo action QMenu* LineEdit::createContextMenu() { - QMenu* popup = new QMenu(this); + auto* popup = new QMenu(this); popup->setObjectName(QSL("qt_edit_menu")); if (!isReadOnly()) { diff --git a/src/lib/3rdparty/lineedit.h b/src/lib/3rdparty/lineedit.h index 3e6dcf0f3..fb195b864 100644 --- a/src/lib/3rdparty/lineedit.h +++ b/src/lib/3rdparty/lineedit.h @@ -73,7 +73,7 @@ class FALKON_EXPORT LineEdit : public QLineEdit Q_PROPERTY(int minHeight READ minHeight WRITE setMinHeight) public: - typedef QList TextFormat; + using TextFormat = QList; enum WidgetPosition { LeftSide, diff --git a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp index 9c6613eda..3c26550b2 100644 --- a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp +++ b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp @@ -56,8 +56,8 @@ typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*); static PProcessIdToSessionId pProcessIdToSessionId = 0; #endif #if defined(Q_OS_UNIX) +#include #include -#include #include #endif @@ -138,7 +138,7 @@ QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId) } m_dbusRegistered = QDBusConnection::sessionBus().registerService(id); if (m_dbusRegistered) { - QtSingleAppDBusInterface *iface = new QtSingleAppDBusInterface(this); + auto *iface = new QtSingleAppDBusInterface(this); connect(iface, &QtSingleAppDBusInterface::messageReceived, this, &QtLocalPeer::messageReceived); QDBusConnection::sessionBus().registerObject(QStringLiteral("/"), this); } diff --git a/src/lib/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp b/src/lib/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp index c49747b12..1ed3bd07b 100644 --- a/src/lib/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp +++ b/src/lib/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp @@ -38,10 +38,10 @@ ** ****************************************************************************/ -#include -#include -#include +#include +#include #include +#include #include "qtlockedfile.h" diff --git a/src/lib/3rdparty/squeezelabelv2.cpp b/src/lib/3rdparty/squeezelabelv2.cpp index d4f60bacb..e449247e7 100644 --- a/src/lib/3rdparty/squeezelabelv2.cpp +++ b/src/lib/3rdparty/squeezelabelv2.cpp @@ -109,8 +109,8 @@ void SqueezeLabelV2::mouseMoveEvent(QMouseEvent* event) return; } - QDrag* drag = new QDrag(this); - QMimeData* mime = new QMimeData; + auto* drag = new QDrag(this); + auto* mime = new QMimeData; mime->setText(m_originalText); drag->setMimeData(mime); diff --git a/src/lib/3rdparty/stylehelper.h b/src/lib/3rdparty/stylehelper.h index 5df4c93f2..261a657ec 100644 --- a/src/lib/3rdparty/stylehelper.h +++ b/src/lib/3rdparty/stylehelper.h @@ -64,8 +64,8 @@ public: static QColor shadowColor(bool lightColored = false); static QColor borderColor(bool lightColored = false); - static QColor sidebarHighlight() { return QColor(255, 255, 255, 40); } - static QColor sidebarShadow() { return QColor(0, 0, 0, 40); } + static QColor sidebarHighlight() { return {255, 255, 255, 40}; } + static QColor sidebarShadow() { return {0, 0, 0, 40}; } // Sets the base color and makes sure all top level widgets are updated static void setBaseColor(const QColor &color); diff --git a/src/lib/adblock/adblockaddsubscriptiondialog.h b/src/lib/adblock/adblockaddsubscriptiondialog.h index fa73b1866..0ff915797 100644 --- a/src/lib/adblock/adblockaddsubscriptiondialog.h +++ b/src/lib/adblock/adblockaddsubscriptiondialog.h @@ -49,7 +49,7 @@ private: QString title; QString url; - Subscription() {} + Subscription() = default; Subscription(const QString &t, const QString &u) { title = t; diff --git a/src/lib/adblock/adblockdialog.cpp b/src/lib/adblock/adblockdialog.cpp index f7ca3cda6..cce1dd391 100644 --- a/src/lib/adblock/adblockdialog.cpp +++ b/src/lib/adblock/adblockdialog.cpp @@ -45,7 +45,7 @@ AdBlockDialog::AdBlockDialog(QWidget* parent) #endif adblockCheckBox->setChecked(m_manager->isEnabled()); - QMenu* menu = new QMenu(buttonOptions); + auto* menu = new QMenu(buttonOptions); m_actionAddRule = menu->addAction(tr("Add Rule"), this, &AdBlockDialog::addRule); m_actionRemoveRule = menu->addAction(tr("Remove Rule"), this, &AdBlockDialog::removeRule); menu->addSeparator(); @@ -76,7 +76,7 @@ void AdBlockDialog::showRule(const AdBlockRule* rule) const } for (int i = 0; i < tabWidget->count(); ++i) { - AdBlockTreeWidget* treeWidget = qobject_cast(tabWidget->widget(i)); + auto* treeWidget = qobject_cast(tabWidget->widget(i)); if (subscription == treeWidget->subscription()) { treeWidget->showRule(rule); @@ -107,7 +107,7 @@ void AdBlockDialog::addSubscription() QString url = dialog.url(); if (AdBlockSubscription* subscription = m_manager->addSubscription(title, url)) { - AdBlockTreeWidget* tree = new AdBlockTreeWidget(subscription, tabWidget); + auto* tree = new AdBlockTreeWidget(subscription, tabWidget); int index = tabWidget->insertTab(tabWidget->count() - 1, tree, subscription->title()); tabWidget->setCurrentIndex(index); @@ -163,7 +163,7 @@ void AdBlockDialog::learnAboutRules() void AdBlockDialog::loadSubscriptions() { for (int i = 0; i < tabWidget->count(); ++i) { - AdBlockTreeWidget* treeWidget = qobject_cast(tabWidget->widget(i)); + auto* treeWidget = qobject_cast(tabWidget->widget(i)); treeWidget->refresh(); } } @@ -176,7 +176,7 @@ void AdBlockDialog::load() const auto subscriptions = m_manager->subscriptions(); for (AdBlockSubscription* subscription : subscriptions) { - AdBlockTreeWidget* tree = new AdBlockTreeWidget(subscription, tabWidget); + auto* tree = new AdBlockTreeWidget(subscription, tabWidget); tabWidget->addTab(tree, subscription->title()); } diff --git a/src/lib/adblock/adblockicon.cpp b/src/lib/adblock/adblockicon.cpp index 60a9e0a82..d2f8b4019 100644 --- a/src/lib/adblock/adblockicon.cpp +++ b/src/lib/adblock/adblockicon.cpp @@ -54,7 +54,7 @@ QString AdBlockIcon::name() const void AdBlockIcon::toggleCustomFilter() { - QAction* action = qobject_cast(sender()); + auto* action = qobject_cast(sender()); if (!action) { return; } @@ -67,7 +67,7 @@ void AdBlockIcon::toggleCustomFilter() customList->removeFilter(filter); } else { - AdBlockRule* rule = new AdBlockRule(filter, customList); + auto* rule = new AdBlockRule(filter, customList); customList->addRule(rule); } } @@ -140,7 +140,7 @@ void AdBlockIcon::clicked(ClickController *controller) const QUrl pageUrl = view->url(); - QMenu *menu = new QMenu(); + auto *menu = new QMenu(); menu->setAttribute(Qt::WA_DeleteOnClose); menu->addAction(tr("Show AdBlock &Settings"), manager, SLOT(showDialog())); menu->addSeparator(); diff --git a/src/lib/adblock/adblockmanager.cpp b/src/lib/adblock/adblockmanager.cpp index a7cb0dcc7..311410d7b 100644 --- a/src/lib/adblock/adblockmanager.cpp +++ b/src/lib/adblock/adblockmanager.cpp @@ -211,7 +211,7 @@ AdBlockSubscription* AdBlockManager::addSubscription(const QString &title, const file.write(data); file.commit(); - AdBlockSubscription* subscription = new AdBlockSubscription(title, this); + auto* subscription = new AdBlockSubscription(title, this); subscription->setUrl(QUrl(url)); subscription->setFilePath(filePath); subscription->loadSubscription(m_disabledRules); @@ -243,7 +243,7 @@ bool AdBlockManager::removeSubscription(AdBlockSubscription* subscription) AdBlockCustomList* AdBlockManager::customList() const { for (AdBlockSubscription* subscription : qAsConst(m_subscriptions)) { - AdBlockCustomList* list = qobject_cast(subscription); + auto* list = qobject_cast(subscription); if (list) { return list; @@ -305,7 +305,7 @@ void AdBlockManager::load() continue; } - AdBlockSubscription* subscription = new AdBlockSubscription(title, this); + auto* subscription = new AdBlockSubscription(title, this); subscription->setUrl(url); subscription->setFilePath(absolutePath); @@ -314,19 +314,19 @@ void AdBlockManager::load() // Add EasyList + NoCoinList if subscriptions are empty if (m_subscriptions.isEmpty()) { - AdBlockSubscription *easyList = new AdBlockSubscription(tr("EasyList"), this); + auto *easyList = new AdBlockSubscription(tr("EasyList"), this); easyList->setUrl(QUrl(ADBLOCK_EASYLIST_URL)); easyList->setFilePath(DataPaths::currentProfilePath() + QLatin1String("/adblock/easylist.txt")); m_subscriptions.append(easyList); - AdBlockSubscription *noCoinList = new AdBlockSubscription(tr("NoCoin List"), this); + auto *noCoinList = new AdBlockSubscription(tr("NoCoin List"), this); noCoinList->setUrl(QUrl(ADBLOCK_NOCOINLIST_URL)); noCoinList->setFilePath(DataPaths::currentProfilePath() + QLatin1String("/adblock/nocoinlist.txt")); m_subscriptions.append(noCoinList); } // Append CustomList - AdBlockCustomList* customList = new AdBlockCustomList(this); + auto* customList = new AdBlockCustomList(this); m_subscriptions.append(customList); // Load all subscriptions @@ -413,7 +413,7 @@ bool AdBlockManager::canBeBlocked(const QUrl &url) const QString AdBlockManager::elementHidingRules(const QUrl &url) const { if (!isEnabled() || !canRunOnScheme(url.scheme()) || m_matcher->genericElemHideDisabledForUrl(url)) - return QString(); + return {}; return m_matcher->elementHidingRules(); } @@ -421,7 +421,7 @@ QString AdBlockManager::elementHidingRules(const QUrl &url) const QString AdBlockManager::elementHidingRulesForDomain(const QUrl &url) const { if (!isEnabled() || !canRunOnScheme(url.scheme()) || m_matcher->elemHideDisabledForUrl(url)) - return QString(); + return {}; return m_matcher->elementHidingRulesForDomain(url.host()); } @@ -452,7 +452,7 @@ AdBlockDialog *AdBlockManager::showDialog(QWidget *parent) void AdBlockManager::showRule() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { const AdBlockRule* rule = static_cast(action->data().value()); if (rule) { diff --git a/src/lib/adblock/adblockplugin.cpp b/src/lib/adblock/adblockplugin.cpp index 03af2a690..bb1a2c736 100644 --- a/src/lib/adblock/adblockplugin.cpp +++ b/src/lib/adblock/adblockplugin.cpp @@ -97,7 +97,7 @@ void AdBlockPlugin::webPageDeleted(WebPage *page) void AdBlockPlugin::mainWindowCreated(BrowserWindow *window) { - AdBlockIcon *icon = new AdBlockIcon(window); + auto *icon = new AdBlockIcon(window); m_icons[window] = icon; window->statusBar()->addButton(icon); window->navigationBar()->addToolButton(icon); diff --git a/src/lib/adblock/adblockrule.cpp b/src/lib/adblock/adblockrule.cpp index f9836dd64..6195a1988 100644 --- a/src/lib/adblock/adblockrule.cpp +++ b/src/lib/adblock/adblockrule.cpp @@ -60,7 +60,7 @@ static QString toSecondLevelDomain(const QUrl &url) const QString urlHost = url.host(); if (topLevelDomain.isEmpty() || urlHost.isEmpty()) { - return QString(); + return {}; } QString domain = urlHost.left(urlHost.size() - topLevelDomain.size()); @@ -95,7 +95,7 @@ AdBlockRule::~AdBlockRule() AdBlockRule* AdBlockRule::copy() const { - AdBlockRule* rule = new AdBlockRule(); + auto* rule = new AdBlockRule(); rule->m_subscription = m_subscription; rule->m_type = m_type; rule->m_options = m_options; diff --git a/src/lib/adblock/adblocksubscription.cpp b/src/lib/adblock/adblocksubscription.cpp index 99d066100..4986bfd88 100644 --- a/src/lib/adblock/adblocksubscription.cpp +++ b/src/lib/adblock/adblocksubscription.cpp @@ -124,7 +124,7 @@ void AdBlockSubscription::loadSubscription(const QStringList &disabledRules) if (line.isEmpty()) { continue; } - AdBlockRule *rule = new AdBlockRule(line, this); + auto *rule = new AdBlockRule(line, this); if (disabledRules.contains(rule->filter())) { rule->setEnabled(false); } diff --git a/src/lib/adblock/adblocktreewidget.cpp b/src/lib/adblock/adblocktreewidget.cpp index b7cfe555a..191ee9175 100644 --- a/src/lib/adblock/adblocktreewidget.cpp +++ b/src/lib/adblock/adblocktreewidget.cpp @@ -113,7 +113,7 @@ void AdBlockTreeWidget::itemChanged(QTreeWidgetItem* item) } else if (m_subscription->canEditRules()) { // Custom rule has been changed - AdBlockRule* newRule = new AdBlockRule(item->text(0), m_subscription); + auto* newRule = new AdBlockRule(item->text(0), m_subscription); const AdBlockRule* rule = m_subscription->replaceRule(newRule, offset); adjustItemFeatures(item, rule); @@ -143,10 +143,10 @@ void AdBlockTreeWidget::addRule() return; } - AdBlockRule* rule = new AdBlockRule(newRule, m_subscription); + auto* rule = new AdBlockRule(newRule, m_subscription); int offset = m_subscription->addRule(rule); - QTreeWidgetItem* item = new QTreeWidgetItem(); + auto* item = new QTreeWidgetItem(); item->setText(0, newRule); item->setData(0, Qt::UserRole + 10, offset); item->setFlags(item->flags() | Qt::ItemIsEditable); @@ -254,7 +254,7 @@ void AdBlockTreeWidget::refresh() int index = 0; for (const AdBlockRule* rule : allRules) { - QTreeWidgetItem* item = new QTreeWidgetItem(m_topItem); + auto* item = new QTreeWidgetItem(m_topItem); item->setText(0, rule->filter()); item->setData(0, Qt::UserRole + 10, index); diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index 5481f369c..1d1e87730 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -87,8 +87,7 @@ static const int savedWindowVersion = 2; BrowserWindow::SavedWindow::SavedWindow() -{ -} += default; BrowserWindow::SavedWindow::SavedWindow(BrowserWindow *window) { @@ -356,7 +355,7 @@ void BrowserWindow::setupUi() } settings.endGroup(); - QWidget* widget = new QWidget(this); + auto* widget = new QWidget(this); widget->setCursor(Qt::ArrowCursor); setCentralWidget(widget); @@ -397,7 +396,7 @@ void BrowserWindow::setupUi() m_statusBar->addPermanentWidget(m_progressBar); m_statusBar->addPermanentWidget(m_ipLabel); - DownloadsButton *downloadsButton = new DownloadsButton(this); + auto *downloadsButton = new DownloadsButton(this); m_statusBar->addButton(downloadsButton); m_navigationToolbar->addToolButton(downloadsButton); @@ -461,26 +460,26 @@ void BrowserWindow::setupMenu() m_mainMenu->initSuperMenu(m_superMenu); // Setup other shortcuts - QShortcut* reloadBypassCacheAction = new QShortcut(QKeySequence(QSL("Ctrl+F5")), this); - QShortcut* reloadBypassCacheAction2 = new QShortcut(QKeySequence(QSL("Ctrl+Shift+R")), this); + auto* reloadBypassCacheAction = new QShortcut(QKeySequence(QSL("Ctrl+F5")), this); + auto* reloadBypassCacheAction2 = new QShortcut(QKeySequence(QSL("Ctrl+Shift+R")), this); connect(reloadBypassCacheAction, &QShortcut::activated, this, &BrowserWindow::reloadBypassCache); connect(reloadBypassCacheAction2, &QShortcut::activated, this, &BrowserWindow::reloadBypassCache); - QShortcut* closeTabAction = new QShortcut(QKeySequence(QSL("Ctrl+W")), this); - QShortcut* closeTabAction2 = new QShortcut(QKeySequence(QSL("Ctrl+F4")), this); + auto* closeTabAction = new QShortcut(QKeySequence(QSL("Ctrl+W")), this); + auto* closeTabAction2 = new QShortcut(QKeySequence(QSL("Ctrl+F4")), this); connect(closeTabAction, &QShortcut::activated, this, &BrowserWindow::closeTab); connect(closeTabAction2, &QShortcut::activated, this, &BrowserWindow::closeTab); - QShortcut* reloadAction = new QShortcut(QKeySequence(QSL("Ctrl+R")), this); + auto* reloadAction = new QShortcut(QKeySequence(QSL("Ctrl+R")), this); connect(reloadAction, &QShortcut::activated, this, &BrowserWindow::reload); - QShortcut* openLocationAction = new QShortcut(QKeySequence(QSL("Alt+D")), this); + auto* openLocationAction = new QShortcut(QKeySequence(QSL("Alt+D")), this); connect(openLocationAction, &QShortcut::activated, this, &BrowserWindow::openLocation); - QShortcut* inspectorAction = new QShortcut(QKeySequence(QSL("F12")), this); + auto* inspectorAction = new QShortcut(QKeySequence(QSL("F12")), this); connect(inspectorAction, &QShortcut::activated, this, &BrowserWindow::toggleWebInspector); - QShortcut* restoreClosedWindow = new QShortcut(QKeySequence(QSL("Ctrl+Shift+N")), this); + auto* restoreClosedWindow = new QShortcut(QKeySequence(QSL("Ctrl+Shift+N")), this); connect(restoreClosedWindow, &QShortcut::activated, mApp->closedWindowsManager(), &ClosedWindowsManager::restoreClosedWindow); } @@ -500,7 +499,7 @@ void BrowserWindow::updateStartupFocus() QAction* BrowserWindow::createEncodingAction(const QString &codecName, const QString &activeCodecName, QMenu* menu) { - QAction* action = new QAction(codecName, menu); + auto* action = new QAction(codecName, menu); action->setData(codecName); action->setCheckable(true); connect(action, &QAction::triggered, this, &BrowserWindow::changeEncoding); @@ -522,10 +521,10 @@ void BrowserWindow::createEncodingSubMenu(const QString &name, QStringList &code return collator.compare(a, b) < 0; }); - QMenu* subMenu = new QMenu(name, menu); + auto* subMenu = new QMenu(name, menu); const QString activeCodecName = mApp->webSettings()->defaultTextEncoding(); - QActionGroup *group = new QActionGroup(subMenu); + auto *group = new QActionGroup(subMenu); for (const QString &codecName : qAsConst(codecNames)) { QAction *act = createEncodingAction(codecName, activeCodecName, subMenu); @@ -654,7 +653,7 @@ TabbedWebView* BrowserWindow::weView() const TabbedWebView* BrowserWindow::weView(int index) const { - WebTab* webTab = qobject_cast(m_tabWidget->widget(index)); + auto* webTab = qobject_cast(m_tabWidget->widget(index)); if (!webTab) { return nullptr; } @@ -740,7 +739,7 @@ void BrowserWindow::setWindowTitle(const QString &t) void BrowserWindow::changeEncoding() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { const QString encoding = action->data().toString(); mApp->webSettings()->setDefaultTextEncoding(encoding); @@ -788,7 +787,7 @@ void BrowserWindow::loadActionUrl(QObject* obj) obj = sender(); } - if (QAction* action = qobject_cast(obj)) { + if (auto* action = qobject_cast(obj)) { loadAddress(action->data().toUrl()); } } @@ -799,7 +798,7 @@ void BrowserWindow::loadActionUrlInNewTab(QObject* obj) obj = sender(); } - if (QAction* action = qobject_cast(obj)) { + if (auto* action = qobject_cast(obj)) { m_tabWidget->addView(action->data().toUrl(), Qz::NT_SelectedTabAtTheEnd); } } @@ -1216,7 +1215,7 @@ void BrowserWindow::hideNavigationSlot() bool BrowserWindow::event(QEvent *event) { if (event->type() == QEvent::WindowStateChange) { - QWindowStateChangeEvent *e = static_cast(event); + auto *e = static_cast(event); if (!(e->oldState() & Qt::WindowFullScreen) && windowState() & Qt::WindowFullScreen) { // Enter fullscreen m_statusBarVisible = m_statusBar->isVisible(); diff --git a/src/lib/app/commandlineoptions.h b/src/lib/app/commandlineoptions.h index d1c25563a..8eb209f54 100644 --- a/src/lib/app/commandlineoptions.h +++ b/src/lib/app/commandlineoptions.h @@ -30,7 +30,7 @@ public: QString text; }; - typedef QVector ActionPairList; + using ActionPairList = QVector; explicit CommandLineOptions(); ActionPairList getActions(); diff --git a/src/lib/app/datapaths.cpp b/src/lib/app/datapaths.cpp index d2efb346d..2b1fed84b 100644 --- a/src/lib/app/datapaths.cpp +++ b/src/lib/app/datapaths.cpp @@ -34,8 +34,7 @@ DataPaths::DataPaths() } DataPaths::~DataPaths() -{ -} += default; // static void DataPaths::setCurrentProfilePath(const QString &profilePath) @@ -89,7 +88,7 @@ QString DataPaths::locate(Path type, const QString &file) return fullPath; } } - return QString(); + return {}; } // static diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index 3c4bce64e..fc2c5b383 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -445,7 +445,7 @@ BrowserWindow* MainApplication::createWindow(Qz::BrowserWindowType type, const Q type = Qz::BW_FirstAppWindow; } - BrowserWindow* window = new BrowserWindow(type, startUrl); + auto* window = new BrowserWindow(type, startUrl); connect(window, &QObject::destroyed, this, &MainApplication::windowDestroyed); m_windows.prepend(window); @@ -682,7 +682,7 @@ void MainApplication::addNewTab(const QUrl &url) void MainApplication::startPrivateBrowsing(const QUrl &startUrl) { QUrl url = startUrl; - if (QAction* act = qobject_cast(sender())) { + if (auto* act = qobject_cast(sender())) { url = act->data().toUrl(); } @@ -863,7 +863,7 @@ void MainApplication::messageReceived(const QString &message) actWin = downloadManager(); } else if (text == QLatin1String("ToggleFullScreen") && actWin) { - BrowserWindow* qz = static_cast(actWin); + auto* qz = static_cast(actWin); qz->toggleFullScreen(); } else if (text.startsWith(QLatin1String("OpenUrlInCurrentTab"))) { @@ -892,7 +892,7 @@ void MainApplication::messageReceived(const QString &message) actWin->activateWindow(); actWin->setFocus(); - BrowserWindow* win = qobject_cast(actWin); + auto* win = qobject_cast(actWin); if (win && !actUrl.isEmpty()) { win->loadAddress(actUrl); @@ -910,7 +910,7 @@ void MainApplication::windowDestroyed(QObject* window) void MainApplication::onFocusChanged() { - BrowserWindow* activeBrowserWindow = qobject_cast(activeWindow()); + auto* activeBrowserWindow = qobject_cast(activeWindow()); if (activeBrowserWindow) { m_lastActiveWindow = activeBrowserWindow; diff --git a/src/lib/app/mainmenu.cpp b/src/lib/app/mainmenu.cpp index 464084251..7671cda0b 100644 --- a/src/lib/app/mainmenu.cpp +++ b/src/lib/app/mainmenu.cpp @@ -81,7 +81,7 @@ void MainMenu::initSuperMenu(QMenu* superMenu) const superMenu->addAction(m_actions[QSL("File/OpenFile")]); if (mApp->sessionManager()) { superMenu->addSeparator(); - QMenu* sessionsSubmenu = new QMenu(tr("Sessions")); + auto* sessionsSubmenu = new QMenu(tr("Sessions")); connect(sessionsSubmenu, SIGNAL(aboutToShow()), mApp->sessionManager(), SLOT(aboutToShowSessionsMenu())); superMenu->addMenu(sessionsSubmenu); superMenu->addAction(m_actions[QSL("File/SessionManager")]); @@ -119,7 +119,7 @@ QAction* MainMenu::action(const QString &name) const void MainMenu::showAboutDialog() { - AboutDialog* dialog = new AboutDialog(m_window); + auto* dialog = new AboutDialog(m_window); dialog->open(); } @@ -295,7 +295,7 @@ void MainMenu::webSearch() void MainMenu::showSiteInfo() { if (m_window && SiteInfo::canShowSiteInfo(m_window->weView()->url())) { - SiteInfo* info = new SiteInfo(m_window->weView()); + auto* info = new SiteInfo(m_window->weView()); info->show(); } } @@ -309,7 +309,7 @@ void MainMenu::showDownloadManager() void MainMenu::showCookieManager() { - CookieManager* m = new CookieManager(m_window); + auto* m = new CookieManager(m_window); m->show(); m->raise(); } @@ -321,7 +321,7 @@ void MainMenu::toggleWebInspector() void MainMenu::showClearRecentHistoryDialog() { - ClearPrivateData* dialog = new ClearPrivateData(m_window); + auto* dialog = new ClearPrivateData(m_window); dialog->open(); } @@ -418,7 +418,7 @@ void MainMenu::aboutToShowSuperMenu() void MainMenu::aboutToShowToolbarsMenu() { - QMenu* menu = qobject_cast(sender()); + auto* menu = qobject_cast(sender()); Q_ASSERT(menu); if (m_window) { @@ -429,7 +429,7 @@ void MainMenu::aboutToShowToolbarsMenu() void MainMenu::aboutToShowSidebarsMenu() { - QMenu* menu = qobject_cast(sender()); + auto* menu = qobject_cast(sender()); Q_ASSERT(menu); if (m_window) { @@ -439,7 +439,7 @@ void MainMenu::aboutToShowSidebarsMenu() void MainMenu::aboutToShowEncodingMenu() { - QMenu* menu = qobject_cast(sender()); + auto* menu = qobject_cast(sender()); Q_ASSERT(menu); if (m_window) { @@ -464,7 +464,7 @@ void MainMenu::init() m_actions[QSL(name)] = action // Standard actions - needed on Mac to be placed correctly in "application" menu - QAction* action = new QAction(QIcon::fromTheme(QSL("help-about")), tr("&About Falkon"), this); + auto* action = new QAction(QIcon::fromTheme(QSL("help-about")), tr("&About Falkon"), this); action->setMenuRole(QAction::AboutRole); connect(action, &QAction::triggered, this, &MainMenu::showAboutDialog); m_actions[QSL("Standard/About")] = action; @@ -494,7 +494,7 @@ void MainMenu::init() m_menuFile->addSeparator(); if (mApp->sessionManager()) { - QMenu* sessionsSubmenu = new QMenu(tr("Sessions")); + auto* sessionsSubmenu = new QMenu(tr("Sessions")); connect(sessionsSubmenu, SIGNAL(aboutToShow()), mApp->sessionManager(), SLOT(aboutToShowSessionsMenu())); m_menuFile->addMenu(sessionsSubmenu); action = new QAction(tr("Session Manager"), this); @@ -536,11 +536,11 @@ void MainMenu::init() m_menuView = new QMenu(tr("&View")); connect(m_menuView, &QMenu::aboutToShow, this, &MainMenu::aboutToShowViewMenu); - QMenu* toolbarsMenu = new QMenu(tr("Toolbars")); + auto* toolbarsMenu = new QMenu(tr("Toolbars")); connect(toolbarsMenu, &QMenu::aboutToShow, this, &MainMenu::aboutToShowToolbarsMenu); - QMenu* sidebarMenu = new QMenu(tr("Sidebar")); + auto* sidebarMenu = new QMenu(tr("Sidebar")); connect(sidebarMenu, &QMenu::aboutToShow, this, &MainMenu::aboutToShowSidebarsMenu); - QMenu* encodingMenu = new QMenu(tr("Character &Encoding")); + auto* encodingMenu = new QMenu(tr("Character &Encoding")); connect(encodingMenu, &QMenu::aboutToShow, this, &MainMenu::aboutToShowEncodingMenu); // Create menus to make shortcuts available even before first showing the menu diff --git a/src/lib/app/profilemanager.cpp b/src/lib/app/profilemanager.cpp index 7caa48875..ddb96221f 100644 --- a/src/lib/app/profilemanager.cpp +++ b/src/lib/app/profilemanager.cpp @@ -33,8 +33,7 @@ #include ProfileManager::ProfileManager() -{ -} += default; void ProfileManager::initConfigDir() { diff --git a/src/lib/app/proxystyle.cpp b/src/lib/app/proxystyle.cpp index 46772d508..57be02694 100644 --- a/src/lib/app/proxystyle.cpp +++ b/src/lib/app/proxystyle.cpp @@ -66,7 +66,7 @@ int ProxyStyle::pixelMetric(PixelMetric metric, const QStyleOption* option, cons void ProxyStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const { if (element == PE_FrameTabBarBase) { - TabBarHelper *tabBar = qobject_cast(option->styleObject); + auto *tabBar = qobject_cast(option->styleObject); if (tabBar && tabBar->baseColor().isValid()) { painter->setPen(QPen(tabBar->baseColor(), 0)); painter->drawLine(option->rect.topLeft(), option->rect.topRight()); diff --git a/src/lib/autofill/autofill.cpp b/src/lib/autofill/autofill.cpp index 470295dc1..8c54356e6 100644 --- a/src/lib/autofill/autofill.cpp +++ b/src/lib/autofill/autofill.cpp @@ -210,7 +210,7 @@ void AutoFill::saveForm(WebPage *page, const QUrl &frameUrl, const PageFormData m_lastNotification->close(); } - AutoFillNotification* aWidget = new AutoFillNotification(frameUrl, formData, updateData); + auto* aWidget = new AutoFillNotification(frameUrl, formData, updateData); page->view()->addNotification(aWidget); m_lastNotification = aWidget; diff --git a/src/lib/autofill/autofillicon.cpp b/src/lib/autofill/autofillicon.cpp index d688a78a5..1883a5181 100644 --- a/src/lib/autofill/autofillicon.cpp +++ b/src/lib/autofill/autofillicon.cpp @@ -48,7 +48,7 @@ void AutoFillIcon::iconClicked() return; } - AutoFillWidget* widget = new AutoFillWidget(m_view, this); + auto* widget = new AutoFillWidget(m_view, this); widget->setUsernames(m_usernames); widget->showAt(parentWidget()); } diff --git a/src/lib/autofill/autofillwidget.cpp b/src/lib/autofill/autofillwidget.cpp index 6f6d35936..034b0875b 100644 --- a/src/lib/autofill/autofillwidget.cpp +++ b/src/lib/autofill/autofillwidget.cpp @@ -42,7 +42,7 @@ void AutoFillWidget::setUsernames(const QStringList &usernames) continue; } - QPushButton* button = new QPushButton(this); + auto* button = new QPushButton(this); button->setIcon(QIcon(QSL(":icons/other/login.png"))); button->setStyleSheet(QSL("text-align:left;font-weight:bold;")); button->setText(username); diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp index 6b2719497..aca6fea1b 100644 --- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp +++ b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp @@ -44,8 +44,7 @@ DatabaseEncryptedPasswordBackend::DatabaseEncryptedPasswordBackend() } DatabaseEncryptedPasswordBackend::~DatabaseEncryptedPasswordBackend() -{ -} += default; QStringList DatabaseEncryptedPasswordBackend::getUsernames(const QUrl &url) { @@ -265,7 +264,7 @@ bool DatabaseEncryptedPasswordBackend::hasSettings() const void DatabaseEncryptedPasswordBackend::showSettings(QWidget* parent) { - MasterPasswordDialog* masterPasswordDialog = new MasterPasswordDialog(this, parent); + auto* masterPasswordDialog = new MasterPasswordDialog(this, parent); masterPasswordDialog->showSettingPage(); } @@ -295,7 +294,7 @@ bool DatabaseEncryptedPasswordBackend::hasPermission() m_askPasswordDialogVisible = true; - AskMasterPassword* dialog = new AskMasterPassword(this); + auto* dialog = new AskMasterPassword(this); bool authorized = dialog->exec() == QDialog::Accepted; @@ -349,7 +348,7 @@ bool DatabaseEncryptedPasswordBackend::encryptPasswordEntry(PasswordEntry &entry void DatabaseEncryptedPasswordBackend::showMasterPasswordDialog() { - MasterPasswordDialog* masterPasswordDialog = new MasterPasswordDialog(this, mApp->getWindow()); + auto* masterPasswordDialog = new MasterPasswordDialog(this, mApp->getWindow()); masterPasswordDialog->showSetMasterPasswordPage(); masterPasswordDialog->delayedExec(); } @@ -669,8 +668,8 @@ AskMasterPassword::AskMasterPassword(DatabaseEncryptedPasswordBackend* backend, setWindowModality(Qt::ApplicationModal); setWindowTitle(AutoFill::tr("Enter Master Password")); - QVBoxLayout* verticalLayout = new QVBoxLayout(this); - QLabel* label = new QLabel(this); + auto* verticalLayout = new QVBoxLayout(this); + auto* label = new QLabel(this); label->setText(AutoFill::tr("Permission is required, please enter Master Password:")); m_lineEdit = new QLineEdit(this); m_lineEdit->setEchoMode(QLineEdit::Password); diff --git a/src/lib/autofill/passwordbackends/passwordbackend.h b/src/lib/autofill/passwordbackends/passwordbackend.h index 6fceb1e79..46203d57f 100644 --- a/src/lib/autofill/passwordbackends/passwordbackend.h +++ b/src/lib/autofill/passwordbackends/passwordbackend.h @@ -27,7 +27,7 @@ class FALKON_EXPORT PasswordBackend { public: explicit PasswordBackend(); - virtual ~PasswordBackend() { } + virtual ~PasswordBackend() = default; virtual QString name() const = 0; diff --git a/src/lib/bookmarks/bookmarkitem.cpp b/src/lib/bookmarks/bookmarkitem.cpp index 30ab227f3..47abd0b72 100644 --- a/src/lib/bookmarks/bookmarkitem.cpp +++ b/src/lib/bookmarks/bookmarkitem.cpp @@ -85,7 +85,7 @@ QIcon BookmarkItem::icon() case Folder: return IconProvider::standardIcon(QStyle::SP_DirIcon); default: - return QIcon(); + return {}; } } diff --git a/src/lib/bookmarks/bookmarks.cpp b/src/lib/bookmarks/bookmarks.cpp index 3b75f8117..be392381e 100644 --- a/src/lib/bookmarks/bookmarks.cpp +++ b/src/lib/bookmarks/bookmarks.cpp @@ -330,7 +330,7 @@ void Bookmarks::readBookmarks(const QVariantList &list, BookmarkItem* parent) continue; } - BookmarkItem* item = new BookmarkItem(type, parent); + auto* item = new BookmarkItem(type, parent); switch (type) { case BookmarkItem::Url: diff --git a/src/lib/bookmarks/bookmarksexport/bookmarksexporter.cpp b/src/lib/bookmarks/bookmarksexport/bookmarksexporter.cpp index 7e6746303..d6094151f 100644 --- a/src/lib/bookmarks/bookmarksexport/bookmarksexporter.cpp +++ b/src/lib/bookmarks/bookmarksexport/bookmarksexporter.cpp @@ -23,8 +23,7 @@ BookmarksExporter::BookmarksExporter(QObject* parent) } BookmarksExporter::~BookmarksExporter() -{ -} += default; bool BookmarksExporter::error() const { diff --git a/src/lib/bookmarks/bookmarksexport/htmlexporter.cpp b/src/lib/bookmarks/bookmarksexport/htmlexporter.cpp index 93287b831..92866d621 100644 --- a/src/lib/bookmarks/bookmarksexport/htmlexporter.cpp +++ b/src/lib/bookmarks/bookmarksexport/htmlexporter.cpp @@ -55,7 +55,7 @@ bool HtmlExporter::exportBookmarks(BookmarkItem* root) stream << "" << endl; - stream << "" << endl; + stream << R"()" << endl; stream << "Bookmarks" << endl; stream << "

Bookmarks

" << endl; diff --git a/src/lib/bookmarks/bookmarksicon.cpp b/src/lib/bookmarks/bookmarksicon.cpp index 649a470be..716609975 100644 --- a/src/lib/bookmarks/bookmarksicon.cpp +++ b/src/lib/bookmarks/bookmarksicon.cpp @@ -88,7 +88,7 @@ void BookmarksIcon::iconClicked() return; } - BookmarksWidget* widget = new BookmarksWidget(m_view, m_bookmark, parentWidget()); + auto* widget = new BookmarksWidget(m_view, m_bookmark, parentWidget()); widget->showAt(parentWidget()); } diff --git a/src/lib/bookmarks/bookmarksimport/bookmarksimporter.cpp b/src/lib/bookmarks/bookmarksimport/bookmarksimporter.cpp index f2754edbe..0410c5c48 100644 --- a/src/lib/bookmarks/bookmarksimport/bookmarksimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/bookmarksimporter.cpp @@ -23,8 +23,7 @@ BookmarksImporter::BookmarksImporter(QObject* parent) } BookmarksImporter::~BookmarksImporter() -{ -} += default; bool BookmarksImporter::error() const { diff --git a/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp b/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp index 17ac6a615..c4183ac38 100644 --- a/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp @@ -79,18 +79,18 @@ BookmarkItem* ChromeImporter::importBookmarks() QVariantMap rootMap = res.toMap().value(QSL("roots")).toMap(); - BookmarkItem* root = new BookmarkItem(BookmarkItem::Folder); + auto* root = new BookmarkItem(BookmarkItem::Folder); root->setTitle(QSL("Chrome Import")); - BookmarkItem* toolbar = new BookmarkItem(BookmarkItem::Folder, root); + auto* toolbar = new BookmarkItem(BookmarkItem::Folder, root); toolbar->setTitle(rootMap.value(QSL("bookmark_bar")).toMap().value(QSL("name")).toString()); readBookmarks(rootMap.value(QSL("bookmark_bar")).toMap().value(QSL("children")).toList(), toolbar); - BookmarkItem* other = new BookmarkItem(BookmarkItem::Folder, root); + auto* other = new BookmarkItem(BookmarkItem::Folder, root); other->setTitle(rootMap.value(QSL("other")).toMap().value(QSL("name")).toString()); readBookmarks(rootMap.value(QSL("other")).toMap().value(QSL("children")).toList(), other); - BookmarkItem* synced = new BookmarkItem(BookmarkItem::Folder, root); + auto* synced = new BookmarkItem(BookmarkItem::Folder, root); synced->setTitle(rootMap.value(QSL("synced")).toMap().value(QSL("name")).toString()); readBookmarks(rootMap.value(QSL("synced")).toMap().value(QSL("synced")).toList(), other); @@ -116,7 +116,7 @@ void ChromeImporter::readBookmarks(const QVariantList &list, BookmarkItem* paren continue; } - BookmarkItem* item = new BookmarkItem(type, parent); + auto* item = new BookmarkItem(type, parent); item->setTitle(map.value(QSL("name")).toString()); if (item->isUrl()) { diff --git a/src/lib/bookmarks/bookmarksimport/firefoximporter.cpp b/src/lib/bookmarks/bookmarksimport/firefoximporter.cpp index 435157477..c5b8c9b26 100644 --- a/src/lib/bookmarks/bookmarksimport/firefoximporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/firefoximporter.cpp @@ -85,7 +85,7 @@ BookmarkItem* FirefoxImporter::importBookmarks() { QList items; - BookmarkItem* root = new BookmarkItem(BookmarkItem::Folder); + auto* root = new BookmarkItem(BookmarkItem::Folder); root->setTitle(QStringLiteral("Firefox Import")); QSqlQuery query(QSqlDatabase::database(CONNECTION)); @@ -128,7 +128,7 @@ BookmarkItem* FirefoxImporter::importBookmarks() for (const Item &item : qAsConst(items)) { BookmarkItem* parent = hash.value(item.parent); - BookmarkItem* bookmark = new BookmarkItem(item.type, parent ? parent : root); + auto* bookmark = new BookmarkItem(item.type, parent ? parent : root); bookmark->setTitle(item.title.isEmpty() ? item.url.toString() : item.title); bookmark->setUrl(item.url); diff --git a/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp b/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp index 4d161430b..b92cbc74f 100644 --- a/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp @@ -94,7 +94,7 @@ BookmarkItem* HtmlImporter::importBookmarks() bookmarks = bookmarks.left(bookmarks.lastIndexOf(QLatin1String("

"))); int start = bookmarks.indexOf(QLatin1String("

")); - BookmarkItem* root = new BookmarkItem(BookmarkItem::Folder); + auto* root = new BookmarkItem(BookmarkItem::Folder); root->setTitle(QStringLiteral("HTML Import")); QList folders; @@ -118,7 +118,7 @@ BookmarkItem* HtmlImporter::importBookmarks() QRegularExpressionMatch match = rx.match(string); QString folderName = match.captured(2).trimmed(); - BookmarkItem* folder = new BookmarkItem(BookmarkItem::Folder, folders.isEmpty() ? root : folders.last()); + auto* folder = new BookmarkItem(BookmarkItem::Folder, folders.isEmpty() ? root : folders.last()); folder->setTitle(folderName); folders.append(folder); @@ -150,7 +150,7 @@ BookmarkItem* HtmlImporter::importBookmarks() if (url.isEmpty() || url.scheme() == QL1S("place") || url.scheme() == QL1S("about")) continue; - BookmarkItem* b = new BookmarkItem(BookmarkItem::Url, folders.isEmpty() ? root : folders.last()); + auto* b = new BookmarkItem(BookmarkItem::Url, folders.isEmpty() ? root : folders.last()); b->setTitle(linkName.isEmpty() ? url.toString() : linkName); b->setUrl(url); } diff --git a/src/lib/bookmarks/bookmarksimport/ieimporter.cpp b/src/lib/bookmarks/bookmarksimport/ieimporter.cpp index 43d67c1c2..7ddbfd76b 100644 --- a/src/lib/bookmarks/bookmarksimport/ieimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/ieimporter.cpp @@ -58,7 +58,7 @@ bool IeImporter::prepareImport() BookmarkItem* IeImporter::importBookmarks() { - BookmarkItem* root = new BookmarkItem(BookmarkItem::Folder); + auto* root = new BookmarkItem(BookmarkItem::Folder); root->setTitle(QStringLiteral("Internet Explorer Import")); readDir(QDir(m_path), root); @@ -70,7 +70,7 @@ void IeImporter::readDir(const QDir &dir, BookmarkItem *parent) const auto files = dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); for (const QFileInfo &file : files) { if (file.isDir()) { - BookmarkItem* folder = new BookmarkItem(BookmarkItem::Folder, parent); + auto* folder = new BookmarkItem(BookmarkItem::Folder, parent); folder->setTitle(file.baseName()); QDir folderDir = dir; @@ -81,7 +81,7 @@ void IeImporter::readDir(const QDir &dir, BookmarkItem *parent) QSettings urlFile(file.absoluteFilePath(), QSettings::IniFormat); const QUrl url = urlFile.value(QStringLiteral("InternetShortcut/URL")).toUrl(); - BookmarkItem* item = new BookmarkItem(BookmarkItem::Url, parent); + auto* item = new BookmarkItem(BookmarkItem::Url, parent); item->setTitle(file.baseName()); item->setUrl(url); } diff --git a/src/lib/bookmarks/bookmarksimport/operaimporter.cpp b/src/lib/bookmarks/bookmarksimport/operaimporter.cpp index 3d744030e..ab006b67e 100644 --- a/src/lib/bookmarks/bookmarksimport/operaimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/operaimporter.cpp @@ -76,7 +76,7 @@ bool OperaImporter::prepareImport() BookmarkItem* OperaImporter::importBookmarks() { - BookmarkItem* root = new BookmarkItem(BookmarkItem::Folder); + auto* root = new BookmarkItem(BookmarkItem::Folder); root->setTitle(QSL("Opera Import")); QList folders; diff --git a/src/lib/bookmarks/bookmarksmanager.cpp b/src/lib/bookmarks/bookmarksmanager.cpp index a04860872..86692ec1e 100644 --- a/src/lib/bookmarks/bookmarksmanager.cpp +++ b/src/lib/bookmarks/bookmarksmanager.cpp @@ -173,7 +173,7 @@ void BookmarksManager::openBookmarkInNewPrivateWindow(BookmarkItem* item) void BookmarksManager::addBookmark() { - BookmarkItem* item = new BookmarkItem(BookmarkItem::Url); + auto* item = new BookmarkItem(BookmarkItem::Url); item->setTitle(tr("New Bookmark")); item->setUrl(QUrl(QSL("http://"))); addBookmark(item); @@ -181,14 +181,14 @@ void BookmarksManager::addBookmark() void BookmarksManager::addFolder() { - BookmarkItem* item = new BookmarkItem(BookmarkItem::Folder); + auto* item = new BookmarkItem(BookmarkItem::Folder); item->setTitle(tr("New Folder")); addBookmark(item); } void BookmarksManager::addSeparator() { - BookmarkItem* item = new BookmarkItem(BookmarkItem::Separator); + auto* item = new BookmarkItem(BookmarkItem::Separator); addBookmark(item); } @@ -267,7 +267,7 @@ void BookmarksManager::updateEditBox(BookmarkItem* item) ui->keyword->setVisible(showAddressAndKeyword); // Without removing widgets from layout, there is unwanted extra spacing - QFormLayout* l = static_cast(ui->editBox->layout()); + auto* l = static_cast(ui->editBox->layout()); if (showAddressAndKeyword) { // Show Address + Keyword diff --git a/src/lib/bookmarks/bookmarksmenu.cpp b/src/lib/bookmarks/bookmarksmenu.cpp index 8b096c34a..8fd48c7bf 100644 --- a/src/lib/bookmarks/bookmarksmenu.cpp +++ b/src/lib/bookmarks/bookmarksmenu.cpp @@ -102,7 +102,7 @@ void BookmarksMenu::menuMiddleClicked(Menu* menu) void BookmarksMenu::bookmarkActivated() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { BookmarkItem* item = static_cast(action->data().value()); Q_ASSERT(item); openBookmark(item); @@ -111,7 +111,7 @@ void BookmarksMenu::bookmarkActivated() void BookmarksMenu::bookmarkCtrlActivated() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { BookmarkItem* item = static_cast(action->data().value()); Q_ASSERT(item); openBookmarkInNewTab(item); @@ -120,7 +120,7 @@ void BookmarksMenu::bookmarkCtrlActivated() void BookmarksMenu::bookmarkShiftActivated() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { BookmarkItem* item = static_cast(action->data().value()); Q_ASSERT(item); openBookmarkInNewWindow(item); diff --git a/src/lib/bookmarks/bookmarksmodel.cpp b/src/lib/bookmarks/bookmarksmodel.cpp index 6b67d9b59..f9a664374 100644 --- a/src/lib/bookmarks/bookmarksmodel.cpp +++ b/src/lib/bookmarks/bookmarksmodel.cpp @@ -94,7 +94,7 @@ QVariant BookmarksModel::data(const QModelIndex &index, int role) const BookmarkItem* itm = item(index); if (!itm) { - return QVariant(); + return {}; } switch (role) { @@ -128,15 +128,15 @@ QVariant BookmarksModel::data(const QModelIndex &index, int role) const case 1: return itm->url().toEncoded(); default: - return QVariant(); + return {}; } case Qt::DecorationRole: if (index.column() == 0) { return itm->icon(); } - return QVariant(); + return {}; default: - return QVariant(); + return {}; } } @@ -195,7 +195,7 @@ QStringList BookmarksModel::mimeTypes() const QMimeData* BookmarksModel::mimeData(const QModelIndexList &indexes) const { - QMimeData* mimeData = new QMimeData(); + auto* mimeData = new QMimeData(); QByteArray encodedData; QDataStream stream(&encodedData, QIODevice::WriteOnly); @@ -269,7 +269,7 @@ bool BookmarksModel::dropMimeData(const QMimeData* data, Qt::DropAction action, QModelIndex BookmarksModel::parent(const QModelIndex &child) const { if (!child.isValid()) { - return QModelIndex(); + return {}; } BookmarkItem* itm = item(child); @@ -279,7 +279,7 @@ QModelIndex BookmarksModel::parent(const QModelIndex &child) const QModelIndex BookmarksModel::index(int row, int column, const QModelIndex &parent) const { if (!hasIndex(row, column, parent)) { - return QModelIndex(); + return {}; } BookmarkItem* parentItem = item(parent); @@ -291,7 +291,7 @@ QModelIndex BookmarksModel::index(BookmarkItem* item, int column) const BookmarkItem* parent = item->parent(); if (!parent) { - return QModelIndex(); + return {}; } return createIndex(parent->children().indexOf(item), column, item); @@ -299,7 +299,7 @@ QModelIndex BookmarksModel::index(BookmarkItem* item, int column) const BookmarkItem* BookmarksModel::item(const QModelIndex &index) const { - BookmarkItem* itm = static_cast(index.internalPointer()); + auto* itm = static_cast(index.internalPointer()); return itm ? itm : m_root; } diff --git a/src/lib/bookmarks/bookmarkstoolbar.cpp b/src/lib/bookmarks/bookmarkstoolbar.cpp index da187fb6b..fab653214 100644 --- a/src/lib/bookmarks/bookmarkstoolbar.cpp +++ b/src/lib/bookmarks/bookmarkstoolbar.cpp @@ -138,7 +138,7 @@ void BookmarksToolbar::showOnlyIconsChanged(bool state) } for (int i = 0; i < m_layout->count(); ++i) { - BookmarksToolbarButton* b = qobject_cast(m_layout->itemAt(i)->widget()); + auto* b = qobject_cast(m_layout->itemAt(i)->widget()); if (b) { b->setShowOnlyIcon(state); } @@ -152,7 +152,7 @@ void BookmarksToolbar::showOnlyTextChanged(bool state) } for (int i = 0; i < m_layout->count(); ++i) { - BookmarksToolbarButton* b = qobject_cast(m_layout->itemAt(i)->widget()); + auto* b = qobject_cast(m_layout->itemAt(i)->widget()); if (b) { b->setShowOnlyText(state); } @@ -231,7 +231,7 @@ void BookmarksToolbar::addItem(BookmarkItem* item) { Q_ASSERT(item); - BookmarksToolbarButton* button = new BookmarksToolbarButton(item, this); + auto* button = new BookmarksToolbarButton(item, this); button->setMainWindow(m_window); button->setShowOnlyIcon(m_bookmarks->showOnlyIconsInToolbar()); button->setShowOnlyText(m_bookmarks->showOnlyTextInToolbar()); @@ -266,7 +266,7 @@ void BookmarksToolbar::dropEvent(QDropEvent* e) BookmarkItem* bookmark = nullptr; if (mime->hasFormat(BookmarksButtonMimeData::mimeType())) { - const BookmarksButtonMimeData* bookmarkMime = static_cast(mime); + const auto* bookmarkMime = static_cast(mime); bookmark = bookmarkMime->item(); const int initialIndex = bookmark->parent()->children().indexOf(bookmark); BookmarksToolbarButton* current = buttonAt(m_dropPos); diff --git a/src/lib/bookmarks/bookmarkstoolbarbutton.cpp b/src/lib/bookmarks/bookmarkstoolbarbutton.cpp index db103f619..96ae89838 100644 --- a/src/lib/bookmarks/bookmarkstoolbarbutton.cpp +++ b/src/lib/bookmarks/bookmarkstoolbarbutton.cpp @@ -159,7 +159,7 @@ void BookmarksToolbarButton::menuMiddleClicked(Menu* menu) void BookmarksToolbarButton::bookmarkActivated(BookmarkItem* item) { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { item = static_cast(action->data().value()); } @@ -169,7 +169,7 @@ void BookmarksToolbarButton::bookmarkActivated(BookmarkItem* item) void BookmarksToolbarButton::bookmarkCtrlActivated(BookmarkItem* item) { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { item = static_cast(action->data().value()); } @@ -179,7 +179,7 @@ void BookmarksToolbarButton::bookmarkCtrlActivated(BookmarkItem* item) void BookmarksToolbarButton::bookmarkShiftActivated(BookmarkItem* item) { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { item = static_cast(action->data().value()); } @@ -318,8 +318,8 @@ void BookmarksToolbarButton::mouseMoveEvent(QMouseEvent *event) setDown(false); - QDrag *drag = new QDrag(this); - BookmarksButtonMimeData* mime = new BookmarksButtonMimeData; + auto *drag = new QDrag(this); + auto* mime = new BookmarksButtonMimeData; mime->setBookmarkItem(m_bookmark); drag->setMimeData(mime); drag->setPixmap(grab()); @@ -426,7 +426,7 @@ void BookmarksToolbarButton::dropEvent(QDropEvent *event) BookmarkItem* bookmark = nullptr; if (mime->hasFormat(BookmarksButtonMimeData::mimeType())) { - const BookmarksButtonMimeData* bookmarkMime = static_cast(mime); + const auto* bookmarkMime = static_cast(mime); bookmark = bookmarkMime->item(); } else { const QUrl url = mime->urls().at(0); diff --git a/src/lib/bookmarks/bookmarkstools.cpp b/src/lib/bookmarks/bookmarkstools.cpp index 2c14fe09d..4825d4cfd 100644 --- a/src/lib/bookmarks/bookmarkstools.cpp +++ b/src/lib/bookmarks/bookmarkstools.cpp @@ -52,7 +52,7 @@ BookmarkItem* BookmarksFoldersMenu::selectedFolder() const void BookmarksFoldersMenu::folderChoosed() { - if (QAction* act = qobject_cast(sender())) { + if (auto* act = qobject_cast(sender())) { BookmarkItem* folder = static_cast(act->data().value()); emit folderSelected(folder); } @@ -133,13 +133,13 @@ bool BookmarksTools::addBookmarkDialog(QWidget* parent, const QUrl &url, const Q return false; } - QDialog* dialog = new QDialog(parent); - QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, dialog); - QLabel* label = new QLabel(dialog); - QLineEdit* edit = new QLineEdit(dialog); - BookmarksFoldersButton* folderButton = new BookmarksFoldersButton(dialog, folder); + auto* dialog = new QDialog(parent); + auto* layout = new QBoxLayout(QBoxLayout::TopToBottom, dialog); + auto* label = new QLabel(dialog); + auto* edit = new QLineEdit(dialog); + auto* folderButton = new BookmarksFoldersButton(dialog, folder); - QDialogButtonBox* box = new QDialogButtonBox(dialog); + auto* box = new QDialogButtonBox(dialog); box->addButton(QDialogButtonBox::Ok); box->addButton(QDialogButtonBox::Cancel); QObject::connect(box, &QDialogButtonBox::rejected, dialog, &QDialog::reject); @@ -166,7 +166,7 @@ bool BookmarksTools::addBookmarkDialog(QWidget* parent, const QUrl &url, const Q return false; } - BookmarkItem* bookmark = new BookmarkItem(BookmarkItem::Url); + auto* bookmark = new BookmarkItem(BookmarkItem::Url); bookmark->setTitle(edit->text()); bookmark->setUrl(url); mApp->bookmarks()->addBookmark(folderButton->selectedFolder(), bookmark); @@ -179,12 +179,12 @@ bool BookmarksTools::bookmarkAllTabsDialog(QWidget* parent, TabWidget* tabWidget { Q_ASSERT(tabWidget); - QDialog* dialog = new QDialog(parent); - QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, dialog); - QLabel* label = new QLabel(dialog); - BookmarksFoldersButton* folderButton = new BookmarksFoldersButton(dialog, folder); + auto* dialog = new QDialog(parent); + auto* layout = new QBoxLayout(QBoxLayout::TopToBottom, dialog); + auto* label = new QLabel(dialog); + auto* folderButton = new BookmarksFoldersButton(dialog, folder); - QDialogButtonBox* box = new QDialogButtonBox(dialog); + auto* box = new QDialogButtonBox(dialog); box->addButton(QDialogButtonBox::Ok); box->addButton(QDialogButtonBox::Cancel); QObject::connect(box, &QDialogButtonBox::rejected, dialog, &QDialog::reject); @@ -209,7 +209,7 @@ bool BookmarksTools::bookmarkAllTabsDialog(QWidget* parent, TabWidget* tabWidget const auto allTabs = tabWidget->allTabs(false); for (WebTab* tab : allTabs) { if (!tab->url().isEmpty()) { - BookmarkItem* bookmark = new BookmarkItem(BookmarkItem::Url); + auto* bookmark = new BookmarkItem(BookmarkItem::Url); bookmark->setTitle(tab->title()); bookmark->setUrl(tab->url()); mApp->bookmarks()->addBookmark(folderButton->selectedFolder(), bookmark); @@ -222,15 +222,15 @@ bool BookmarksTools::bookmarkAllTabsDialog(QWidget* parent, TabWidget* tabWidget bool BookmarksTools::editBookmarkDialog(QWidget* parent, BookmarkItem *item) { - QDialog* dialog = new QDialog(parent); - QFormLayout* layout = new QFormLayout(dialog); + auto* dialog = new QDialog(parent); + auto* layout = new QFormLayout(dialog); - QLineEdit* title = new QLineEdit; - QLineEdit* address = new QLineEdit; - QLineEdit* keyword = new QLineEdit; - QPlainTextEdit* description = new QPlainTextEdit; + auto* title = new QLineEdit; + auto* address = new QLineEdit; + auto* keyword = new QLineEdit; + auto* description = new QPlainTextEdit; - QDialogButtonBox* box = new QDialogButtonBox(dialog); + auto* box = new QDialogButtonBox(dialog); box->addButton(QDialogButtonBox::Ok); box->addButton(QDialogButtonBox::Cancel); QObject::connect(box, &QDialogButtonBox::accepted, dialog, &QDialog::accept); @@ -403,7 +403,7 @@ void BookmarksTools::addUrlToMenu(QObject* receiver, Menu* menu, BookmarkItem* b Q_ASSERT(bookmark); Q_ASSERT(bookmark->isUrl()); - Action* act = new Action(menu); + auto* act = new Action(menu); QString title = QFontMetrics(act->font()).elidedText(bookmark->title(), Qt::ElideRight, 250); act->setText(title); act->setData(QVariant::fromValue(static_cast(bookmark))); @@ -463,7 +463,7 @@ bool BookmarksTools::migrateBookmarksIfNecessary(Bookmarks* bookmarks) bool subfolder = query.value(1).toString() == QLatin1String("yes"); BookmarkItem* parent = subfolder ? bookmarks->toolbarFolder() : bookmarks->unsortedFolder(); - BookmarkItem* folder = new BookmarkItem(BookmarkItem::Folder, parent); + auto* folder = new BookmarkItem(BookmarkItem::Folder, parent); folder->setTitle(title); folders.insert(folder->title(), folder); } @@ -480,7 +480,7 @@ bool BookmarksTools::migrateBookmarksIfNecessary(Bookmarks* bookmarks) } Q_ASSERT(parent); - BookmarkItem* bookmark = new BookmarkItem(BookmarkItem::Url, parent); + auto* bookmark = new BookmarkItem(BookmarkItem::Url, parent); bookmark->setTitle(title); bookmark->setUrl(url); } diff --git a/src/lib/bookmarks/bookmarkswidget.cpp b/src/lib/bookmarks/bookmarkswidget.cpp index 44f6433b6..a71e7d97a 100644 --- a/src/lib/bookmarks/bookmarkswidget.cpp +++ b/src/lib/bookmarks/bookmarkswidget.cpp @@ -79,7 +79,7 @@ void BookmarksWidget::toggleBookmark() } else { // Save bookmark - BookmarkItem* bookmark = new BookmarkItem(BookmarkItem::Url); + auto* bookmark = new BookmarkItem(BookmarkItem::Url); bookmark->setTitle(m_view->title()); bookmark->setUrl(m_view->url()); m_bookmarks->addBookmark(ui->folderButton->selectedFolder(), bookmark); diff --git a/src/lib/cookies/cookiemanager.cpp b/src/lib/cookies/cookiemanager.cpp index df8dc6523..a4278615c 100644 --- a/src/lib/cookies/cookiemanager.cpp +++ b/src/lib/cookies/cookiemanager.cpp @@ -84,7 +84,7 @@ CookieManager::CookieManager(QWidget *parent) ui->whiteList->sortItems(Qt::AscendingOrder); ui->blackList->sortItems(Qt::AscendingOrder); - QShortcut* removeShortcut = new QShortcut(QKeySequence("Del"), this); + auto* removeShortcut = new QShortcut(QKeySequence("Del"), this); connect(removeShortcut, &QShortcut::activated, this, &CookieManager::deletePressed); connect(ui->search, &QLineEdit::textChanged, this, &CookieManager::filterString); @@ -291,7 +291,7 @@ void CookieManager::addCookie(const QNetworkCookie &cookie) item = new QTreeWidgetItem(findParent); } else { - QTreeWidgetItem* newParent = new QTreeWidgetItem(ui->cookieTree); + auto* newParent = new QTreeWidgetItem(ui->cookieTree); newParent->setText(0, domain); newParent->setIcon(0, IconProvider::standardIcon(QStyle::SP_DirIcon)); newParent->setData(0, Qt::UserRole + 10, cookie.domain()); diff --git a/src/lib/downloads/downloadmanager.cpp b/src/lib/downloads/downloadmanager.cpp index 0e0bc1fbb..b870ef63d 100644 --- a/src/lib/downloads/downloadmanager.cpp +++ b/src/lib/downloads/downloadmanager.cpp @@ -67,7 +67,7 @@ DownloadManager::DownloadManager(QWidget* parent) connect(ui->clearButton, &QAbstractButton::clicked, this, &DownloadManager::clearList); - QShortcut* clearShortcut = new QShortcut(QKeySequence("CTRL+L"), this); + auto* clearShortcut = new QShortcut(QKeySequence("CTRL+L"), this); connect(clearShortcut, &QShortcut::activated, this, &DownloadManager::clearList); loadSettings(); @@ -140,11 +140,11 @@ void DownloadManager::closeDownloadTab(QWebEngineDownloadItem *item) const if (!item->page()) { return; } - WebPage *page = qobject_cast(item->page()); + auto *page = qobject_cast(item->page()); if (!page) { return; } - TabbedWebView *view = qobject_cast(page->view()); + auto *view = qobject_cast(page->view()); if (!view) { return; } @@ -192,7 +192,7 @@ void DownloadManager::timerEvent(QTimerEvent* e) return; } for (int i = 0; i < ui->list->count(); i++) { - DownloadItem* downItem = qobject_cast(ui->list->itemWidget(ui->list->item(i))); + auto* downItem = qobject_cast(ui->list->itemWidget(ui->list->item(i))); if (!downItem || downItem->isCancelled() || !downItem->isDownloading()) { continue; } @@ -241,7 +241,7 @@ void DownloadManager::clearList() { QList items; for (int i = 0; i < ui->list->count(); i++) { - DownloadItem* downItem = qobject_cast(ui->list->itemWidget(ui->list->item(i))); + auto* downItem = qobject_cast(ui->list->itemWidget(ui->list->item(i))); if (!downItem) { continue; } @@ -361,8 +361,8 @@ void DownloadManager::download(QWebEngineDownloadItem *downloadItem) downloadItem->accept(); // Create download item - QListWidgetItem* listItem = new QListWidgetItem(ui->list); - DownloadItem* downItem = new DownloadItem(listItem, downloadItem, QFileInfo(downloadPath).absolutePath(), QFileInfo(downloadPath).fileName(), openFile, this); + auto* listItem = new QListWidgetItem(ui->list); + auto* downItem = new DownloadItem(listItem, downloadItem, QFileInfo(downloadPath).absolutePath(), QFileInfo(downloadPath).fileName(), openFile, this); downItem->setDownTimer(downloadTimer); downItem->startDownloading(); connect(downItem, &DownloadItem::deleteItem, this, &DownloadManager::deleteItem); @@ -390,7 +390,7 @@ void DownloadManager::downloadFinished(bool success) m_activeDownloadsCount = 0; bool downloadingAllFilesFinished = true; for (int i = 0; i < ui->list->count(); i++) { - DownloadItem* downItem = qobject_cast(ui->list->itemWidget(ui->list->item(i))); + auto* downItem = qobject_cast(ui->list->itemWidget(ui->list->item(i))); if (!downItem) { continue; } @@ -439,7 +439,7 @@ bool DownloadManager::canClose() bool isDownloading = false; for (int i = 0; i < ui->list->count(); i++) { - DownloadItem* downItem = qobject_cast(ui->list->itemWidget(ui->list->item(i))); + auto* downItem = qobject_cast(ui->list->itemWidget(ui->list->item(i))); if (!downItem) { continue; } diff --git a/src/lib/history/history.cpp b/src/lib/history/history.cpp index 1bc528d0c..09fae8fd5 100644 --- a/src/lib/history/history.cpp +++ b/src/lib/history/history.cpp @@ -294,7 +294,7 @@ QString History::titleCaseLocalizedMonth(int month) return tr("December"); default: qWarning("Month number out of range!"); - return QString(); + return {}; } } diff --git a/src/lib/history/history.h b/src/lib/history/history.h index c40fd75ba..e195a0bb9 100644 --- a/src/lib/history/history.h +++ b/src/lib/history/history.h @@ -82,7 +82,7 @@ private: HistoryModel* m_model; }; -typedef History::HistoryEntry HistoryEntry; +using HistoryEntry = History::HistoryEntry; // Hint to QVector to use std::realloc on item moving Q_DECLARE_TYPEINFO(HistoryEntry, Q_MOVABLE_TYPE); diff --git a/src/lib/history/historymenu.cpp b/src/lib/history/historymenu.cpp index d6dabc7bd..0702bce8a 100644 --- a/src/lib/history/historymenu.cpp +++ b/src/lib/history/historymenu.cpp @@ -98,7 +98,7 @@ void HistoryMenu::aboutToShow() const QUrl url = query.value(1).toUrl(); const QString title = QzTools::truncatedText(query.value(0).toString(), 40); - Action* act = new Action(title); + auto* act = new Action(title); act->setData(url); act->setIcon(IconProvider::iconForUrl(url)); connect(act, &QAction::triggered, this, &HistoryMenu::historyEntryActivated); @@ -122,7 +122,7 @@ void HistoryMenu::aboutToShowMostVisited() const QVector mostVisited = mApp->history()->mostVisited(10); for (const HistoryEntry &entry : mostVisited) { - Action* act = new Action(QzTools::truncatedText(entry.title, 40)); + auto* act = new Action(QzTools::truncatedText(entry.title, 40)); act->setData(entry.url); act->setIcon(IconProvider::iconForUrl(entry.url)); connect(act, &QAction::triggered, this, &HistoryMenu::historyEntryActivated); @@ -193,21 +193,21 @@ void HistoryMenu::aboutToShowClosedWindows() void HistoryMenu::historyEntryActivated() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { openUrl(action->data().toUrl()); } } void HistoryMenu::historyEntryCtrlActivated() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { openUrlInNewTab(action->data().toUrl()); } } void HistoryMenu::historyEntryShiftActivated() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { openUrlInNewWindow(action->data().toUrl()); } } diff --git a/src/lib/history/historymodel.cpp b/src/lib/history/historymodel.cpp index 45b87e83c..12328c881 100644 --- a/src/lib/history/historymodel.cpp +++ b/src/lib/history/historymodel.cpp @@ -71,7 +71,7 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const HistoryItem* item = itemFromIndex(index); if (index.row() < 0 || !item) { - return QVariant(); + return {}; } if (item->isTopLevel()) { @@ -89,7 +89,7 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const return index.column() == 0 ? QIcon::fromTheme(QSL("view-calendar"), QIcon(":/icons/menu/history_entry.svg")) : QVariant(); } - return QVariant(); + return {}; } const HistoryEntry entry = item->historyEntry; @@ -135,7 +135,7 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const } } - return QVariant(); + return {}; } bool HistoryModel::setData(const QModelIndex &index, const QVariant &value, int role) @@ -158,7 +158,7 @@ bool HistoryModel::setData(const QModelIndex &index, const QVariant &value, int QModelIndex HistoryModel::index(int row, int column, const QModelIndex &parent) const { if (!hasIndex(row, column, parent)) { - return QModelIndex(); + return {}; } HistoryItem* parentItem = itemFromIndex(parent); @@ -170,14 +170,14 @@ QModelIndex HistoryModel::index(int row, int column, const QModelIndex &parent) QModelIndex HistoryModel::parent(const QModelIndex &index) const { if (!index.isValid()) { - return QModelIndex(); + return {}; } HistoryItem* childItem = itemFromIndex(index); HistoryItem* parentItem = childItem->parent(); if (!parentItem || parentItem == m_rootItem) { - return QModelIndex(); + return {}; } return createIndex(parentItem->row(), 0, parentItem); @@ -224,7 +224,7 @@ bool HistoryModel::hasChildren(const QModelIndex &parent) const HistoryItem* HistoryModel::itemFromIndex(const QModelIndex &index) const { if (index.isValid()) { - HistoryItem* item = static_cast(index.internalPointer()); + auto* item = static_cast(index.internalPointer()); if (item) { return item; @@ -322,7 +322,7 @@ void HistoryModel::fetchMore(const QModelIndex &parent) beginInsertRows(parent, 0, list.size() - 1); for (const HistoryEntry &entry : qAsConst(list)) { - HistoryItem* newItem = new HistoryItem(parentItem); + auto* newItem = new HistoryItem(parentItem); newItem->historyEntry = entry; } @@ -346,7 +346,7 @@ void HistoryModel::historyEntryAdded(const HistoryEntry &entry) beginInsertRows(createIndex(0, 0, m_todayItem), 0, 0); - HistoryItem* item = new HistoryItem(); + auto* item = new HistoryItem(); item->historyEntry = entry; m_todayItem->prependChild(item); @@ -496,7 +496,7 @@ void HistoryModel::init() query.exec(); if (query.next()) { - HistoryItem* item = new HistoryItem(m_rootItem); + auto* item = new HistoryItem(m_rootItem); item->setStartTimestamp(timestamp == currentTimestamp ? -1 : timestamp); item->setEndTimestamp(endTimestamp); item->title = itemName; diff --git a/src/lib/history/historytreeview.cpp b/src/lib/history/historytreeview.cpp index 5e94e8887..d26f24207 100644 --- a/src/lib/history/historytreeview.cpp +++ b/src/lib/history/historytreeview.cpp @@ -82,7 +82,7 @@ QUrl HistoryTreeView::selectedUrl() const const QList indexes = selectionModel()->selectedRows(); if (indexes.count() != 1) - return QUrl(); + return {}; // TopLevelItems have invalid (empty) UrlRole data return indexes.at(0).data(HistoryModel::UrlRole).toUrl(); diff --git a/src/lib/navigation/completer/locationcompleter.cpp b/src/lib/navigation/completer/locationcompleter.cpp index ed0452376..7d4b71db4 100644 --- a/src/lib/navigation/completer/locationcompleter.cpp +++ b/src/lib/navigation/completer/locationcompleter.cpp @@ -81,7 +81,7 @@ void LocationCompleter::complete(const QString &string) emit cancelRefreshJob(); - LocationCompleterRefreshJob* job = new LocationCompleterRefreshJob(trimmedStr); + auto* job = new LocationCompleterRefreshJob(trimmedStr); connect(job, &LocationCompleterRefreshJob::finished, this, &LocationCompleter::refreshJobFinished); connect(this, SIGNAL(cancelRefreshJob()), job, SLOT(jobCancelled())); @@ -107,7 +107,7 @@ void LocationCompleter::complete(const QString &string) s_model->setData(index, trimmedStr, LocationCompleterModel::UrlRole); s_model->setData(index, m_locationBar->text(), LocationCompleterModel::SearchStringRole); } else { - QStandardItem *item = new QStandardItem(); + auto *item = new QStandardItem(); item->setText(trimmedStr); item->setData(trimmedStr, LocationCompleterModel::UrlRole); item->setData(m_locationBar->text(), LocationCompleterModel::SearchStringRole); @@ -132,7 +132,7 @@ void LocationCompleter::showMostVisited() void LocationCompleter::refreshJobFinished() { - LocationCompleterRefreshJob* job = qobject_cast(sender()); + auto* job = qobject_cast(sender()); Q_ASSERT(job); // Don't show results of older jobs @@ -190,7 +190,7 @@ void LocationCompleter::addSuggestions(const QStringList &suggestions) // Add new suggestions QList items; for (const QString &suggestion : suggestions) { - QStandardItem* item = new QStandardItem(); + auto* item = new QStandardItem(); item->setText(suggestion); item->setData(suggestion, LocationCompleterModel::TitleRole); item->setData(suggestion, LocationCompleterModel::UrlRole); @@ -378,7 +378,7 @@ void LocationCompleter::openSearchEnginesDialog() // Clear locationbar emit clearCompletion(); - SearchEnginesDialog *dialog = new SearchEnginesDialog(m_window); + auto *dialog = new SearchEnginesDialog(m_window); dialog->open(); } diff --git a/src/lib/navigation/completer/locationcompleterrefreshjob.cpp b/src/lib/navigation/completer/locationcompleterrefreshjob.cpp index f41b30372..af5be1931 100644 --- a/src/lib/navigation/completer/locationcompleterrefreshjob.cpp +++ b/src/lib/navigation/completer/locationcompleterrefreshjob.cpp @@ -130,7 +130,7 @@ void LocationCompleterRefreshJob::runJob() // Add search/visit item if (!m_searchString.isEmpty()) { - QStandardItem* item = new QStandardItem(); + auto* item = new QStandardItem(); item->setText(m_searchString); item->setData(m_searchString, LocationCompleterModel::UrlRole); item->setData(m_searchString, LocationCompleterModel::SearchStringRole); @@ -161,7 +161,7 @@ void LocationCompleterRefreshJob::completeFromHistory() continue; } - QStandardItem* item = new QStandardItem(); + auto* item = new QStandardItem(); item->setText(bookmark->url().toEncoded()); item->setData(-1, LocationCompleterModel::IdRole); item->setData(bookmark->title(), LocationCompleterModel::TitleRole); @@ -192,7 +192,7 @@ void LocationCompleterRefreshJob::completeFromHistory() continue; } - QStandardItem* item = new QStandardItem(); + auto* item = new QStandardItem(); item->setText(url.toEncoded()); item->setData(query.value(0), LocationCompleterModel::IdRole); item->setData(query.value(2), LocationCompleterModel::TitleRole); @@ -212,7 +212,7 @@ void LocationCompleterRefreshJob::completeMostVisited() query.exec(QSL("SELECT id, url, title FROM history ORDER BY count DESC LIMIT 15")); while (query.next()) { - QStandardItem* item = new QStandardItem(); + auto* item = new QStandardItem(); const QUrl url = query.value(1).toUrl(); item->setText(url.toEncoded()); diff --git a/src/lib/navigation/completer/locationcompleterview.cpp b/src/lib/navigation/completer/locationcompleterview.cpp index 576be0e9e..16fee8f56 100644 --- a/src/lib/navigation/completer/locationcompleterview.cpp +++ b/src/lib/navigation/completer/locationcompleterview.cpp @@ -43,7 +43,7 @@ LocationCompleterView::LocationCompleterView() setWindowFlags(Qt::Popup); } - QVBoxLayout *layout = new QVBoxLayout(this); + auto *layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); @@ -63,19 +63,19 @@ LocationCompleterView::LocationCompleterView() m_delegate = new LocationCompleterDelegate(this); m_view->setItemDelegate(m_delegate); - QFrame *searchFrame = new QFrame(this); + auto *searchFrame = new QFrame(this); searchFrame->setFrameStyle(QFrame::StyledPanel | QFrame::Raised); - QHBoxLayout *searchLayout = new QHBoxLayout(searchFrame); + auto *searchLayout = new QHBoxLayout(searchFrame); searchLayout->setContentsMargins(10, 4, 4, 4); - ToolButton *searchSettingsButton = new ToolButton(this); + auto *searchSettingsButton = new ToolButton(this); searchSettingsButton->setIcon(IconProvider::settingsIcon()); searchSettingsButton->setToolTip(tr("Manage Search Engines")); searchSettingsButton->setAutoRaise(true); searchSettingsButton->setIconSize(QSize(16, 16)); connect(searchSettingsButton, &ToolButton::clicked, this, &LocationCompleterView::searchEnginesDialogRequested); - QLabel *searchLabel = new QLabel(tr("Search with:")); + auto *searchLabel = new QLabel(tr("Search with:")); m_searchEnginesLayout = new QHBoxLayout(); setupSearchEngines(); @@ -160,7 +160,7 @@ bool LocationCompleterView::eventFilter(QObject* object, QEvent* event) if (object == m_view->viewport()) { if (event->type() == QEvent::MouseButtonRelease) { - QMouseEvent *e = static_cast(event); + auto *e = static_cast(event); QModelIndex idx = m_view->indexAt(e->pos()); if (!idx.isValid()) { return false; @@ -189,7 +189,7 @@ bool LocationCompleterView::eventFilter(QObject* object, QEvent* event) switch (event->type()) { case QEvent::KeyPress: { - QKeyEvent* keyEvent = static_cast(event); + auto* keyEvent = static_cast(event); Qt::KeyboardModifiers modifiers = keyEvent->modifiers(); const QModelIndex idx = m_view->currentIndex(); const QModelIndex visitSearchIdx = model()->index(0, 0).data(LocationCompleterModel::VisitSearchItemRole).toBool() ? model()->index(0, 0) : QModelIndex(); @@ -322,7 +322,7 @@ bool LocationCompleterView::eventFilter(QObject* object, QEvent* event) } case QEvent::KeyRelease: { - QKeyEvent* keyEvent = static_cast(event); + auto* keyEvent = static_cast(event); switch (keyEvent->key()) { case Qt::Key_Shift: @@ -342,7 +342,7 @@ bool LocationCompleterView::eventFilter(QObject* object, QEvent* event) break; case QEvent::FocusOut: { - QFocusEvent *focusEvent = static_cast(event); + auto *focusEvent = static_cast(event); if (focusEvent->reason() != Qt::PopupFocusReason && focusEvent->reason() != Qt::MouseFocusReason) { close(); } @@ -383,7 +383,7 @@ void LocationCompleterView::setupSearchEngines() const auto engines = mApp->searchEnginesManager()->allEngines(); for (const SearchEngine &engine : engines) { - ToolButton *button = new ToolButton(this); + auto *button = new ToolButton(this); button->setIcon(engine.icon); button->setToolTip(engine.name); button->setAutoRaise(true); diff --git a/src/lib/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp index 52568610a..316c772d7 100644 --- a/src/lib/navigation/locationbar.cpp +++ b/src/lib/navigation/locationbar.cpp @@ -62,7 +62,7 @@ LocationBar::LocationBar(QWidget *parent) m_goIcon = new GoIcon(this); m_siteIcon = new SiteIcon(this); m_autofillIcon = new AutoFillIcon(this); - DownIcon* down = new DownIcon(this); + auto* down = new DownIcon(this); addWidget(m_siteIcon, LineEdit::LeftSide); addWidget(m_autofillIcon, LineEdit::RightSide); @@ -79,7 +79,7 @@ LocationBar::LocationBar(QWidget *parent) connect(m_completer, &LocationCompleter::popupClosed, this, &LocationBar::updateSiteIcon); m_domainCompleterModel = new QStringListModel(this); - QCompleter* domainCompleter = new QCompleter(this); + auto* domainCompleter = new QCompleter(this); domainCompleter->setCompletionMode(QCompleter::InlineCompletion); domainCompleter->setModel(m_domainCompleterModel); setCompleter(domainCompleter); @@ -211,7 +211,7 @@ QString LocationBar::convertUrlToText(const QUrl &url) SearchEnginesManager::Engine LocationBar::searchEngine() { if (!qzSettings->searchFromAddressBar) { - return SearchEngine(); + return {}; } else if (qzSettings->searchWithDefaultEngine) { return mApp->searchEnginesManager()->defaultEngine(); } else { @@ -643,7 +643,7 @@ void LocationBar::loadFinished() m_progressTimer->start(); } - WebPage* page = qobject_cast(m_webView->page()); + auto* page = qobject_cast(m_webView->page()); if (page && !page->autoFillUsernames().isEmpty()) { m_autofillIcon->setUsernames(page->autoFillUsernames()); diff --git a/src/lib/navigation/navigationbar.cpp b/src/lib/navigation/navigationbar.cpp index 1ec89dbc1..d43c85537 100644 --- a/src/lib/navigation/navigationbar.cpp +++ b/src/lib/navigation/navigationbar.cpp @@ -91,17 +91,17 @@ NavigationBar::NavigationBar(BrowserWindow* window) m_buttonForward->setEnabled(false); m_buttonForward->setFocusPolicy(Qt::NoFocus); - QHBoxLayout* backNextLayout = new QHBoxLayout(); + auto* backNextLayout = new QHBoxLayout(); backNextLayout->setContentsMargins(0, 0, 0, 0); backNextLayout->setSpacing(0); backNextLayout->addWidget(m_buttonBack); backNextLayout->addWidget(m_buttonForward); - QWidget *backNextWidget = new QWidget(this); + auto *backNextWidget = new QWidget(this); backNextWidget->setLayout(backNextLayout); m_reloadStop = new ReloadStopButton(this); - ToolButton *buttonHome = new ToolButton(this); + auto *buttonHome = new ToolButton(this); buttonHome->setObjectName("navigation-button-home"); buttonHome->setToolTip(tr("Home")); buttonHome->setToolButtonStyle(Qt::ToolButtonIconOnly); @@ -109,7 +109,7 @@ NavigationBar::NavigationBar(BrowserWindow* window) buttonHome->setAutoRaise(true); buttonHome->setFocusPolicy(Qt::NoFocus); - ToolButton *buttonAddTab = new ToolButton(this); + auto *buttonAddTab = new ToolButton(this); buttonAddTab->setObjectName("navigation-button-addtab"); buttonAddTab->setToolTip(tr("New Tab")); buttonAddTab->setToolButtonStyle(Qt::ToolButtonIconOnly); @@ -127,7 +127,7 @@ NavigationBar::NavigationBar(BrowserWindow* window) m_buttonForward->setMenu(m_menuForward); connect(m_buttonForward, &ToolButton::aboutToShowMenu, this, &NavigationBar::aboutToShowHistoryNextMenu); - ToolButton *buttonTools = new ToolButton(this); + auto *buttonTools = new ToolButton(this); buttonTools->setObjectName("navigation-button-tools"); buttonTools->setPopupMode(QToolButton::InstantPopup); buttonTools->setToolbarButtonLook(true); @@ -330,7 +330,7 @@ void NavigationBar::addToolButton(AbstractButtonInterface *button) return; } - NavigationBarToolButton *toolButton = new NavigationBarToolButton(button, this); + auto *toolButton = new NavigationBarToolButton(button, this); toolButton->setProperty("button-id", button->id()); connect(toolButton, &NavigationBarToolButton::visibilityChangeRequested, this, [=]() { if (m_layout->indexOf(toolButton) != -1) { @@ -376,7 +376,7 @@ void NavigationBar::aboutToShowHistoryBackMenu() QString title = titleForUrl(item.title(), item.url()); const QIcon icon = iconForPage(item.url(), IconProvider::standardIcon(QStyle::SP_ArrowBack)); - Action* act = new Action(icon, title); + auto* act = new Action(icon, title); act->setData(i); connect(act, &QAction::triggered, this, &NavigationBar::loadHistoryIndex); connect(act, SIGNAL(ctrlTriggered()), this, SLOT(loadHistoryIndexInNewTab())); @@ -410,7 +410,7 @@ void NavigationBar::aboutToShowHistoryNextMenu() QString title = titleForUrl(item.title(), item.url()); const QIcon icon = iconForPage(item.url(), IconProvider::standardIcon(QStyle::SP_ArrowForward)); - Action* act = new Action(icon, title); + auto* act = new Action(icon, title); act->setData(i); connect(act, &QAction::triggered, this, &NavigationBar::loadHistoryIndex); connect(act, SIGNAL(ctrlTriggered()), this, SLOT(loadHistoryIndexInNewTab())); @@ -467,13 +467,13 @@ void NavigationBar::contextMenuRequested(const QPoint &pos) void NavigationBar::openConfigurationDialog() { - NavigationBarConfigDialog *dialog = new NavigationBarConfigDialog(this); + auto *dialog = new NavigationBarConfigDialog(this); dialog->show(); } void NavigationBar::toolActionActivated() { - QAction *act = qobject_cast(sender()); + auto *act = qobject_cast(sender()); if (!act) { return; } @@ -485,12 +485,12 @@ void NavigationBar::toolActionActivated() if (!data.button) { return; } - ToolButton *buttonTools = qobject_cast(m_widgets.value(QSL("button-tools")).widget); + auto *buttonTools = qobject_cast(m_widgets.value(QSL("button-tools")).widget); if (!buttonTools) { return; } - AbstractButtonInterface::ClickController *c = new AbstractButtonInterface::ClickController; + auto *c = new AbstractButtonInterface::ClickController; c->visualParent = buttonTools; c->popupPosition = [=](const QSize &size) { QPoint pos = buttonTools->mapToGlobal(buttonTools->rect().bottomRight()); @@ -572,7 +572,7 @@ void NavigationBar::reloadLayout() const WidgetData data = m_widgets.value(id); if (data.widget) { m_layout->addWidget(data.widget); - NavigationBarToolButton *button = qobject_cast(data.widget); + auto *button = qobject_cast(data.widget); if (button) { button->updateVisibility(); } else { @@ -602,14 +602,14 @@ void NavigationBar::loadHistoryIndex() { QWebEngineHistory* history = m_window->weView()->page()->history(); - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { loadHistoryItem(history->itemAt(action->data().toInt())); } } void NavigationBar::loadHistoryIndexInNewTab(int index) { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { index = action->data().toInt(); } diff --git a/src/lib/navigation/navigationbarconfigdialog.cpp b/src/lib/navigation/navigationbarconfigdialog.cpp index 39d5b661f..5c88490f9 100644 --- a/src/lib/navigation/navigationbarconfigdialog.cpp +++ b/src/lib/navigation/navigationbarconfigdialog.cpp @@ -40,7 +40,7 @@ NavigationBarConfigDialog::NavigationBarConfigDialog(NavigationBar *navigationBa void NavigationBarConfigDialog::loadSettings() { auto createItem = [this](const NavigationBar::WidgetData &data) { - QListWidgetItem *item = new QListWidgetItem(); + auto *item = new QListWidgetItem(); item->setText(data.name); item->setData(Qt::UserRole + 10, data.id); #if 0 diff --git a/src/lib/navigation/navigationbartoolbutton.cpp b/src/lib/navigation/navigationbartoolbutton.cpp index 107b2d57a..ed39a66f6 100644 --- a/src/lib/navigation/navigationbartoolbutton.cpp +++ b/src/lib/navigation/navigationbartoolbutton.cpp @@ -55,7 +55,7 @@ void NavigationBarToolButton::updateVisibility() void NavigationBarToolButton::clicked() { - AbstractButtonInterface::ClickController *c = new AbstractButtonInterface::ClickController; + auto *c = new AbstractButtonInterface::ClickController; c->visualParent = this; c->popupPosition = [=](const QSize &size) { QPoint pos = mapToGlobal(rect().bottomRight()); diff --git a/src/lib/navigation/siteicon.cpp b/src/lib/navigation/siteicon.cpp index 49cb69bb2..06e73d502 100644 --- a/src/lib/navigation/siteicon.cpp +++ b/src/lib/navigation/siteicon.cpp @@ -143,8 +143,8 @@ void SiteIcon::mouseMoveEvent(QMouseEvent* e) return; } - QDrag* drag = new QDrag(this); - QMimeData* mime = new QMimeData; + auto* drag = new QDrag(this); + auto* mime = new QMimeData; mime->setUrls(QList() << url); mime->setText(title); mime->setImageData(icon().pixmap(16).toImage()); @@ -170,7 +170,7 @@ bool SiteIcon::showPopup() setDown(true); - SiteInfoWidget* info = new SiteInfoWidget(m_window); + auto* info = new SiteInfoWidget(m_window); info->showAt(parentWidget()); connect(info, &QObject::destroyed, this, &SiteIcon::popupClosed); diff --git a/src/lib/navigation/websearchbar.cpp b/src/lib/navigation/websearchbar.cpp index bad7cd005..7c0820fa8 100644 --- a/src/lib/navigation/websearchbar.cpp +++ b/src/lib/navigation/websearchbar.cpp @@ -237,7 +237,7 @@ void WebSearchBar::searchInNewTab() void WebSearchBar::addEngineFromAction() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { m_searchManager->addEngine(action->data().toUrl()); } } diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp index 9d279265f..568bdf687 100644 --- a/src/lib/network/networkmanager.cpp +++ b/src/lib/network/networkmanager.cpp @@ -110,24 +110,24 @@ bool NetworkManager::certificateError(const QWebEngineCertificateError &error, Q void NetworkManager::authentication(const QUrl &url, QAuthenticator *auth, QWidget *parent) { - QDialog* dialog = new QDialog(parent); + auto* dialog = new QDialog(parent); dialog->setWindowTitle(tr("Authorization required")); - QFormLayout* formLa = new QFormLayout(dialog); + auto* formLa = new QFormLayout(dialog); - QLabel* label = new QLabel(dialog); - QLabel* userLab = new QLabel(dialog); - QLabel* passLab = new QLabel(dialog); + auto* label = new QLabel(dialog); + auto* userLab = new QLabel(dialog); + auto* passLab = new QLabel(dialog); userLab->setText(tr("Username: ")); passLab->setText(tr("Password: ")); - QLineEdit* user = new QLineEdit(dialog); - QLineEdit* pass = new QLineEdit(dialog); + auto* user = new QLineEdit(dialog); + auto* pass = new QLineEdit(dialog); pass->setEchoMode(QLineEdit::Password); - QCheckBox* save = new QCheckBox(dialog); + auto* save = new QCheckBox(dialog); save->setText(tr("Save username and password for this site")); - QDialogButtonBox* box = new QDialogButtonBox(dialog); + auto* box = new QDialogButtonBox(dialog); box->addButton(QDialogButtonBox::Ok); box->addButton(QDialogButtonBox::Cancel); connect(box, &QDialogButtonBox::rejected, dialog, &QDialog::reject); @@ -196,22 +196,22 @@ void NetworkManager::proxyAuthentication(const QString &proxyHost, QAuthenticato return; } - QDialog* dialog = new QDialog(parent); + auto* dialog = new QDialog(parent); dialog->setWindowTitle(tr("Proxy authorization required")); - QFormLayout* formLa = new QFormLayout(dialog); + auto* formLa = new QFormLayout(dialog); - QLabel* label = new QLabel(dialog); - QLabel* userLab = new QLabel(dialog); - QLabel* passLab = new QLabel(dialog); + auto* label = new QLabel(dialog); + auto* userLab = new QLabel(dialog); + auto* passLab = new QLabel(dialog); userLab->setText(tr("Username: ")); passLab->setText(tr("Password: ")); - QLineEdit* user = new QLineEdit(dialog); - QLineEdit* pass = new QLineEdit(dialog); + auto* user = new QLineEdit(dialog); + auto* pass = new QLineEdit(dialog); pass->setEchoMode(QLineEdit::Password); - QDialogButtonBox* box = new QDialogButtonBox(dialog); + auto* box = new QDialogButtonBox(dialog); box->addButton(QDialogButtonBox::Ok); box->addButton(QDialogButtonBox::Cancel); connect(box, &QDialogButtonBox::rejected, dialog, &QDialog::reject); diff --git a/src/lib/network/schemehandlers/extensionschemehandler.cpp b/src/lib/network/schemehandlers/extensionschemehandler.cpp index 39d259468..6141e2f3c 100644 --- a/src/lib/network/schemehandlers/extensionschemehandler.cpp +++ b/src/lib/network/schemehandlers/extensionschemehandler.cpp @@ -24,7 +24,7 @@ // ExtensionSchemeHandler void ExtensionSchemeHandler::setReply(QWebEngineUrlRequestJob *job, const QByteArray &contentType, const QByteArray &content) { - QBuffer *buffer = new QBuffer(job); + auto *buffer = new QBuffer(job); buffer->open(QIODevice::ReadWrite); buffer->write(content); buffer->seek(0); diff --git a/src/lib/opensearch/opensearchengine.cpp b/src/lib/opensearch/opensearchengine.cpp index 412bb8d46..87ef24e36 100644 --- a/src/lib/opensearch/opensearchengine.cpp +++ b/src/lib/opensearch/opensearchengine.cpp @@ -115,8 +115,7 @@ OpenSearchEngine::OpenSearchEngine(QObject* parent) A destructor. */ OpenSearchEngine::~OpenSearchEngine() -{ -} += default; QString OpenSearchEngine::parseTemplate(const QString &searchTerm, const QString &searchTemplate) { @@ -222,7 +221,7 @@ void OpenSearchEngine::setSearchUrlTemplate(const QString &searchUrlTemplate) QUrl OpenSearchEngine::searchUrl(const QString &searchTerm) const { if (m_searchUrlTemplate.isEmpty()) { - return QUrl(); + return {}; } QUrl retVal = QUrl::fromEncoded(parseTemplate(searchTerm, m_searchUrlTemplate).toUtf8()); @@ -243,7 +242,7 @@ QUrl OpenSearchEngine::searchUrl(const QString &searchTerm) const QByteArray OpenSearchEngine::getPostData(const QString &searchTerm) const { if (m_searchMethod != QLatin1String("post")) { - return QByteArray(); + return {}; } QUrl retVal = QUrl("http://foo.bar"); @@ -308,7 +307,7 @@ QUrl OpenSearchEngine::suggestionsUrl(const QString &searchTerm) const } if (m_suggestionsUrlTemplate.isEmpty()) { - return QUrl(); + return {}; } QUrl retVal = QUrl::fromEncoded(parseTemplate(searchTerm, m_suggestionsUrlTemplate).toUtf8()); @@ -432,7 +431,7 @@ void OpenSearchEngine::loadImage() const void OpenSearchEngine::imageObtained() { - QNetworkReply* reply = qobject_cast(sender()); + auto* reply = qobject_cast(sender()); if (!reply) { return; diff --git a/src/lib/opensearch/opensearchengine.h b/src/lib/opensearch/opensearchengine.h index 24a995acb..3008184e0 100644 --- a/src/lib/opensearch/opensearchengine.h +++ b/src/lib/opensearch/opensearchengine.h @@ -58,8 +58,8 @@ Q_SIGNALS: void suggestions(const QStringList &suggestions); public: - typedef QPair Parameter; - typedef QList Parameters; + using Parameter = QPair; + using Parameters = QList; Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString description READ description WRITE setDescription) diff --git a/src/lib/opensearch/opensearchenginedelegate.cpp b/src/lib/opensearch/opensearchenginedelegate.cpp index d31569a56..117a1eb2e 100644 --- a/src/lib/opensearch/opensearchenginedelegate.cpp +++ b/src/lib/opensearch/opensearchenginedelegate.cpp @@ -37,15 +37,13 @@ Constructs the delegate. */ OpenSearchEngineDelegate::OpenSearchEngineDelegate() -{ -} += default; /*! Destructs the delegate. */ OpenSearchEngineDelegate::~OpenSearchEngineDelegate() -{ -} += default; /*! \fn void performSearchRequest(const QNetworkRequest &request, diff --git a/src/lib/opensearch/opensearchreader.cpp b/src/lib/opensearch/opensearchreader.cpp index 3e7356b56..5ac95bd97 100644 --- a/src/lib/opensearch/opensearchreader.cpp +++ b/src/lib/opensearch/opensearchreader.cpp @@ -96,7 +96,7 @@ OpenSearchEngine* OpenSearchReader::read(QIODevice* device) OpenSearchEngine* OpenSearchReader::read() { - OpenSearchEngine* engine = new OpenSearchEngine(); + auto* engine = new OpenSearchEngine(); m_searchXml = device()->peek(1024 * 5); if (!m_searchXml.contains(QLatin1String("http://a9.com/-/spec/opensearch/1.1/")) && diff --git a/src/lib/opensearch/searchenginesdialog.cpp b/src/lib/opensearch/searchenginesdialog.cpp index d4460ccde..743eed5e8 100644 --- a/src/lib/opensearch/searchenginesdialog.cpp +++ b/src/lib/opensearch/searchenginesdialog.cpp @@ -67,7 +67,7 @@ void SearchEnginesDialog::addEngine() return; } - QTreeWidgetItem* item = new QTreeWidgetItem(); + auto* item = new QTreeWidgetItem(); setEngine(item, engine); changeItemToDefault(item, false); @@ -223,7 +223,7 @@ void SearchEnginesDialog::reloadEngines() const auto engines = m_manager->allEngines(); for (const SearchEngine &en : engines) { - QTreeWidgetItem* item = new QTreeWidgetItem(); + auto* item = new QTreeWidgetItem(); setEngine(item, en); changeItemToDefault(item, en == defaultEngine); item->setIcon(0, en.icon); diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp index e9271a6af..c1e490477 100644 --- a/src/lib/opensearch/searchenginesmanager.cpp +++ b/src/lib/opensearch/searchenginesmanager.cpp @@ -211,7 +211,7 @@ QIcon SearchEnginesManager::iconForSearchEngine(const QUrl &url) void SearchEnginesManager::engineChangedImage() { - OpenSearchEngine* engine = qobject_cast(sender()); + auto* engine = qobject_cast(sender()); if (!engine) { return; @@ -379,7 +379,7 @@ void SearchEnginesManager::replyFinished() { qApp->restoreOverrideCursor(); - QNetworkReply* reply = qobject_cast(sender()); + auto* reply = qobject_cast(sender()); if (!reply) { return; } diff --git a/src/lib/opensearch/searchenginesmanager.h b/src/lib/opensearch/searchenginesmanager.h index 315e738a6..a06f3200f 100644 --- a/src/lib/opensearch/searchenginesmanager.h +++ b/src/lib/opensearch/searchenginesmanager.h @@ -118,7 +118,7 @@ private: Engine m_defaultEngine; }; -typedef SearchEnginesManager::Engine SearchEngine; +using SearchEngine = SearchEnginesManager::Engine; // Hint to QVector to use std::realloc on item moving Q_DECLARE_TYPEINFO(SearchEngine, Q_MOVABLE_TYPE); diff --git a/src/lib/other/browsinglibrary.cpp b/src/lib/other/browsinglibrary.cpp index 4dd5667da..2cc61f6c8 100644 --- a/src/lib/other/browsinglibrary.cpp +++ b/src/lib/other/browsinglibrary.cpp @@ -57,7 +57,7 @@ BrowsingLibrary::BrowsingLibrary(BrowserWindow* window, QWidget* parent) ui->tabs->SetMode(FancyTabWidget::Mode_LargeSidebar); ui->tabs->setFocus(); - QMenu* m = new QMenu(this); + auto* m = new QMenu(this); m->addAction(tr("Import Bookmarks..."), this, &BrowsingLibrary::importBookmarks); m->addAction(tr("Export Bookmarks..."), this, &BrowsingLibrary::exportBookmarks); ui->importExport->setMenu(m); @@ -80,13 +80,13 @@ void BrowsingLibrary::search() void BrowsingLibrary::importBookmarks() { - BookmarksImportDialog* d = new BookmarksImportDialog(this); + auto* d = new BookmarksImportDialog(this); d->open(); } void BrowsingLibrary::exportBookmarks() { - BookmarksExportDialog* d = new BookmarksExportDialog(this); + auto* d = new BookmarksExportDialog(this); d->open(); } diff --git a/src/lib/other/clearprivatedata.cpp b/src/lib/other/clearprivatedata.cpp index d39991077..74f68e1c9 100644 --- a/src/lib/other/clearprivatedata.cpp +++ b/src/lib/other/clearprivatedata.cpp @@ -174,7 +174,7 @@ void ClearPrivateData::optimizeDb() void ClearPrivateData::showCookieManager() { - CookieManager* dialog = new CookieManager(this); + auto* dialog = new CookieManager(this); dialog->show(); } diff --git a/src/lib/other/iconchooser.cpp b/src/lib/other/iconchooser.cpp index 39cc28aa7..6c8068c26 100644 --- a/src/lib/other/iconchooser.cpp +++ b/src/lib/other/iconchooser.cpp @@ -49,7 +49,7 @@ void IconChooser::chooseFile() QIcon icon(path); if (!icon.isNull()) { - QListWidgetItem* item = new QListWidgetItem(ui->iconList); + auto* item = new QListWidgetItem(ui->iconList); item->setIcon(icon); ui->iconList->setCurrentItem(item); @@ -72,7 +72,7 @@ void IconChooser::searchIcon(const QString &string) while (query.next()) { QImage image = QImage::fromData(query.value(0).toByteArray()); if (!image.isNull()) { - QListWidgetItem* item = new QListWidgetItem(ui->iconList); + auto* item = new QListWidgetItem(ui->iconList); item->setIcon(QPixmap::fromImage(image)); } } diff --git a/src/lib/other/licenseviewer.cpp b/src/lib/other/licenseviewer.cpp index 32dedb0b5..cfd71b574 100644 --- a/src/lib/other/licenseviewer.cpp +++ b/src/lib/other/licenseviewer.cpp @@ -35,11 +35,11 @@ LicenseViewer::LicenseViewer(QWidget* parent) serifFont.setFamily("Courier"); m_textBrowser->setFont(serifFont); - QDialogButtonBox* buttonBox = new QDialogButtonBox(this); + auto* buttonBox = new QDialogButtonBox(this); buttonBox->setStandardButtons(QDialogButtonBox::Close); connect(buttonBox, &QDialogButtonBox::rejected, this, &QWidget::close); - QVBoxLayout* l = new QVBoxLayout(this); + auto* l = new QVBoxLayout(this); l->addWidget(m_textBrowser); l->addWidget(buttonBox); diff --git a/src/lib/other/protocolhandlerdialog.cpp b/src/lib/other/protocolhandlerdialog.cpp index 14a432eae..d2e45ccb5 100644 --- a/src/lib/other/protocolhandlerdialog.cpp +++ b/src/lib/other/protocolhandlerdialog.cpp @@ -45,7 +45,7 @@ void ProtocolHandlerDialog::init() { const auto handlers = mApp->protocolHandlerManager()->protocolHandlers(); for (auto it = handlers.cbegin(); it != handlers.cend(); ++it) { - QTreeWidgetItem *item = new QTreeWidgetItem(ui->treeWidget); + auto *item = new QTreeWidgetItem(ui->treeWidget); item->setText(0, it.key()); item->setText(1, it.value().host()); ui->treeWidget->addTopLevelItem(item); diff --git a/src/lib/other/protocolhandlermanager.cpp b/src/lib/other/protocolhandlermanager.cpp index 7f22471b2..b5d06131c 100644 --- a/src/lib/other/protocolhandlermanager.cpp +++ b/src/lib/other/protocolhandlermanager.cpp @@ -79,7 +79,7 @@ void ProtocolHandlerManager::registerHandler(const QString &scheme, const QUrl & QString urlString = url.toString(); urlString.replace(QL1S("%25s"), QL1S("%s")); - QWebEnginePage *page = new QWebEnginePage(this); + auto *page = new QWebEnginePage(this); connect(page, &QWebEnginePage::loadFinished, page, &QObject::deleteLater); connect(page, &QWebEnginePage::registerProtocolHandlerRequested, this, [](QWebEngineRegisterProtocolHandlerRequest request) { request.accept(); diff --git a/src/lib/other/siteinfo.cpp b/src/lib/other/siteinfo.cpp index 9b6fa0930..01087e067 100644 --- a/src/lib/other/siteinfo.cpp +++ b/src/lib/other/siteinfo.cpp @@ -51,7 +51,7 @@ SiteInfo::SiteInfo(WebView *view) ui->treeTags->setLayoutDirection(Qt::LeftToRight); QzTools::centerWidgetOnScreen(this); - ListItemDelegate* delegate = new ListItemDelegate(24, ui->listWidget); + auto* delegate = new ListItemDelegate(24, ui->listWidget); delegate->setUpdateParentHeight(true); delegate->setUniformItemSizes(true); ui->listWidget->setItemDelegate(delegate); @@ -87,7 +87,7 @@ SiteInfo::SiteInfo(WebView *view) if (content.isEmpty() || name.isEmpty()) continue; - QTreeWidgetItem* item = new QTreeWidgetItem(ui->treeTags); + auto* item = new QTreeWidgetItem(ui->treeTags); item->setText(0, name); item->setText(1, content); ui->treeTags->addTopLevelItem(item); @@ -115,7 +115,7 @@ SiteInfo::SiteInfo(WebView *view) if (src.isEmpty() || alt.isEmpty()) continue; - QTreeWidgetItem* item = new QTreeWidgetItem(ui->treeImages); + auto* item = new QTreeWidgetItem(ui->treeImages); item->setText(0, alt); item->setText(1, src); ui->treeImages->addTopLevelItem(item); @@ -128,19 +128,19 @@ SiteInfo::SiteInfo(WebView *view) connect(ui->treeImages, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(imagesCustomContextMenuRequested(QPoint))); connect(ui->treeTags, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(tagsCustomContextMenuRequested(QPoint))); - QShortcut *shortcutTagsCopyAll = new QShortcut(QKeySequence("Ctrl+C"), ui->treeTags); + auto *shortcutTagsCopyAll = new QShortcut(QKeySequence("Ctrl+C"), ui->treeTags); shortcutTagsCopyAll->setContext(Qt::WidgetShortcut); connect(shortcutTagsCopyAll, &QShortcut::activated, [=]{copySelectedItems(ui->treeTags, false);}); - QShortcut *shortcutTagsCopyValues = new QShortcut(QKeySequence("Ctrl+Shift+C"), ui->treeTags); + auto *shortcutTagsCopyValues = new QShortcut(QKeySequence("Ctrl+Shift+C"), ui->treeTags); shortcutTagsCopyValues->setContext(Qt::WidgetShortcut); connect(shortcutTagsCopyValues, &QShortcut::activated, [=]{copySelectedItems(ui->treeTags, true);}); - QShortcut *shortcutImagesCopyAll = new QShortcut(QKeySequence("Ctrl+C"), ui->treeImages); + auto *shortcutImagesCopyAll = new QShortcut(QKeySequence("Ctrl+C"), ui->treeImages); shortcutImagesCopyAll->setContext(Qt::WidgetShortcut); connect(shortcutImagesCopyAll, &QShortcut::activated, [=]{copySelectedItems(ui->treeImages, false);}); - QShortcut *shortcutImagesCopyValues = new QShortcut(QKeySequence("Ctrl+Shift+C"), ui->treeImages); + auto *shortcutImagesCopyValues = new QShortcut(QKeySequence("Ctrl+Shift+C"), ui->treeImages); shortcutImagesCopyValues->setContext(Qt::WidgetShortcut); connect(shortcutImagesCopyValues, &QShortcut::activated, [=]{copySelectedItems(ui->treeImages, true);}); @@ -221,7 +221,7 @@ void SiteInfo::saveImage() return; QGraphicsItem *graphicsItem = ui->mediaPreview->scene()->items().at(0); - QGraphicsPixmapItem *pixmapItem = static_cast(graphicsItem); + auto *pixmapItem = static_cast(graphicsItem); if (graphicsItem->type() != QGraphicsPixmapItem::Type || !pixmapItem) return; @@ -253,7 +253,7 @@ void SiteInfo::saveImage() void SiteInfo::showLoadingText() { delete ui->mediaPreview->scene(); - QGraphicsScene* scene = new QGraphicsScene(ui->mediaPreview); + auto* scene = new QGraphicsScene(ui->mediaPreview); scene->addText(tr("Loading...")); @@ -265,7 +265,7 @@ void SiteInfo::showPixmap(QPixmap pixmap) pixmap.setDevicePixelRatio(devicePixelRatioF()); delete ui->mediaPreview->scene(); - QGraphicsScene* scene = new QGraphicsScene(ui->mediaPreview); + auto* scene = new QGraphicsScene(ui->mediaPreview); if (pixmap.isNull()) scene->addText(tr("Preview not available")); diff --git a/src/lib/other/statusbar.cpp b/src/lib/other/statusbar.cpp index cec7a2ff4..55375e478 100644 --- a/src/lib/other/statusbar.cpp +++ b/src/lib/other/statusbar.cpp @@ -68,7 +68,7 @@ StatusBarButton::StatusBarButton(AbstractButtonInterface *button, QWidget *paren void StatusBarButton::clicked() { - AbstractButtonInterface::ClickController *c = new AbstractButtonInterface::ClickController; + auto *c = new AbstractButtonInterface::ClickController; c->visualParent = this; c->popupPosition = [=](const QSize &size) { QPoint pos = mapToGlobal(rect().topRight()); @@ -222,7 +222,7 @@ void StatusBar::addButton(AbstractButtonInterface *button) return; } - StatusBarButton *widget = new StatusBarButton(button, this); + auto *widget = new StatusBarButton(button, this); widget->setProperty("button-id", button->id()); WidgetData data; diff --git a/src/lib/other/updater.cpp b/src/lib/other/updater.cpp index 28d1b03bd..ef8f1b3d5 100644 --- a/src/lib/other/updater.cpp +++ b/src/lib/other/updater.cpp @@ -136,7 +136,7 @@ void Updater::startDownloadingUpdateInfo(const QUrl &url) void Updater::downCompleted() { - QNetworkReply* reply = qobject_cast(sender()); + auto* reply = qobject_cast(sender()); if (!reply) return; diff --git a/src/lib/plugins/ocssupport.cpp b/src/lib/plugins/ocssupport.cpp index fd4983e5d..019d076d0 100644 --- a/src/lib/plugins/ocssupport.cpp +++ b/src/lib/plugins/ocssupport.cpp @@ -37,7 +37,7 @@ static DesktopFile readMetaData(const KArchiveDirectory *directory) const KArchiveEntry *entry = directory->entry(QSL("metadata.desktop")); if (!entry || !entry->isFile()) { qWarning() << "No metadata.desktop found"; - return DesktopFile(); + return {}; } const QString tempDir = DataPaths::path(DataPaths::Temp); static_cast(entry)->copyTo(tempDir); diff --git a/src/lib/plugins/plugininterface.h b/src/lib/plugins/plugininterface.h index 547998739..3cbbbb124 100644 --- a/src/lib/plugins/plugininterface.h +++ b/src/lib/plugins/plugininterface.h @@ -41,7 +41,7 @@ public: LateInitState }; - virtual ~PluginInterface() { } + virtual ~PluginInterface() = default; virtual void init(InitState state, const QString &settingsPath) = 0; virtual void unload() = 0; diff --git a/src/lib/plugins/plugins.cpp b/src/lib/plugins/plugins.cpp index 867745050..ba422eb40 100644 --- a/src/lib/plugins/plugins.cpp +++ b/src/lib/plugins/plugins.cpp @@ -373,7 +373,7 @@ Plugins::Plugin Plugins::loadPlugin(const QString &id) return QmlPlugin::loadPlugin(name); default: - return Plugin(); + return {}; } } @@ -387,7 +387,7 @@ Plugins::Plugin Plugins::loadInternalPlugin(const QString &name) plugin.pluginSpec = createSpec(DesktopFile(QSL(":adblock/metadata.desktop"))); return plugin; } else { - return Plugin(); + return {}; } } @@ -400,7 +400,7 @@ Plugins::Plugin Plugins::loadSharedLibraryPlugin(const QString &name) fullPath = DataPaths::locate(DataPaths::Plugins, name); if (fullPath.isEmpty()) { qWarning() << "Library plugin" << name << "not found"; - return Plugin(); + return {}; } } diff --git a/src/lib/plugins/qml/api/bookmarks/qmlbookmarks.cpp b/src/lib/plugins/qml/api/bookmarks/qmlbookmarks.cpp index c0981e495..0141be4f8 100644 --- a/src/lib/plugins/qml/api/bookmarks/qmlbookmarks.cpp +++ b/src/lib/plugins/qml/api/bookmarks/qmlbookmarks.cpp @@ -169,7 +169,7 @@ QList QmlBookmarks::search(const QVariantMap &map) const { if (!map.contains(QSL("query")) && !map.contains(QSL("url"))) { qWarning() << "Unable to search bookmarks"; - return QList(); + return {}; } const QString query = map.value(QSL("query")).toString(); diff --git a/src/lib/plugins/qml/api/bookmarks/qmlbookmarktreenode.cpp b/src/lib/plugins/qml/api/bookmarks/qmlbookmarktreenode.cpp index fbb54d8f0..01b2b4539 100644 --- a/src/lib/plugins/qml/api/bookmarks/qmlbookmarktreenode.cpp +++ b/src/lib/plugins/qml/api/bookmarks/qmlbookmarktreenode.cpp @@ -61,7 +61,7 @@ QmlBookmarkTreeNode::Type QmlBookmarkTreeNode::type() const QString QmlBookmarkTreeNode::title() const { if (!m_item) { - return QString(); + return {}; } return m_item->title(); @@ -70,7 +70,7 @@ QString QmlBookmarkTreeNode::title() const QString QmlBookmarkTreeNode::url() const { if (!m_item) { - return QString(); + return {}; } return m_item->urlString(); @@ -79,7 +79,7 @@ QString QmlBookmarkTreeNode::url() const QString QmlBookmarkTreeNode::description() const { if (!m_item) { - return QString(); + return {}; } return m_item->description(); @@ -88,7 +88,7 @@ QString QmlBookmarkTreeNode::description() const QString QmlBookmarkTreeNode::keyword() const { if (!m_item) { - return QString(); + return {}; } return m_item->keyword(); diff --git a/src/lib/plugins/qml/api/browseraction/qmlbrowseraction.cpp b/src/lib/plugins/qml/api/browseraction/qmlbrowseraction.cpp index 8ab4f250a..d867f10ef 100644 --- a/src/lib/plugins/qml/api/browseraction/qmlbrowseraction.cpp +++ b/src/lib/plugins/qml/api/browseraction/qmlbrowseraction.cpp @@ -243,10 +243,10 @@ void QmlBrowserActionButton::positionPopup(ClickController *clickController) return; } - QQuickWidget *quickWidget = new QQuickWidget(); + auto *quickWidget = new QQuickWidget(); quickWidget->setContent(m_popup->url(), m_popup, m_popup->create(m_popup->creationContext())); - QWidget *widget = new QWidget(); + auto *widget = new QWidget(); quickWidget->setParent(widget); widget->setWindowFlag(Qt::Popup); diff --git a/src/lib/plugins/qml/api/cookies/qmlcookie.cpp b/src/lib/plugins/qml/api/cookies/qmlcookie.cpp index d653824fa..1526ca1c1 100644 --- a/src/lib/plugins/qml/api/cookies/qmlcookie.cpp +++ b/src/lib/plugins/qml/api/cookies/qmlcookie.cpp @@ -28,7 +28,7 @@ QmlCookie::QmlCookie(QNetworkCookie *cookie, QObject *parent) QString QmlCookie::domain() const { if (!m_cookie) { - return QString(); + return {}; } return m_cookie->domain(); } @@ -36,7 +36,7 @@ QString QmlCookie::domain() const QDateTime QmlCookie::expirationDate() const { if (!m_cookie) { - return QDateTime(); + return {}; } return m_cookie->expirationDate(); } @@ -44,7 +44,7 @@ QDateTime QmlCookie::expirationDate() const QString QmlCookie::name() const { if (!m_cookie) { - return QString(); + return {}; } return QString(m_cookie->name()); } @@ -52,7 +52,7 @@ QString QmlCookie::name() const QString QmlCookie::path() const { if (!m_cookie) { - return QString(); + return {}; } return m_cookie->path(); } @@ -76,7 +76,7 @@ bool QmlCookie::session() const QString QmlCookie::value() const { if (!m_cookie) { - return QString(); + return {}; } return QString(m_cookie->value()); } diff --git a/src/lib/plugins/qml/api/events/qmlkeyevent.cpp b/src/lib/plugins/qml/api/events/qmlkeyevent.cpp index ece120386..33092056c 100644 --- a/src/lib/plugins/qml/api/events/qmlkeyevent.cpp +++ b/src/lib/plugins/qml/api/events/qmlkeyevent.cpp @@ -83,7 +83,7 @@ quint32 QmlKeyEvent::nativeVirtualKey() const QString QmlKeyEvent::text() const { if (!m_keyEvent) { - return QString(); + return {}; } return m_keyEvent->text(); } diff --git a/src/lib/plugins/qml/api/extensionscheme/qmlextensionscheme.cpp b/src/lib/plugins/qml/api/extensionscheme/qmlextensionscheme.cpp index b2063edb8..35e7a05e0 100644 --- a/src/lib/plugins/qml/api/extensionscheme/qmlextensionscheme.cpp +++ b/src/lib/plugins/qml/api/extensionscheme/qmlextensionscheme.cpp @@ -27,7 +27,7 @@ QmlExtensionScheme::QmlExtensionScheme(QObject *parent) { m_schemeHandler = new QmlExtensionSchemeHandler; connect(m_schemeHandler, &QmlExtensionSchemeHandler::_requestStarted, this, [this](QWebEngineUrlRequestJob *job) { - QmlWebEngineUrlRequestJob *qmlRequest = new QmlWebEngineUrlRequestJob(job); + auto *qmlRequest = new QmlWebEngineUrlRequestJob(job); const QJSValue request = qmlEngine(this)->newQObject(qmlRequest); emit requestStarted(request); }); diff --git a/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp b/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp index 930679365..52eb2dfb3 100644 --- a/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp +++ b/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp @@ -55,7 +55,7 @@ void QmlWebEngineUrlRequestJob::reply(const QVariantMap &map) } QByteArray content = map.value(QSL("content")).toString().toUtf8(); QByteArray contentType = map.value(QSL("contentType")).toString().toUtf8(); - QBuffer *buffer = new QBuffer(); + auto *buffer = new QBuffer(); buffer->open(QIODevice::ReadWrite); buffer->write(content); buffer->seek(0); @@ -64,7 +64,7 @@ void QmlWebEngineUrlRequestJob::reply(const QVariantMap &map) QString QmlWebEngineUrlRequestJob::initiator() const { if (!m_job) { - return QString(); + return {}; } QString initiatorString; initiatorString = QString::fromUtf8(m_job->initiator().toEncoded()); @@ -74,7 +74,7 @@ QString QmlWebEngineUrlRequestJob::initiator() const QString QmlWebEngineUrlRequestJob::requestUrl() const { if (!m_job) { - return QString(); + return {}; } return QString::fromUtf8(m_job->requestUrl().toEncoded()); } @@ -82,7 +82,7 @@ QString QmlWebEngineUrlRequestJob::requestUrl() const QString QmlWebEngineUrlRequestJob::requestMethod() const { if (!m_job) { - return QString(); + return {}; } return QString::fromUtf8(m_job->requestMethod()); } diff --git a/src/lib/plugins/qml/api/fileutils/qmlfileutils.cpp b/src/lib/plugins/qml/api/fileutils/qmlfileutils.cpp index 5d5d799aa..82605d7d7 100644 --- a/src/lib/plugins/qml/api/fileutils/qmlfileutils.cpp +++ b/src/lib/plugins/qml/api/fileutils/qmlfileutils.cpp @@ -35,7 +35,7 @@ QString QmlFileUtils::resolve(const QString &filePath) if (resolvedPath.contains(m_path)) { return resolvedPath; } - return QString(); + return {}; } QByteArray QmlFileUtils::readAllFileContents(const QString &fileName) diff --git a/src/lib/plugins/qml/api/menus/qmlaction.cpp b/src/lib/plugins/qml/api/menus/qmlaction.cpp index 4a410f01e..d2631f9a0 100644 --- a/src/lib/plugins/qml/api/menus/qmlaction.cpp +++ b/src/lib/plugins/qml/api/menus/qmlaction.cpp @@ -26,7 +26,7 @@ QmlAction::QmlAction(QAction *action, QmlEngine *engine, QObject *parent) : QObject(parent) , m_action(action) { - QmlEngine *qmlEngine = qobject_cast(engine); + auto *qmlEngine = qobject_cast(engine); m_pluginPath = qmlEngine->extensionPath(); connect(m_action, &QAction::triggered, this, &QmlAction::triggered); } diff --git a/src/lib/plugins/qml/api/menus/qmlmenu.cpp b/src/lib/plugins/qml/api/menus/qmlmenu.cpp index 39d99688c..e73447a29 100644 --- a/src/lib/plugins/qml/api/menus/qmlmenu.cpp +++ b/src/lib/plugins/qml/api/menus/qmlmenu.cpp @@ -38,8 +38,8 @@ QmlAction *QmlMenu::addAction(const QVariantMap &map) return nullptr; } - QAction *action = new QAction(); - QmlAction *qmlAction = new QmlAction(action, m_engine, this); + auto *action = new QAction(); + auto *qmlAction = new QmlAction(action, m_engine, this); qmlAction->setProperties(map); m_menu->addAction(action); @@ -52,7 +52,7 @@ QmlMenu *QmlMenu::addMenu(const QVariantMap &map) return nullptr; } - QMenu *newMenu = new QMenu(); + auto *newMenu = new QMenu(); for (auto it = map.cbegin(); it != map.cend(); it++) { const QString key = it.key(); if (key == QSL("icon")) { @@ -64,7 +64,7 @@ QmlMenu *QmlMenu::addMenu(const QVariantMap &map) newMenu->setProperty(key.toUtf8(), map.value(key)); } m_menu->addMenu(newMenu); - QmlMenu *newQmlMenu = new QmlMenu(newMenu, m_engine, this); + auto *newQmlMenu = new QmlMenu(newMenu, m_engine, this); return newQmlMenu; } diff --git a/src/lib/plugins/qml/api/settings/qmlsettings.cpp b/src/lib/plugins/qml/api/settings/qmlsettings.cpp index d385668fe..2a2087f96 100644 --- a/src/lib/plugins/qml/api/settings/qmlsettings.cpp +++ b/src/lib/plugins/qml/api/settings/qmlsettings.cpp @@ -44,12 +44,12 @@ bool QmlSettings::setValue(const QVariantMap &map) QVariant QmlSettings::value(const QVariantMap &map) { if (!m_settings) { - return QVariant(); + return {}; } if (!map.contains(QSL("key"))) { qWarning() << "Unable to get value:" << "key not defined"; - return QVariant(); + return {}; } const QString key = map.value(QSL("key")).toString(); diff --git a/src/lib/plugins/qml/api/sidebar/qmlsidebar.cpp b/src/lib/plugins/qml/api/sidebar/qmlsidebar.cpp index 247cf0f65..71ea055f7 100644 --- a/src/lib/plugins/qml/api/sidebar/qmlsidebar.cpp +++ b/src/lib/plugins/qml/api/sidebar/qmlsidebar.cpp @@ -131,7 +131,7 @@ QString QmlSideBarHelper::title() const QAction *QmlSideBarHelper::createMenuAction() { - QAction *action = new QAction(m_title); + auto *action = new QAction(m_title); action->setShortcut(QKeySequence(m_shortcut)); action->setCheckable(m_checkable); if (!m_item) { @@ -151,7 +151,7 @@ QWidget *QmlSideBarHelper::createSideBarWidget(BrowserWindow *mainWindow) { Q_UNUSED(mainWindow) - QQuickWidget *widget = new QQuickWidget(); + auto *widget = new QQuickWidget(); widget->setContent(m_item->url(), m_item, m_item->create(m_item->creationContext())); widget->setResizeMode(QQuickWidget::SizeRootObjectToView); diff --git a/src/lib/plugins/qml/api/tabs/qmltab.cpp b/src/lib/plugins/qml/api/tabs/qmltab.cpp index 8f0c069e5..1ab982be4 100644 --- a/src/lib/plugins/qml/api/tabs/qmltab.cpp +++ b/src/lib/plugins/qml/api/tabs/qmltab.cpp @@ -203,7 +203,7 @@ void QmlTab::sendPageByMail() QVariant QmlTab::execJavaScript(const QJSValue &value) { if (!m_webPage && !m_webTab) { - return QVariant(); + return {}; } WebPage *webPage = m_webPage; if (!m_webPage) { @@ -228,7 +228,7 @@ QmlWebHitTestResult *QmlTab::hitTestContent(const QPoint &point) QString QmlTab::url() const { if (!m_webTab) { - return QString(); + return {}; } return QString::fromUtf8(m_webTab->url().toEncoded()); @@ -237,7 +237,7 @@ QString QmlTab::url() const QString QmlTab::title() const { if (!m_webTab) { - return QString(); + return {}; } return m_webTab->title(); @@ -367,7 +367,7 @@ void QmlTab::setWebPage(WebPage *webPage) removeConnections(); } m_webPage = webPage; - TabbedWebView *tabbedWebView = qobject_cast(m_webPage->view()); + auto *tabbedWebView = qobject_cast(m_webPage->view()); m_webTab = tabbedWebView->webTab(); if (m_webTab) { createConnections(); diff --git a/src/lib/plugins/qml/api/tabs/qmltabs.cpp b/src/lib/plugins/qml/api/tabs/qmltabs.cpp index 5b4559680..9da095b86 100644 --- a/src/lib/plugins/qml/api/tabs/qmltabs.cpp +++ b/src/lib/plugins/qml/api/tabs/qmltabs.cpp @@ -263,7 +263,7 @@ QList QmlTabs::getAll(const QVariantMap &map) const { const auto window = getWindow(map); if (!window) { - return QList(); + return {}; } const bool withPinned = map.value(QSL("withPinned")).toBool(); diff --git a/src/lib/plugins/qml/api/userscript/qmlexternaljsobject.cpp b/src/lib/plugins/qml/api/userscript/qmlexternaljsobject.cpp index cc0629b88..a95949d7d 100644 --- a/src/lib/plugins/qml/api/userscript/qmlexternaljsobject.cpp +++ b/src/lib/plugins/qml/api/userscript/qmlexternaljsobject.cpp @@ -39,7 +39,7 @@ void QmlExternalJsObject::registerExtraObject(const QVariantMap &map) } const QString id = map.value(QSL("id")).toString(); - QObject *object = qvariant_cast(map.value(QSL("object"))); + auto *object = qvariant_cast(map.value(QSL("object"))); if (!object) { qWarning() << "Unable to cast to QObject"; return; diff --git a/src/lib/plugins/qml/api/userscript/qmluserscripts.cpp b/src/lib/plugins/qml/api/userscript/qmluserscripts.cpp index 841043967..9ff176519 100644 --- a/src/lib/plugins/qml/api/userscript/qmluserscripts.cpp +++ b/src/lib/plugins/qml/api/userscript/qmluserscripts.cpp @@ -46,7 +46,7 @@ QList QmlUserScripts::toQObjectList(const QList &lis QList userScriptList; userScriptList.reserve(list.size()); for (const QWebEngineScript &script : list) { - QmlUserScript *userScript = new QmlUserScript(); + auto *userScript = new QmlUserScript(); userScript->setWebEngineScript(script); userScriptList.append(userScript); } @@ -55,7 +55,7 @@ QList QmlUserScripts::toQObjectList(const QList &lis bool QmlUserScripts::contains(QObject *object) const { - QmlUserScript *userScript = qobject_cast(object); + auto *userScript = qobject_cast(object); if (!userScript) { return false; } @@ -66,7 +66,7 @@ bool QmlUserScripts::contains(QObject *object) const QObject *QmlUserScripts::findScript(const QString &name) const { QWebEngineScript webEngineScript = mApp->webProfile()->scripts()->findScript(name); - QmlUserScript *qmlUserScript = new QmlUserScript(); + auto *qmlUserScript = new QmlUserScript(); qmlUserScript->setWebEngineScript(webEngineScript); return qmlUserScript; } @@ -79,7 +79,7 @@ QList QmlUserScripts::findScripts(const QString &name) const void QmlUserScripts::remove(QObject *object) const { - QmlUserScript *userScript = qobject_cast(object); + auto *userScript = qobject_cast(object); if (!userScript) { return; } @@ -95,7 +95,7 @@ QList QmlUserScripts::toList() const void QmlUserScripts::insert(QObject *object) { - QmlUserScript *userScript = qobject_cast(object); + auto *userScript = qobject_cast(object); if (!userScript) { return; } diff --git a/src/lib/plugins/qml/api/windows/qmlwindow.cpp b/src/lib/plugins/qml/api/windows/qmlwindow.cpp index 4368b32dd..524e0dd6f 100644 --- a/src/lib/plugins/qml/api/windows/qmlwindow.cpp +++ b/src/lib/plugins/qml/api/windows/qmlwindow.cpp @@ -46,7 +46,7 @@ bool QmlWindow::incognito() const QString QmlWindow::title() const { if (!m_window) { - return QString(); + return {}; } return m_window->windowTitle(); @@ -90,7 +90,7 @@ QmlEnums::WindowType QmlWindow::type() const QList QmlWindow::tabs() const { if (!m_window) { - return QList(); + return {}; } QList list; diff --git a/src/lib/plugins/qml/qmlplugin.cpp b/src/lib/plugins/qml/qmlplugin.cpp index 043b204a1..be5bf6a88 100644 --- a/src/lib/plugins/qml/qmlplugin.cpp +++ b/src/lib/plugins/qml/qmlplugin.cpp @@ -25,8 +25,7 @@ #include QmlPlugin::QmlPlugin() -{ -} += default; Plugins::Plugin QmlPlugin::loadPlugin(const QString &name) { @@ -43,7 +42,7 @@ Plugins::Plugin QmlPlugin::loadPlugin(const QString &name) fullPath = DataPaths::locate(DataPaths::Plugins, name); if (fullPath.isEmpty()) { qWarning() << "QML plugin" << name << "not found"; - return Plugins::Plugin(); + return {}; } } diff --git a/src/lib/plugins/qml/qmlplugininterface.cpp b/src/lib/plugins/qml/qmlplugininterface.cpp index 9363d15ef..4f03c3ab8 100644 --- a/src/lib/plugins/qml/qmlplugininterface.cpp +++ b/src/lib/plugins/qml/qmlplugininterface.cpp @@ -95,8 +95,8 @@ void QmlPluginInterface::populateWebViewMenu(QMenu *menu, WebView *webview, cons return; } - QmlMenu *qmlMenu = new QmlMenu(menu, m_engine); - QmlWebHitTestResult *qmlWebHitTestResult = new QmlWebHitTestResult(webHitTestResult); + auto *qmlMenu = new QmlMenu(menu, m_engine); + auto *qmlWebHitTestResult = new QmlWebHitTestResult(webHitTestResult); QJSValueList args; args.append(m_engine->newQObject(qmlMenu)); args.append(m_engine->newQObject(qmlWebHitTestResult)); @@ -111,7 +111,7 @@ void QmlPluginInterface::showSettings(QWidget *parent) return; } - QQuickWidget *widget = new QQuickWidget(); + auto *widget = new QQuickWidget(); widget->setContent(m_settingsWindow->url(), m_settingsWindow, m_settingsWindow->create(m_settingsWindow->creationContext())); widget->show(); diff --git a/src/lib/plugins/qml/qmlplugins.cpp b/src/lib/plugins/qml/qmlplugins.cpp index fd9c29536..cfe4969ab 100644 --- a/src/lib/plugins/qml/qmlplugins.cpp +++ b/src/lib/plugins/qml/qmlplugins.cpp @@ -116,7 +116,7 @@ void QmlPlugins::registerQmlTypes() qmlRegisterSingletonType(url, majorVersion, minorVersion, "Notifications", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject * { Q_UNUSED(scriptEngine) - QmlEngine *qmlEngine = qobject_cast(engine); + auto *qmlEngine = qobject_cast(engine); if (!qmlEngine) { qWarning() << "Unable to cast QQmlEngine * to QmlEngine *"; return nullptr; @@ -202,7 +202,7 @@ void QmlPlugins::registerQmlTypes() qmlRegisterSingletonType(url, majorVersion, minorVersion, "FileUtils", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject * { Q_UNUSED(scriptEngine) - QmlEngine *qmlEngine = qobject_cast(engine); + auto *qmlEngine = qobject_cast(engine); if (!qmlEngine) { qWarning() << "Unable to cast QQmlEngine * to QmlEngine *"; return nullptr; diff --git a/src/lib/plugins/qml/qmlstaticdata.cpp b/src/lib/plugins/qml/qmlstaticdata.cpp index f2cf1fd0c..a450384db 100644 --- a/src/lib/plugins/qml/qmlstaticdata.cpp +++ b/src/lib/plugins/qml/qmlstaticdata.cpp @@ -139,63 +139,63 @@ QIcon QmlStaticData::getIcon(const QString &iconPath, const QString &pluginPath) QmlBookmarks *QmlStaticData::getBookmarksSingleton() { - static QmlBookmarks *bookmarks = new QmlBookmarks(this); + static auto *bookmarks = new QmlBookmarks(this); QQmlEngine::setObjectOwnership(bookmarks, QQmlEngine::CppOwnership); return bookmarks; } QmlHistory *QmlStaticData::getHistorySingleton() { - static QmlHistory *history = new QmlHistory(this); + static auto *history = new QmlHistory(this); QQmlEngine::setObjectOwnership(history, QQmlEngine::CppOwnership); return history; } QmlCookies *QmlStaticData::getCookiesSingleton() { - static QmlCookies *cookies = new QmlCookies(this); + static auto *cookies = new QmlCookies(this); QQmlEngine::setObjectOwnership(cookies, QQmlEngine::CppOwnership); return cookies; } QmlTopSites *QmlStaticData::getTopSitesSingleton() { - static QmlTopSites *topSites = new QmlTopSites(this); + static auto *topSites = new QmlTopSites(this); QQmlEngine::setObjectOwnership(topSites, QQmlEngine::CppOwnership); return topSites; } QmlTabs *QmlStaticData::getTabsSingleton() { - static QmlTabs *tabs = new QmlTabs(this); + static auto *tabs = new QmlTabs(this); QQmlEngine::setObjectOwnership(tabs, QQmlEngine::CppOwnership); return tabs; } QmlClipboard *QmlStaticData::getClipboardSingleton() { - static QmlClipboard *clipboard = new QmlClipboard(this); + static auto *clipboard = new QmlClipboard(this); QQmlEngine::setObjectOwnership(clipboard, QQmlEngine::CppOwnership); return clipboard; } QmlWindows *QmlStaticData::getWindowsSingleton() { - static QmlWindows *windows = new QmlWindows(this); + static auto *windows = new QmlWindows(this); QQmlEngine::setObjectOwnership(windows, QQmlEngine::CppOwnership); return windows; } QmlExternalJsObject *QmlStaticData::getExternalJsObjectSingleton() { - static QmlExternalJsObject *externalJsObject = new QmlExternalJsObject(this); + static auto *externalJsObject = new QmlExternalJsObject(this); QQmlEngine::setObjectOwnership(externalJsObject, QQmlEngine::CppOwnership); return externalJsObject; } QmlUserScripts *QmlStaticData::getUserScriptsSingleton() { - static QmlUserScripts *userScripts = new QmlUserScripts(this); + static auto *userScripts = new QmlUserScripts(this); QQmlEngine::setObjectOwnership(userScripts, QQmlEngine::CppOwnership); return userScripts; } diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp index f1c3ed4f5..ec178c737 100644 --- a/src/lib/plugins/speeddial.cpp +++ b/src/lib/plugins/speeddial.cpp @@ -102,7 +102,7 @@ SpeedDial::Page SpeedDial::pageForUrl(const QUrl &url) } } - return Page(); + return {}; } QUrl SpeedDial::urlForShortcut(int key) @@ -110,7 +110,7 @@ QUrl SpeedDial::urlForShortcut(int key) ENSURE_LOADED; if (key < 0 || m_pages.count() <= key) { - return QUrl(); + return {}; } return QUrl::fromEncoded(m_pages.at(key).url.toUtf8()); @@ -258,7 +258,7 @@ void SpeedDial::changed(const QString &allPages) void SpeedDial::loadThumbnail(const QString &url, bool loadTitle) { - PageThumbnailer* thumbnailer = new PageThumbnailer(this); + auto* thumbnailer = new PageThumbnailer(this); thumbnailer->setUrl(QUrl::fromEncoded(url.toUtf8())); thumbnailer->setLoadTitle(loadTitle); connect(thumbnailer, &PageThumbnailer::thumbnailCreated, this, &SpeedDial::thumbnailCreated); @@ -281,7 +281,7 @@ QStringList SpeedDial::getOpenFileName() const QString image = QzTools::getOpenFileName("SpeedDial-GetOpenFileName", 0, tr("Click to select image..."), QDir::homePath(), fileTypes); if (image.isEmpty()) - return QStringList(); + return {}; return {QzTools::pixmapToDataUrl(QPixmap(image)).toString(), QUrl::fromLocalFile(image).toEncoded()}; } @@ -321,7 +321,7 @@ void SpeedDial::setSdCentered(bool centered) void SpeedDial::thumbnailCreated(const QPixmap &pixmap) { - PageThumbnailer* thumbnailer = qobject_cast(sender()); + auto* thumbnailer = qobject_cast(sender()); if (!thumbnailer) { return; } @@ -370,7 +370,7 @@ QString SpeedDial::generateAllPages() QString allPages; for (const Page &page : qAsConst(m_pages)) { - const QString string = QString("url:\"%1\"|title:\"%2\";").arg(page.url, page.title); + const QString string = QString(R"(url:"%1"|title:"%2";)").arg(page.url, page.title); allPages.append(string); } diff --git a/src/lib/popupwindow/popuplocationbar.cpp b/src/lib/popupwindow/popuplocationbar.cpp index aed2b3b40..3fe303a96 100644 --- a/src/lib/popupwindow/popuplocationbar.cpp +++ b/src/lib/popupwindow/popuplocationbar.cpp @@ -53,7 +53,7 @@ PopupLocationBar::PopupLocationBar(QWidget* parent) m_bookmarkIcon = new BookmarksIcon(this); m_autofillIcon = new AutoFillIcon(this); - QWidget* rightSpacer = new QWidget(this); + auto* rightSpacer = new QWidget(this); rightSpacer->setFixedWidth(3); addWidget(m_siteIcon, LineEdit::LeftSide); @@ -88,7 +88,7 @@ void PopupLocationBar::stopLoading() { m_bookmarkIcon->checkBookmark(m_view->url()); - WebPage* page = qobject_cast(m_view->page()); + auto* page = qobject_cast(m_view->page()); if (page && !page->autoFillUsernames().isEmpty()) { m_autofillIcon->setUsernames(page->autoFillUsernames()); diff --git a/src/lib/popupwindow/popupwindow.cpp b/src/lib/popupwindow/popupwindow.cpp index 833da0733..2e290d3e8 100644 --- a/src/lib/popupwindow/popupwindow.cpp +++ b/src/lib/popupwindow/popupwindow.cpp @@ -44,8 +44,8 @@ PopupWindow::PopupWindow(PopupWebView* view) m_locationBar = new PopupLocationBar(this); m_locationBar->setView(m_view); - QWidget *locationWidget = new QWidget(this); - QVBoxLayout *llayout = new QVBoxLayout(); + auto *locationWidget = new QWidget(this); + auto *llayout = new QVBoxLayout(); llayout->setContentsMargins(3, 3, 3, 5); llayout->addWidget(m_locationBar); locationWidget->setLayout(llayout); @@ -66,12 +66,12 @@ PopupWindow::PopupWindow(PopupWebView* view) pal.setColor(QPalette::Window, pal.window().color().darker(110)); m_notificationWidget->setPalette(pal); - QVBoxLayout *nlayout = new QVBoxLayout(m_notificationWidget); + auto *nlayout = new QVBoxLayout(m_notificationWidget); nlayout->setSizeConstraint(QLayout::SetMinAndMaxSize); nlayout->setContentsMargins(0, 0, 0, 0); nlayout->setSpacing(1); - QWidget *viewSpacer = new QWidget(this); + auto *viewSpacer = new QWidget(this); pal = viewSpacer->palette(); pal.setColor(QPalette::Window, pal.window().color().darker(125)); viewSpacer->setPalette(pal); @@ -80,7 +80,7 @@ PopupWindow::PopupWindow(PopupWebView* view) m_menuBar = new QMenuBar(this); - QMenu* menuFile = new QMenu(tr("File")); + auto* menuFile = new QMenu(tr("File")); menuFile->addAction(QIcon::fromTheme("mail-message-new"), tr("Send Link..."), m_view, &WebView::sendPageByMail); menuFile->addAction(QIcon::fromTheme("document-print"), tr("&Print..."), m_view, &WebView::printPage)->setShortcut(QKeySequence("Ctrl+P")); menuFile->addSeparator(); @@ -121,12 +121,12 @@ PopupWindow::PopupWindow(PopupWebView* view) addAction(action); } - QVBoxLayout *l = new QVBoxLayout(); + auto *l = new QVBoxLayout(); l->setContentsMargins(0, 0, 0, 0); l->setSpacing(0); l->addWidget(m_view); - QWidget *viewWidget = new QWidget(this); + auto *viewWidget = new QWidget(this); viewWidget->setLayout(l); m_layout->insertWidget(0, m_menuBar); diff --git a/src/lib/preferences/acceptlanguage.cpp b/src/lib/preferences/acceptlanguage.cpp index 6008fe9ec..7b4fdc813 100644 --- a/src/lib/preferences/acceptlanguage.cpp +++ b/src/lib/preferences/acceptlanguage.cpp @@ -56,7 +56,7 @@ QStringList AcceptLanguage::defaultLanguage() QByteArray AcceptLanguage::generateHeader(const QStringList &langs) { if (langs.isEmpty()) { - return QByteArray(); + return {}; } QByteArray header; diff --git a/src/lib/preferences/autofillmanager.cpp b/src/lib/preferences/autofillmanager.cpp index f27f5a077..59c9ce632 100644 --- a/src/lib/preferences/autofillmanager.cpp +++ b/src/lib/preferences/autofillmanager.cpp @@ -63,7 +63,7 @@ AutoFillManager::AutoFillManager(QWidget* parent) ui->treePass->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->treePass, &TreeWidget::customContextMenuRequested, this, &AutoFillManager::passwordContextMenu); - QMenu* menu = new QMenu(this); + auto* menu = new QMenu(this); menu->addAction(tr("Import Passwords from File..."), this, &AutoFillManager::importPasswords); menu->addAction(tr("Export Passwords to File..."), this, &AutoFillManager::exportPasswords); ui->importExport->setMenu(menu); @@ -86,7 +86,7 @@ void AutoFillManager::loadPasswords() ui->treePass->clear(); for (const PasswordEntry &entry : allEntries) { - QTreeWidgetItem* item = new QTreeWidgetItem(ui->treePass); + auto* item = new QTreeWidgetItem(ui->treePass); item->setText(0, entry.host); item->setText(1, entry.username); item->setText(2, "*****"); @@ -101,7 +101,7 @@ void AutoFillManager::loadPasswords() query.exec("SELECT server, id FROM autofill_exceptions"); ui->treeExcept->clear(); while (query.next()) { - QTreeWidgetItem* item = new QTreeWidgetItem(ui->treeExcept); + auto* item = new QTreeWidgetItem(ui->treeExcept); item->setText(0, query.value(0).toString()); item->setData(0, Qt::UserRole + 10, query.value(1).toString()); ui->treeExcept->addTopLevelItem(item); @@ -367,7 +367,7 @@ void AutoFillManager::currentPasswordBackendChanged() void AutoFillManager::passwordContextMenu(const QPoint &pos) { - QMenu *menu = new QMenu; + auto *menu = new QMenu; menu->setAttribute(Qt::WA_DeleteOnClose); menu->addAction(tr("Copy Username"), this, &AutoFillManager::copyUsername); menu->addAction(tr("Copy Password"), this, &AutoFillManager::copyPassword); diff --git a/src/lib/preferences/pluginsmanager.cpp b/src/lib/preferences/pluginsmanager.cpp index 0b4a2e9d9..d2c8a1308 100644 --- a/src/lib/preferences/pluginsmanager.cpp +++ b/src/lib/preferences/pluginsmanager.cpp @@ -105,7 +105,7 @@ void PluginsManager::refresh() for (const Plugins::Plugin &plugin : allPlugins) { PluginSpec spec = plugin.pluginSpec; - QListWidgetItem* item = new QListWidgetItem(ui->list); + auto* item = new QListWidgetItem(ui->list); QIcon icon = QIcon(spec.icon); if (icon.isNull()) { icon = QIcon(QSL(":/icons/preferences/extensions.svg")); diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp index a1b463d48..1886181dc 100644 --- a/src/lib/preferences/preferences.cpp +++ b/src/lib/preferences/preferences.cpp @@ -76,7 +76,7 @@ static QString createLanguageItem(const QString &lang) return QString::fromUtf8("Castellano"); } if (lang == QLatin1String("nqo")) { - return QString("N'ko (nqo)"); + return {"N'ko (nqo)"}; } if (lang == QLatin1String("sr")) { return QString::fromUtf8("српски екавски"); @@ -451,7 +451,7 @@ Preferences::Preferences(BrowserWindow* window) if (!ui->spellcheckLanguages->findItems(langName, Qt::MatchExactly).isEmpty()) { continue; } - QListWidgetItem *item = new QListWidgetItem; + auto *item = new QListWidgetItem; item->setText(langName); item->setData(Qt::UserRole, lang); item->setFlags(item->flags() & ~Qt::ItemIsSelectable); @@ -666,7 +666,7 @@ void Preferences::deleteHtml5storage() void Preferences::openUserAgentManager() { - UserAgentDialog* dialog = new UserAgentDialog(this); + auto* dialog = new UserAgentDialog(this); dialog->open(); } @@ -703,19 +703,19 @@ void Preferences::allowHtml5storageChanged(bool stat) void Preferences::showCookieManager() { - CookieManager* dialog = new CookieManager(this); + auto* dialog = new CookieManager(this); dialog->show(); } void Preferences::showHtml5Permissions() { - HTML5PermissionsDialog* dialog = new HTML5PermissionsDialog(this); + auto* dialog = new HTML5PermissionsDialog(this); dialog->open(); } void Preferences::openJsOptions() { - JsOptions* dialog = new JsOptions(this); + auto* dialog = new JsOptions(this); dialog->open(); } @@ -728,19 +728,19 @@ void Preferences::useExternalDownManagerChanged(bool state) void Preferences::openSearchEnginesManager() { - SearchEnginesDialog* dialog = new SearchEnginesDialog(this); + auto* dialog = new SearchEnginesDialog(this); dialog->open(); } void Preferences::openProtocolHandlersManager() { - ProtocolHandlerDialog *dialog = new ProtocolHandlerDialog(this); + auto *dialog = new ProtocolHandlerDialog(this); dialog->open(); } void Preferences::showAcceptLanguage() { - AcceptLanguage* dialog = new AcceptLanguage(this); + auto* dialog = new AcceptLanguage(this); dialog->open(); } diff --git a/src/lib/preferences/thememanager.cpp b/src/lib/preferences/thememanager.cpp index fc526e4a3..4fa909343 100644 --- a/src/lib/preferences/thememanager.cpp +++ b/src/lib/preferences/thememanager.cpp @@ -55,7 +55,7 @@ ThemeManager::ThemeManager(QWidget* parent, Preferences* preferences) continue; } - QListWidgetItem* item = new QListWidgetItem(ui->listWidget); + auto* item = new QListWidgetItem(ui->listWidget); item->setText(themeInfo.name); item->setIcon(themeInfo.icon); item->setData(Qt::UserRole, name); @@ -84,7 +84,7 @@ void ThemeManager::showLicense() Theme currentTheme = m_themeHash[currentItem->data(Qt::UserRole).toString()]; - LicenseViewer* v = new LicenseViewer(m_preferences); + auto* v = new LicenseViewer(m_preferences); v->setText(currentTheme.license); v->show(); } diff --git a/src/lib/preferences/useragentdialog.cpp b/src/lib/preferences/useragentdialog.cpp index cd7fa51ab..f3264c2a1 100644 --- a/src/lib/preferences/useragentdialog.cpp +++ b/src/lib/preferences/useragentdialog.cpp @@ -67,8 +67,8 @@ UserAgentDialog::UserAgentDialog(QWidget* parent) while (i.hasNext()) { i.next(); - QTableWidgetItem* siteItem = new QTableWidgetItem(i.key()); - QTableWidgetItem* userAgentItem = new QTableWidgetItem(i.value()); + auto* siteItem = new QTableWidgetItem(i.key()); + auto* userAgentItem = new QTableWidgetItem(i.value()); int row = ui->table->rowCount(); @@ -97,8 +97,8 @@ void UserAgentDialog::addSite() QString userAgent; if (showEditDialog(tr("Add new site"), &site, &userAgent)) { - QTableWidgetItem* siteItem = new QTableWidgetItem(site); - QTableWidgetItem* userAgentItem = new QTableWidgetItem(userAgent); + auto* siteItem = new QTableWidgetItem(site); + auto* userAgentItem = new QTableWidgetItem(userAgent); int row = ui->table->rowCount(); @@ -198,15 +198,15 @@ bool UserAgentDialog::showEditDialog(const QString &title, QString* rSite, QStri return false; } - QDialog* dialog = new QDialog(this); - QFormLayout* layout = new QFormLayout(dialog); - QLineEdit* editSite = new QLineEdit(dialog); - QComboBox* editAgent = new QComboBox(dialog); + auto* dialog = new QDialog(this); + auto* layout = new QFormLayout(dialog); + auto* editSite = new QLineEdit(dialog); + auto* editAgent = new QComboBox(dialog); editAgent->setLayoutDirection(Qt::LeftToRight); editAgent->setEditable(true); editAgent->addItems(m_knownUserAgents); - QDialogButtonBox* box = new QDialogButtonBox(dialog); + auto* box = new QDialogButtonBox(dialog); box->addButton(QDialogButtonBox::Ok); box->addButton(QDialogButtonBox::Cancel); diff --git a/src/lib/session/recoveryjsobject.cpp b/src/lib/session/recoveryjsobject.cpp index 8b31ac543..d2533cbd7 100644 --- a/src/lib/session/recoveryjsobject.cpp +++ b/src/lib/session/recoveryjsobject.cpp @@ -119,7 +119,7 @@ void RecoveryJsObject::restoreSession(const QStringList &excludeWin, const QStri void RecoveryJsObject::closeTab() { - TabbedWebView *view = qobject_cast(m_page->view()); + auto *view = qobject_cast(m_page->view()); if (!view) { return; } diff --git a/src/lib/session/sessionmanager.cpp b/src/lib/session/sessionmanager.cpp index 51589e7b1..94eb73ba9 100644 --- a/src/lib/session/sessionmanager.cpp +++ b/src/lib/session/sessionmanager.cpp @@ -42,7 +42,7 @@ SessionManager::SessionManager(QObject* parent) , m_firstBackupSession(DataPaths::currentProfilePath() + QL1S("/session.dat.old")) , m_secondBackupSession(DataPaths::currentProfilePath() + QL1S("/session.dat.old1")) { - QFileSystemWatcher* sessionFilesWatcher = new QFileSystemWatcher({DataPaths::path(DataPaths::Sessions)}, this); + auto* sessionFilesWatcher = new QFileSystemWatcher({DataPaths::path(DataPaths::Sessions)}, this); connect(sessionFilesWatcher, &QFileSystemWatcher::directoryChanged, this, &SessionManager::sessionsDirectoryChanged); connect(sessionFilesWatcher, &QFileSystemWatcher::directoryChanged, this, &SessionManager::sessionsMetaDataChanged); @@ -51,10 +51,10 @@ SessionManager::SessionManager(QObject* parent) void SessionManager::aboutToShowSessionsMenu() { - QMenu* menu = qobject_cast(sender()); + auto* menu = qobject_cast(sender()); menu->clear(); - QActionGroup *group = new QActionGroup(menu); + auto *group = new QActionGroup(menu); const auto sessions = sessionMetaData(/*withBackups*/ false); for (const SessionManager::SessionMetaData &metaData : sessions) { @@ -76,7 +76,7 @@ void SessionManager::sessionsDirectoryChanged() void SessionManager::openSession(QString sessionFilePath, SessionFlags flags) { if (sessionFilePath.isEmpty()) { - QAction* action = qobject_cast(sender()); + auto* action = qobject_cast(sender()); if (!action) return; @@ -115,7 +115,7 @@ void SessionManager::openSession(QString sessionFilePath, SessionFlags flags) void SessionManager::renameSession(QString sessionFilePath, SessionFlags flags) { if (sessionFilePath.isEmpty()) { - QAction* action = qobject_cast(sender()); + auto* action = qobject_cast(sender()); if (!action) return; @@ -371,7 +371,7 @@ void SessionManager::writeCurrentSession(const QString &filePath) void SessionManager::openSessionManagerDialog() { - SessionManagerDialog *dialog = new SessionManagerDialog(mApp->getWindow()); + auto *dialog = new SessionManagerDialog(mApp->getWindow()); dialog->open(); } diff --git a/src/lib/session/sessionmanagerdialog.cpp b/src/lib/session/sessionmanagerdialog.cpp index eeb391c61..3d09c58d0 100644 --- a/src/lib/session/sessionmanagerdialog.cpp +++ b/src/lib/session/sessionmanagerdialog.cpp @@ -112,7 +112,7 @@ void SessionManagerDialog::refresh() const auto sessions = mApp->sessionManager()->sessionMetaData(); for (const auto &session : sessions) { - QTreeWidgetItem *item = new QTreeWidgetItem; + auto *item = new QTreeWidgetItem; item->setText(0, session.name); item->setText(1, QFileInfo(session.filePath).lastModified().toString(Qt::DefaultLocaleShortDate)); item->setData(0, SessionFileRole, session.filePath); diff --git a/src/lib/sidebar/sidebar.cpp b/src/lib/sidebar/sidebar.cpp index 481fbc19d..79787ba75 100644 --- a/src/lib/sidebar/sidebar.cpp +++ b/src/lib/sidebar/sidebar.cpp @@ -63,14 +63,14 @@ void SideBar::setWidget(QWidget* widget) void SideBar::showBookmarks() { m_titleBar->setTitle(tr("Bookmarks")); - BookmarksSidebar* bar = new BookmarksSidebar(m_window); + auto* bar = new BookmarksSidebar(m_window); setWidget(bar); } void SideBar::showHistory() { m_titleBar->setTitle(tr("History")); - HistorySideBar* bar = new HistorySideBar(m_window); + auto* bar = new HistorySideBar(m_window); setWidget(bar); } @@ -102,7 +102,7 @@ void SideBarManager::createMenu(QMenu* menu) m_window->removeActions(menu->actions()); menu->clear(); - QActionGroup *group = new QActionGroup(menu); + auto *group = new QActionGroup(menu); QAction* act = menu->addAction(SideBar::tr("Bookmarks"), this, &SideBarManager::slotShowSideBar); act->setCheckable(true); @@ -154,7 +154,7 @@ void SideBarManager::removeSidebar(SideBarInterface *interface) void SideBarManager::slotShowSideBar() { - if (QAction* act = qobject_cast(sender())) { + if (auto* act = qobject_cast(sender())) { showSideBar(act->data().toString()); } } diff --git a/src/lib/tabwidget/combotabbar.cpp b/src/lib/tabwidget/combotabbar.cpp index 40f5fcc73..cac244467 100644 --- a/src/lib/tabwidget/combotabbar.cpp +++ b/src/lib/tabwidget/combotabbar.cpp @@ -662,7 +662,7 @@ void ComboTabBar::wheelEvent(QWheelEvent* event) bool ComboTabBar::eventFilter(QObject* obj, QEvent* ev) { if (obj == m_mainTabBar && ev->type() == QEvent::Resize) { - QResizeEvent* event = static_cast(ev); + auto* event = static_cast(ev); if (event->oldSize().height() != event->size().height()) { setUpLayout(); } @@ -1051,7 +1051,7 @@ QSize TabBarHelper::baseClassTabSizeHint(int index) const QRect TabBarHelper::draggedTabRect() const { if (!m_dragInProgress) { - return QRect(); + return {}; } QStyleOptionTab tab; @@ -1512,8 +1512,7 @@ TabScrollBar::TabScrollBar(QWidget* parent) } TabScrollBar::~TabScrollBar() -{ -} += default; bool TabScrollBar::isScrolling() const { @@ -1574,7 +1573,7 @@ TabBarScrollWidget::TabBarScrollWidget(QTabBar* tabBar, QWidget* parent) connect(m_rightScrollButton, &ToolButton::doubleClicked, this, &TabBarScrollWidget::scrollToRightEdge); connect(m_rightScrollButton, SIGNAL(middleMouseClicked()), this, SLOT(ensureVisible())); - QHBoxLayout* hLayout = new QHBoxLayout; + auto* hLayout = new QHBoxLayout; hLayout->setSpacing(0); hLayout->setContentsMargins(0, 0, 0, 0); hLayout->addWidget(m_leftScrollButton); @@ -1849,9 +1848,9 @@ void CloseButton::paintEvent(QPaintEvent*) opt.state |= QStyle::State_Sunken; } - if (TabBarHelper* tb = qobject_cast(parent())) { + if (auto* tb = qobject_cast(parent())) { int index = tb->currentIndex(); - QTabBar::ButtonPosition closeSide = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, tb); + auto closeSide = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, 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 274992b27..86ba0d628 100644 --- a/src/lib/tabwidget/tabbar.cpp +++ b/src/lib/tabwidget/tabbar.cpp @@ -114,7 +114,7 @@ TabBar::TabBar(BrowserWindow* window, TabWidget* tabWidget) tabMetrics()->init(); if (mApp->isPrivate()) { - QLabel* privateBrowsing = new QLabel(this); + auto* privateBrowsing = new QLabel(this); privateBrowsing->setObjectName(QSL("private-browsing-icon")); privateBrowsing->setPixmap(IconProvider::privateBrowsingIcon().pixmap(16)); privateBrowsing->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); @@ -193,8 +193,8 @@ QSize TabBar::tabSizeHint(int index, bool fast) const return size; } - WebTab* webTab = qobject_cast(m_tabWidget->widget(index)); - TabBar* tabBar = const_cast (this); + auto* webTab = qobject_cast(m_tabWidget->widget(index)); + auto* tabBar = const_cast (this); if (webTab && webTab->isPinned()) { size.setWidth(pinnedTabWidth); @@ -271,7 +271,7 @@ QSize TabBar::tabSizeHint(int index, bool fast) const } if (index == count() - 1) { - WebTab* lastMainActiveTab = qobject_cast(m_tabWidget->widget(mainTabBarCurrentIndex())); + auto* lastMainActiveTab = qobject_cast(m_tabWidget->widget(mainTabBarCurrentIndex())); int xForAddTabButton = cornerWidth(Qt::TopLeftCorner) + pinTabBarWidth() + normalTabsCount() * m_normalTabWidth; if (lastMainActiveTab && m_activeTabWidth > m_normalTabWidth) { @@ -330,8 +330,8 @@ void TabBar::showCloseButton(int index) return; } - WebTab* webTab = qobject_cast(m_tabWidget->widget(index)); - QAbstractButton* button = qobject_cast(tabButton(index, closeButtonPosition())); + auto* webTab = qobject_cast(m_tabWidget->widget(index)); + auto* button = qobject_cast(tabButton(index, closeButtonPosition())); if (button || (webTab && webTab->isPinned())) { return; @@ -362,7 +362,7 @@ void TabBar::hideCloseButton(int index) return; } - CloseButton* button = qobject_cast(tabButton(index, closeButtonPosition())); + auto* button = qobject_cast(tabButton(index, closeButtonPosition())); if (!button) { return; } @@ -377,8 +377,8 @@ void TabBar::updatePinnedTabCloseButton(int index) return; } - WebTab* webTab = qobject_cast(m_tabWidget->widget(index)); - QAbstractButton* button = qobject_cast(tabButton(index, closeButtonPosition())); + auto* webTab = qobject_cast(m_tabWidget->widget(index)); + auto* button = qobject_cast(tabButton(index, closeButtonPosition())); bool pinned = webTab && webTab->isPinned(); @@ -546,8 +546,8 @@ void TabBar::mouseMoveEvent(QMouseEvent* event) QMouseEvent mouse(QEvent::MouseButtonRelease, w->mapFromGlobal(global), Qt::LeftButton, Qt::LeftButton, event->modifiers()); QApplication::sendEvent(w, &mouse); } - QDrag *drag = new QDrag(this); - QMimeData *mime = new QMimeData; + auto *drag = new QDrag(this); + auto *mime = new QMimeData; mime->setData(MIMETYPE, QByteArray()); drag->setMimeData(mime); drag->setPixmap(tabPixmap(currentIndex())); @@ -678,7 +678,7 @@ void TabBar::dropEvent(QDropEvent* event) event->acceptProposedAction(); - TabBar *sourceTabBar = qobject_cast(event->source()); + auto *sourceTabBar = qobject_cast(event->source()); int index = tabAt(event->pos()); if (index == -1) { diff --git a/src/lib/tabwidget/tabicon.cpp b/src/lib/tabwidget/tabicon.cpp index 710979b05..499ecd8a5 100644 --- a/src/lib/tabwidget/tabicon.cpp +++ b/src/lib/tabwidget/tabicon.cpp @@ -163,7 +163,7 @@ bool TabIcon::shouldBeVisible() const bool TabIcon::event(QEvent *event) { if (event->type() == QEvent::ToolTip) { - QHelpEvent *e = static_cast(event); + auto *e = static_cast(event); if (m_audioIconDisplayed && m_audioIconRect.contains(e->pos())) { QToolTip::showText(e->globalPos(), m_tab->isMuted() ? tr("Unmute Tab") : tr("Mute Tab"), this); event->accept(); diff --git a/src/lib/tabwidget/tabmodel.cpp b/src/lib/tabwidget/tabmodel.cpp index 1b790e87f..d62c341f9 100644 --- a/src/lib/tabwidget/tabmodel.cpp +++ b/src/lib/tabwidget/tabmodel.cpp @@ -64,7 +64,7 @@ QModelIndex TabModel::tabIndex(WebTab *tab) const { const int idx = m_tabs.indexOf(tab); if (idx < 0) { - return QModelIndex(); + return {}; } return index(idx); } @@ -93,12 +93,12 @@ Qt::ItemFlags TabModel::flags(const QModelIndex &index) const QVariant TabModel::data(const QModelIndex &index, int role) const { if (index.row() < 0 || index.row() > m_tabs.count()) { - return QVariant(); + return {}; } WebTab *t = tab(index); if (!t) { - return QVariant(); + return {}; } switch (role) { @@ -135,7 +135,7 @@ QVariant TabModel::data(const QModelIndex &index, int role) const return t->backgroundActivity(); default: - return QVariant(); + return {}; } } @@ -154,11 +154,11 @@ QMimeData *TabModel::mimeData(const QModelIndexList &indexes) const if (indexes.isEmpty()) { return nullptr; } - WebTab *tab = indexes.at(0).data(WebTabRole).value(); + auto *tab = indexes.at(0).data(WebTabRole).value(); if (!tab) { return nullptr; } - TabModelMimeData *mimeData = new TabModelMimeData; + auto *mimeData = new TabModelMimeData; mimeData->setTab(tab); return mimeData; } @@ -169,7 +169,7 @@ bool TabModel::canDropMimeData(const QMimeData *data, Qt::DropAction action, int if (action != Qt::MoveAction || parent.isValid() || column > 0 || !m_window) { return false; } - const TabModelMimeData *mimeData = qobject_cast(data); + const auto *mimeData = qobject_cast(data); if (!mimeData) { return false; } @@ -182,7 +182,7 @@ bool TabModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int ro return false; } - const TabModelMimeData *mimeData = static_cast(data); + const auto *mimeData = static_cast(data); WebTab *tab = mimeData->tab(); if (tab->browserWindow() == m_window) { diff --git a/src/lib/tabwidget/tabmrumodel.cpp b/src/lib/tabwidget/tabmrumodel.cpp index b1be6187e..2a1059852 100644 --- a/src/lib/tabwidget/tabmrumodel.cpp +++ b/src/lib/tabwidget/tabmrumodel.cpp @@ -94,13 +94,13 @@ int TabMruModel::columnCount(const QModelIndex &parent) const QModelIndex TabMruModel::parent(const QModelIndex &index) const { Q_UNUSED(index) - return QModelIndex(); + return {}; } QModelIndex TabMruModel::index(int row, int column, const QModelIndex &parent) const { if (!hasIndex(row, column, parent)) { - return QModelIndex(); + return {}; } return createIndex(row, column, m_root->children.at(row)); } @@ -114,7 +114,7 @@ QModelIndex TabMruModel::mapToSource(const QModelIndex &proxyIndex) const { TabMruModelItem *it = item(proxyIndex); if (!it) { - return QModelIndex(); + return {}; } return it->sourceIndex; } @@ -138,7 +138,7 @@ void TabMruModel::init() QModelIndex TabMruModel::index(TabMruModelItem *item) const { if (!item || item == m_root) { - return QModelIndex(); + return {}; } return createIndex(m_root->children.indexOf(item), 0, item); } @@ -176,10 +176,10 @@ void TabMruModel::sourceRowsInserted(const QModelIndex &parent, int start, int e { for (int i = start; i <= end; ++i) { const QModelIndex index = sourceModel()->index(i, 0, parent); - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); if (tab) { beginInsertRows(QModelIndex(), m_items.count(), m_items.count()); - TabMruModelItem *item = new TabMruModelItem(tab, index); + auto *item = new TabMruModelItem(tab, index); m_items[tab] = item; m_root->children.append(item); endInsertRows(); diff --git a/src/lib/tabwidget/tabstackedwidget.cpp b/src/lib/tabwidget/tabstackedwidget.cpp index 6074a9251..420c73fcf 100644 --- a/src/lib/tabwidget/tabstackedwidget.cpp +++ b/src/lib/tabwidget/tabstackedwidget.cpp @@ -48,8 +48,7 @@ TabStackedWidget::TabStackedWidget(QWidget* parent) } TabStackedWidget::~TabStackedWidget() -{ -} += default; ComboTabBar* TabStackedWidget::tabBar() { diff --git a/src/lib/tabwidget/tabtreemodel.cpp b/src/lib/tabwidget/tabtreemodel.cpp index 7b079111a..fae99f89d 100644 --- a/src/lib/tabwidget/tabtreemodel.cpp +++ b/src/lib/tabwidget/tabtreemodel.cpp @@ -95,7 +95,7 @@ QModelIndex TabTreeModel::tabIndex(WebTab *tab) const { TabTreeModelItem *item = m_items.value(tab); if (!item) { - return QModelIndex(); + return {}; } return createIndex(item->parent->children.indexOf(item), 0, item); } @@ -154,7 +154,7 @@ QModelIndex TabTreeModel::parent(const QModelIndex &child) const { TabTreeModelItem *it = item(child); if (!it) { - return QModelIndex(); + return {}; } return index(it->parent); } @@ -162,7 +162,7 @@ QModelIndex TabTreeModel::parent(const QModelIndex &child) const QModelIndex TabTreeModel::index(int row, int column, const QModelIndex &parent) const { if (!hasIndex(row, column, parent)) { - return QModelIndex(); + return {}; } TabTreeModelItem *parentItem = item(parent); return createIndex(row, column, parentItem->children.at(row)); @@ -177,7 +177,7 @@ QModelIndex TabTreeModel::mapToSource(const QModelIndex &proxyIndex) const { TabTreeModelItem *it = item(proxyIndex); if (!it) { - return QModelIndex(); + return {}; } return it->sourceIndex; } @@ -189,7 +189,7 @@ bool TabTreeModel::canDropMimeData(const QMimeData *data, Qt::DropAction action, if (action != Qt::MoveAction || column > 0 || !m_window) { return false; } - const TabModelMimeData *mimeData = qobject_cast(data); + const auto *mimeData = qobject_cast(data); if (!mimeData) { return false; } @@ -210,7 +210,7 @@ bool TabTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in return false; } - const TabModelMimeData *mimeData = static_cast(data); + const auto *mimeData = static_cast(data); WebTab *tab = mimeData->tab(); if (tab->isPinned()) { @@ -261,9 +261,9 @@ void TabTreeModel::init() for (int i = 0; i < sourceModel()->rowCount(); ++i) { const QModelIndex index = sourceModel()->index(i, 0); - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); if (tab && !tab->parentTab()) { - TabTreeModelItem *item = new TabTreeModelItem(tab, index); + auto *item = new TabTreeModelItem(tab, index); m_items[tab] = item; m_root->addChild(createItems(item)); } @@ -282,14 +282,14 @@ void TabTreeModel::init() QModelIndex TabTreeModel::index(TabTreeModelItem *item) const { if (!item || item == m_root) { - return QModelIndex(); + return {}; } return createIndex(item->parent->children.indexOf(item), 0, item); } TabTreeModelItem *TabTreeModel::item(const QModelIndex &index) const { - TabTreeModelItem *it = static_cast(index.internalPointer()); + auto *it = static_cast(index.internalPointer()); return it ? it : m_root; } @@ -298,7 +298,7 @@ TabTreeModelItem *TabTreeModel::createItems(TabTreeModelItem *root) const auto children = root->tab->childTabs(); for (WebTab *child : children) { const QModelIndex index = sourceModel()->index(child->tabIndex(), 0); - TabTreeModelItem *item = new TabTreeModelItem(child, index); + auto *item = new TabTreeModelItem(child, index); m_items[child] = item; root->addChild(createItems(item)); } @@ -333,7 +333,7 @@ void TabTreeModel::sourceReset() void TabTreeModel::insertIndex(const QModelIndex &sourceIndex) { - WebTab *tab = sourceIndex.data(TabModel::WebTabRole).value(); + auto *tab = sourceIndex.data(TabModel::WebTabRole).value(); if (!tab) { return; } @@ -341,7 +341,7 @@ void TabTreeModel::insertIndex(const QModelIndex &sourceIndex) if (!parent) { parent = m_root; } - TabTreeModelItem *item = new TabTreeModelItem(tab, sourceIndex); + auto *item = new TabTreeModelItem(tab, sourceIndex); const int idx = parent->children.count(); beginInsertRows(tabIndex(tab->parentTab()), idx, idx); @@ -354,7 +354,7 @@ void TabTreeModel::insertIndex(const QModelIndex &sourceIndex) void TabTreeModel::removeIndex(const QModelIndex &sourceIndex) { - WebTab *tab = sourceIndex.data(TabModel::WebTabRole).value(); + auto *tab = sourceIndex.data(TabModel::WebTabRole).value(); if (!tab) { return; } diff --git a/src/lib/tabwidget/tabwidget.cpp b/src/lib/tabwidget/tabwidget.cpp index 25872fc2d..94d4b8759 100644 --- a/src/lib/tabwidget/tabwidget.cpp +++ b/src/lib/tabwidget/tabwidget.cpp @@ -71,7 +71,7 @@ void MenuTabs::mouseReleaseEvent(QMouseEvent* event) if (event->button() == Qt::MiddleButton) { QAction* action = actionAt(event->pos()); if (action && action->isEnabled()) { - WebTab* tab = qobject_cast(qvariant_cast(action->data())); + auto* tab = qobject_cast(qvariant_cast(action->data())); if (tab) { emit closeTab(tab->tabIndex()); action->setEnabled(false); @@ -261,7 +261,7 @@ void TabWidget::aboutToShowTabsMenu() continue; } - QAction* action = new QAction(this); + auto* action = new QAction(this); action->setIcon(tab->icon()); if (i == currentIndex()) { @@ -303,8 +303,8 @@ void TabWidget::aboutToShowClosedTabsMenu() void TabWidget::actionChangeIndex() { - if (QAction* action = qobject_cast(sender())) { - WebTab* tab = qobject_cast(qvariant_cast(action->data())); + if (auto* action = qobject_cast(sender())) { + auto* tab = qobject_cast(qvariant_cast(action->data())); if (tab) { m_tabBar->ensureVisible(tab->tabIndex()); setCurrentIndex(tab->tabIndex()); @@ -343,7 +343,7 @@ int TabWidget::addView(const LoadRequest &req, const QString &title, const Qz::N } } - WebTab* webTab = new WebTab(m_window); + auto* webTab = new WebTab(m_window); webTab->setPinned(pinned); webTab->locationBar()->showUrl(url); m_locationBars->addWidget(webTab->locationBar()); @@ -766,7 +766,7 @@ void TabWidget::restoreClosedTab(QObject* obj) ClosedTabsManager::Tab tab; - QAction* action = qobject_cast(obj); + auto* action = qobject_cast(obj); if (action && action->data().toInt() != 0) { tab = m_closedTabsManager->takeTabAt(action->data().toInt()); } diff --git a/src/lib/tools/aesinterface.cpp b/src/lib/tools/aesinterface.cpp index 6d4a8523e..a733af0d7 100644 --- a/src/lib/tools/aesinterface.cpp +++ b/src/lib/tools/aesinterface.cpp @@ -107,7 +107,7 @@ QByteArray AesInterface::encrypt(const QByteArray &plainData, const QByteArray & int dataLength = plainData.size(); int cipherlength = dataLength + AES_BLOCK_SIZE; int finalLength = 0; - uchar* ciphertext = (uchar*)malloc(cipherlength); + auto* ciphertext = (uchar*)malloc(cipherlength); // allows reusing of 'm_encodeCTX' for multiple encryption cycles EVP_EncryptInit_ex(m_encodeCTX, NULL, NULL, NULL, NULL); @@ -134,28 +134,28 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray if (cipherData.isEmpty()) { m_ok = true; - return QByteArray(); + return {}; } QList cipherSections(cipherData.split('$')); if (cipherSections.size() != 3) { qWarning() << "Decrypt error: It seems data is corrupted"; - return QByteArray(); + return {}; } if (cipherSections.at(0).toInt() > AesInterface::VERSION) { QMessageBox::information(0, tr("Warning!"), tr("Data has been encrypted with a newer version of Falkon." "\nPlease install latest version of Falkon.")); - return QByteArray(); + return {}; } if (cipherSections.at(0).toInt() != 1) { qWarning() << Q_FUNC_INFO << "There is just version 1 of decoder, yet ;-)"; - return QByteArray(); + return {}; } if (!init(EVP_PKEY_MO_DECRYPT, password, QByteArray::fromBase64(cipherSections.at(1)))) { - return QByteArray(); + return {}; } QByteArray cipherArray = QByteArray::fromBase64(cipherSections.at(2)); @@ -163,9 +163,9 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray int plainTextLength = cipherLength; int finalLength = 0; - uchar* cipherText = (uchar*)cipherArray.data(); + auto* cipherText = (uchar*)cipherArray.data(); // because we have padding ON, we must allocate an extra cipher block size of memory - uchar* plainText = (uchar*)malloc(plainTextLength + AES_BLOCK_SIZE); + auto* plainText = (uchar*)malloc(plainTextLength + AES_BLOCK_SIZE); EVP_DecryptInit_ex(m_decodeCTX, NULL, NULL, NULL, NULL); EVP_DecryptUpdate(m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength); @@ -177,7 +177,7 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray free(plainText); if (success != 1) { - return QByteArray(); + return {}; } m_ok = true; @@ -193,13 +193,13 @@ QByteArray AesInterface::passwordToHash(const QString &masterPassword) return result.toBase64(); } else { - return QByteArray(); + return {}; } } QByteArray AesInterface::createRandomData(int length) { - uchar* randomData = (uchar*)malloc(length); + auto* randomData = (uchar*)malloc(length); RAND_bytes(randomData, length); QByteArray data((char*)randomData, length); diff --git a/src/lib/tools/buttonwithmenu.cpp b/src/lib/tools/buttonwithmenu.cpp index 5cacdd201..c365ebb89 100644 --- a/src/lib/tools/buttonwithmenu.cpp +++ b/src/lib/tools/buttonwithmenu.cpp @@ -34,7 +34,7 @@ ButtonWithMenu::ButtonWithMenu(QWidget* parent) void ButtonWithMenu::setCurrentItem() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { setCurrentItem(action->data().value()); } } @@ -177,5 +177,4 @@ void ButtonWithMenu::mousePressEvent(QMouseEvent *event) } ButtonWithMenu::~ButtonWithMenu() -{ -} += default; diff --git a/src/lib/tools/certificateinfowidget.cpp b/src/lib/tools/certificateinfowidget.cpp index cb680cbbc..4cb593e23 100644 --- a/src/lib/tools/certificateinfowidget.cpp +++ b/src/lib/tools/certificateinfowidget.cpp @@ -288,7 +288,7 @@ QString CertificateInfoWidget::clearCertSpecialSymbols(const QString &string) QString CertificateInfoWidget::clearCertSpecialSymbols(const QStringList &stringList) { if (stringList.isEmpty()) { - return QString(); + return {}; } return clearCertSpecialSymbols(stringList.at(0)); @@ -307,7 +307,7 @@ QString CertificateInfoWidget::showCertInfo(const QString &string) QString CertificateInfoWidget::showCertInfo(const QStringList &stringList) { if (stringList.isEmpty()) { - return QString(); + return {}; } return showCertInfo(stringList.at(0)); diff --git a/src/lib/tools/closedtabsmanager.cpp b/src/lib/tools/closedtabsmanager.cpp index 6ab6ac274..d573afd55 100644 --- a/src/lib/tools/closedtabsmanager.cpp +++ b/src/lib/tools/closedtabsmanager.cpp @@ -22,8 +22,7 @@ #include ClosedTabsManager::ClosedTabsManager() -{ -} += default; void ClosedTabsManager::saveTab(WebTab *tab) { diff --git a/src/lib/tools/closedwindowsmanager.cpp b/src/lib/tools/closedwindowsmanager.cpp index 9d97376fa..e3ea3d57c 100644 --- a/src/lib/tools/closedwindowsmanager.cpp +++ b/src/lib/tools/closedwindowsmanager.cpp @@ -71,7 +71,7 @@ ClosedWindowsManager::Window ClosedWindowsManager::takeClosedWindowAt(int index) void ClosedWindowsManager::restoreClosedWindow() { Window window; - QAction *act = qobject_cast(sender()); + auto *act = qobject_cast(sender()); if (act) { window = takeClosedWindowAt(act->data().toInt()); } else { diff --git a/src/lib/tools/desktopfile.cpp b/src/lib/tools/desktopfile.cpp index e185979c8..7394dadef 100644 --- a/src/lib/tools/desktopfile.cpp +++ b/src/lib/tools/desktopfile.cpp @@ -21,8 +21,7 @@ #include DesktopFile::DesktopFile() -{ -} += default; DesktopFile::DesktopFile(const QString &fileName) { @@ -59,7 +58,7 @@ QString DesktopFile::icon() const QVariant DesktopFile::value(const QString &key, bool localized) const { if (!m_settings) { - return QVariant(); + return {}; } if (localized) { const QLocale locale = QLocale::system(); diff --git a/src/lib/tools/docktitlebarwidget.cpp b/src/lib/tools/docktitlebarwidget.cpp index 9ba5b290c..6f9a4ec5c 100644 --- a/src/lib/tools/docktitlebarwidget.cpp +++ b/src/lib/tools/docktitlebarwidget.cpp @@ -35,5 +35,4 @@ void DockTitleBarWidget::setTitle(const QString &title) } DockTitleBarWidget::~DockTitleBarWidget() -{ -} += default; diff --git a/src/lib/tools/enhancedmenu.cpp b/src/lib/tools/enhancedmenu.cpp index a06b5d657..41c140c62 100644 --- a/src/lib/tools/enhancedmenu.cpp +++ b/src/lib/tools/enhancedmenu.cpp @@ -45,7 +45,7 @@ void Menu::setCloseOnMiddleClick(bool close) void Menu::mouseReleaseEvent(QMouseEvent* e) { QAction* qact = activeAction(); - Action* act = qobject_cast (qact); + auto* act = qobject_cast (qact); if (qact && qact->menu()) { Menu* m = qobject_cast (qact->menu()); @@ -92,7 +92,7 @@ void Menu::keyPressEvent(QKeyEvent* e) } QAction* qact = activeAction(); - Action* act = qobject_cast (qact); + auto* act = qobject_cast (qact); if (!act) { QMenu::keyPressEvent(e); diff --git a/src/lib/tools/headerview.cpp b/src/lib/tools/headerview.cpp index 28289110c..a643602f7 100644 --- a/src/lib/tools/headerview.cpp +++ b/src/lib/tools/headerview.cpp @@ -67,7 +67,7 @@ void HeaderView::contextMenuEvent(QContextMenuEvent* event) m_menu = new QMenu(this); for (int i = 0; i < count(); ++i) { - QAction* act = new QAction(model()->headerData(i, Qt::Horizontal).toString(), m_menu); + auto* act = new QAction(model()->headerData(i, Qt::Horizontal).toString(), m_menu); act->setCheckable(true); act->setData(i); @@ -87,7 +87,7 @@ void HeaderView::contextMenuEvent(QContextMenuEvent* event) void HeaderView::toggleSectionVisibility() { - if (QAction* act = qobject_cast(sender())) { + if (auto* act = qobject_cast(sender())) { int index = act->data().toInt(); setSectionHidden(index, !isSectionHidden(index)); diff --git a/src/lib/tools/html5permissions/html5permissionsdialog.cpp b/src/lib/tools/html5permissions/html5permissionsdialog.cpp index d02a5e568..d87b15e6d 100644 --- a/src/lib/tools/html5permissions/html5permissionsdialog.cpp +++ b/src/lib/tools/html5permissions/html5permissionsdialog.cpp @@ -58,7 +58,7 @@ void HTML5PermissionsDialog::showFeaturePermissions(QWebEnginePage::Feature feat const auto grantedSites = m_granted.value(feature); for (const QString &site : grantedSites) { - QTreeWidgetItem* item = new QTreeWidgetItem(ui->treeWidget); + auto* item = new QTreeWidgetItem(ui->treeWidget); item->setText(0, site); item->setText(1, tr("Allow")); item->setData(0, Qt::UserRole + 10, Allow); @@ -67,7 +67,7 @@ void HTML5PermissionsDialog::showFeaturePermissions(QWebEnginePage::Feature feat const auto deniedSites = m_denied.value(feature); for (const QString &site : deniedSites) { - QTreeWidgetItem* item = new QTreeWidgetItem(ui->treeWidget); + auto* item = new QTreeWidgetItem(ui->treeWidget); item->setText(0, site); item->setText(1, tr("Deny")); item->setData(0, Qt::UserRole + 10, Deny); diff --git a/src/lib/tools/html5permissions/html5permissionsmanager.cpp b/src/lib/tools/html5permissions/html5permissionsmanager.cpp index 5bab9b008..2a53217f7 100644 --- a/src/lib/tools/html5permissions/html5permissionsmanager.cpp +++ b/src/lib/tools/html5permissions/html5permissionsmanager.cpp @@ -53,7 +53,7 @@ void HTML5PermissionsManager::requestPermissions(WebPage* page, const QUrl &orig } // Ask user for permission - HTML5PermissionsNotification* notif = new HTML5PermissionsNotification(origin, page, feature); + auto* notif = new HTML5PermissionsNotification(origin, page, feature); page->view()->addNotification(notif); } diff --git a/src/lib/tools/iconprovider.cpp b/src/lib/tools/iconprovider.cpp index 31296cda9..356d742af 100644 --- a/src/lib/tools/iconprovider.cpp +++ b/src/lib/tools/iconprovider.cpp @@ -207,7 +207,7 @@ QImage IconProvider::imageForUrl(const QUrl &url, bool allowNull) query.addBindValue(QString("%1*").arg(QzTools::escapeSqlGlobString(QString::fromUtf8(encodedUrl)))); query.exec(); - QImage *img = new QImage; + auto *img = new QImage; if (query.next()) { img->loadFromData(query.value(0).toByteArray()); } diff --git a/src/lib/tools/iconprovider.h b/src/lib/tools/iconprovider.h index acf03ac66..61f38b2ce 100644 --- a/src/lib/tools/iconprovider.h +++ b/src/lib/tools/iconprovider.h @@ -75,7 +75,7 @@ public Q_SLOTS: void clearOldIconsInDatabase(); private: - typedef QPair BufferedIcon; + using BufferedIcon = QPair; QIcon iconFromImage(const QImage &image); diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp index 2ed3a367b..93f71f89b 100644 --- a/src/lib/tools/qztools.cpp +++ b/src/lib/tools/qztools.cpp @@ -68,7 +68,7 @@ QByteArray QzTools::pixmapToByteArray(const QPixmap &pix) return buffer.buffer().toBase64(); } - return QByteArray(); + return {}; } QPixmap QzTools::pixmapFromByteArray(const QByteArray &data) @@ -110,7 +110,7 @@ QByteArray QzTools::readAllFileByteContents(const QString &filename) return a; } - return QByteArray(); + return {}; } void QzTools::centerWidgetOnScreen(QWidget* w) @@ -204,7 +204,7 @@ QString QzTools::samePartOfStrings(const QString &one, const QString &other) { int maxSize = qMin(one.size(), other.size()); if (maxSize <= 0) { - return QString(); + return {}; } int i = 0; @@ -514,7 +514,7 @@ QString QzTools::resolveFromPath(const QString &name) const QString path = qgetenv("PATH").trimmed(); if (path.isEmpty()) { - return QString(); + return {}; } const QStringList dirs = path.split(QLatin1Char(':'), QString::SkipEmptyParts); @@ -644,14 +644,14 @@ static QString getFilename(const QString &path) } if (info.isDir()) { - return QString(); + return {}; } if (info.dir().exists()) { return info.fileName(); } - return QString(); + return {}; } QString QzTools::getOpenFileName(const QString &name, QWidget* parent, const QString &caption, const QString &dir, const QString &filter, QString* selectedFilter, QFileDialog::Options options) @@ -768,7 +768,7 @@ QStringList QzTools::splitCommandArguments(const QString &command) QString line = command.trimmed(); if (line.isEmpty()) { - return QStringList(); + return {}; } QChar SPACE(' '); @@ -835,7 +835,7 @@ QStringList QzTools::splitCommandArguments(const QString &command) // Unmatched quote if (inQuote) { - return QStringList(); + return {}; } return r; diff --git a/src/lib/tools/sqldatabase.cpp b/src/lib/tools/sqldatabase.cpp index 79f626298..8d35df45d 100644 --- a/src/lib/tools/sqldatabase.cpp +++ b/src/lib/tools/sqldatabase.cpp @@ -110,8 +110,7 @@ SqlDatabase::SqlDatabase(QObject* parent) } SqlDatabase::~SqlDatabase() -{ -} += default; QSqlDatabase SqlDatabase::database() { diff --git a/src/lib/tools/wheelhelper.cpp b/src/lib/tools/wheelhelper.cpp index 16b4c37a6..4df3ec97c 100644 --- a/src/lib/tools/wheelhelper.cpp +++ b/src/lib/tools/wheelhelper.cpp @@ -20,8 +20,7 @@ #include WheelHelper::WheelHelper() -{ -} += default; void WheelHelper::reset() { diff --git a/src/lib/webengine/loadrequest.cpp b/src/lib/webengine/loadrequest.cpp index 90f58ce8a..4e620a27e 100644 --- a/src/lib/webengine/loadrequest.cpp +++ b/src/lib/webengine/loadrequest.cpp @@ -23,11 +23,8 @@ LoadRequest::LoadRequest() } LoadRequest::LoadRequest(const LoadRequest &other) - : m_url(other.m_url) - , m_operation(other.m_operation) - , m_data(other.m_data) -{ -} + += default; LoadRequest::LoadRequest(const QUrl &url, LoadRequest::Operation op, const QByteArray &data) : m_url(url) @@ -37,12 +34,7 @@ LoadRequest::LoadRequest(const QUrl &url, LoadRequest::Operation op, const QByte } LoadRequest &LoadRequest::operator=(const LoadRequest &other) -{ - m_url = other.m_url; - m_operation = other.m_operation; - m_data = other.m_data; - return *this; -} += default; bool LoadRequest::isValid() const { diff --git a/src/lib/webengine/webhittestresult.cpp b/src/lib/webengine/webhittestresult.cpp index fb0224e04..88ddf4268 100644 --- a/src/lib/webengine/webhittestresult.cpp +++ b/src/lib/webengine/webhittestresult.cpp @@ -86,7 +86,7 @@ WebHitTestResult::WebHitTestResult(const WebPage *page, const QPoint &pos) "return res;" "})()"); - WebPage *p = const_cast(page); + auto *p = const_cast(page); m_viewportPos = p->mapToViewport(m_pos); const QString &js = source.arg(m_viewportPos.x()).arg(m_viewportPos.y()); init(p->url(), p->execJavaScript(js, WebPage::SafeJsWorld).toMap()); diff --git a/src/lib/webengine/webpage.cpp b/src/lib/webengine/webpage.cpp index a9d3755d4..f4abd3294 100644 --- a/src/lib/webengine/webpage.cpp +++ b/src/lib/webengine/webpage.cpp @@ -78,7 +78,7 @@ WebPage::WebPage(QObject* parent) , m_blockAlerts(false) , m_secureStatus(false) { - QWebChannel *channel = new QWebChannel(this); + auto *channel = new QWebChannel(this); ExternalJsObject::setupWebChannel(channel, this); setWebChannel(channel, SafeJsWorld); @@ -507,7 +507,7 @@ QUrl WebPage::registerProtocolHandlerRequestUrl() const if (m_registerProtocolHandlerRequest && url().host() == m_registerProtocolHandlerRequest->origin().host()) { return m_registerProtocolHandlerRequest->origin(); } - return QUrl(); + return {}; } QString WebPage::registerProtocolHandlerRequestScheme() const @@ -515,7 +515,7 @@ QString WebPage::registerProtocolHandlerRequestScheme() const if (m_registerProtocolHandlerRequest && url().host() == m_registerProtocolHandlerRequest->origin().host()) { return m_registerProtocolHandlerRequest->scheme(); } - return QString(); + return {}; } bool WebPage::javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, const QString &defaultValue, QString* result) @@ -528,10 +528,10 @@ bool WebPage::javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, c return false; } - QFrame *widget = new QFrame(view()->overlayWidget()); + auto *widget = new QFrame(view()->overlayWidget()); widget->setObjectName("jsFrame"); - Ui_jsPrompt* ui = new Ui_jsPrompt(); + auto* ui = new Ui_jsPrompt(); ui->setupUi(widget); ui->message->setText(msg); ui->lineEdit->setText(defaultValue); @@ -576,10 +576,10 @@ bool WebPage::javaScriptConfirm(const QUrl &securityOrigin, const QString &msg) return false; } - QFrame *widget = new QFrame(view()->overlayWidget()); + auto *widget = new QFrame(view()->overlayWidget()); widget->setObjectName("jsFrame"); - Ui_jsConfirm* ui = new Ui_jsConfirm(); + auto* ui = new Ui_jsConfirm(); ui->setupUi(widget); ui->message->setText(msg); ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus(); @@ -636,10 +636,10 @@ void WebPage::javaScriptAlert(const QUrl &securityOrigin, const QString &msg) return; } - QFrame *widget = new QFrame(view()->overlayWidget()); + auto *widget = new QFrame(view()->overlayWidget()); widget->setObjectName("jsFrame"); - Ui_jsAlert* ui = new Ui_jsAlert(); + auto* ui = new Ui_jsAlert(); ui->setupUi(widget); ui->message->setText(msg); ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus(); @@ -689,7 +689,7 @@ void WebPage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, cons QWebEnginePage* WebPage::createWindow(QWebEnginePage::WebWindowType type) { - TabbedWebView *tView = qobject_cast(view()); + auto *tView = qobject_cast(view()); BrowserWindow *window = tView ? tView->browserWindow() : mApp->getWindow(); auto createTab = [=](Qz::NewTabPositionFlags pos) { @@ -715,16 +715,16 @@ QWebEnginePage* WebPage::createWindow(QWebEnginePage::WebWindowType type) switch (type) { case QWebEnginePage::WebBrowserWindow: { BrowserWindow *window = mApp->createWindow(Qz::BW_NewWindow); - WebPage *page = new WebPage; + auto *page = new WebPage; window->setStartPage(page); return page; } case QWebEnginePage::WebDialog: if (!qzSettings->openPopupsInTabs) { - PopupWebView* view = new PopupWebView; + auto* view = new PopupWebView; view->setPage(new WebPage); - PopupWindow* popup = new PopupWindow(view); + auto* popup = new PopupWindow(view); popup->show(); window->addDeleteOnCloseWidget(popup); return view->page(); diff --git a/src/lib/webengine/webscrollbarmanager.cpp b/src/lib/webengine/webscrollbarmanager.cpp index 37d4dd691..96f2cda29 100644 --- a/src/lib/webengine/webscrollbarmanager.cpp +++ b/src/lib/webengine/webscrollbarmanager.cpp @@ -124,7 +124,7 @@ void WebScrollBarManager::addWebView(WebView *view) delete m_scrollbars.value(view); - ScrollBarData *data = new ScrollBarData; + auto *data = new ScrollBarData; data->vscrollbar = new WebScrollBar(Qt::Vertical, view); data->hscrollbar = new WebScrollBar(Qt::Horizontal, view); data->corner = new WebScrollBarCornerWidget(view); diff --git a/src/lib/webengine/webview.cpp b/src/lib/webengine/webview.cpp index 4c2d85133..4b2841658 100644 --- a/src/lib/webengine/webview.cpp +++ b/src/lib/webengine/webview.cpp @@ -387,11 +387,11 @@ void WebView::printPage() { Q_ASSERT(m_page); - QPrinter *printer = new QPrinter(); + auto *printer = new QPrinter(); printer->setCreator(tr("Falkon %1 (%2)").arg(Qz::VERSION, Qz::WWWADDRESS)); printer->setDocName(QzTools::filterCharsFromFilename(title())); - QPrintDialog *dialog = new QPrintDialog(printer, this); + auto *dialog = new QPrintDialog(printer, this); dialog->setOptions(QAbstractPrintDialog::PrintToFile | QAbstractPrintDialog::PrintShowPageSize); #ifndef Q_OS_WIN dialog->setOption(QAbstractPrintDialog::PrintPageRange); @@ -468,14 +468,14 @@ void WebView::slotTitleChanged(const QString &title) void WebView::openUrlInNewWindow() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { mApp->createWindow(Qz::BW_NewWindow, action->data().toUrl()); } } void WebView::sendTextByMail() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { const QUrl mailUrl = QUrl::fromEncoded("mailto:%20?body=" + QUrl::toPercentEncoding(action->data().toString())); QDesktopServices::openUrl(mailUrl); } @@ -489,7 +489,7 @@ void WebView::sendPageByMail() void WebView::copyLinkToClipboard() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { QApplication::clipboard()->setText(action->data().toUrl().toEncoded()); } } @@ -536,7 +536,7 @@ void WebView::openUrlInNewTab(const QUrl &url, Qz::NewTabPositionFlags position) void WebView::openActionUrl() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { load(action->data().toUrl()); } } @@ -556,14 +556,14 @@ void WebView::showSource() void WebView::showSiteInfo() { - SiteInfo* s = new SiteInfo(this); + auto* s = new SiteInfo(this); s->show(); } void WebView::searchSelectedText() { SearchEngine engine = mApp->searchEnginesManager()->defaultEngine(); - if (QAction* act = qobject_cast(sender())) { + if (auto* act = qobject_cast(sender())) { if (act->data().isValid()) { engine = act->data().value(); } @@ -576,7 +576,7 @@ void WebView::searchSelectedText() void WebView::searchSelectedTextInBackgroundTab() { SearchEngine engine = mApp->searchEnginesManager()->defaultEngine(); - if (QAction* act = qobject_cast(sender())) { + if (auto* act = qobject_cast(sender())) { if (act->data().isValid()) { engine = act->data().value(); } @@ -588,7 +588,7 @@ void WebView::searchSelectedTextInBackgroundTab() void WebView::bookmarkLink() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { if (action->data().isNull()) { BookmarksTools::addBookmarkDialog(this, url(), title()); } @@ -603,14 +603,14 @@ void WebView::bookmarkLink() void WebView::openUrlInSelectedTab() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { openUrlInNewTab(action->data().toUrl(), Qz::NT_CleanSelectedTab); } } void WebView::openUrlInBackgroundTab() { - if (QAction* action = qobject_cast(sender())) { + if (auto* action = qobject_cast(sender())) { openUrlInNewTab(action->data().toUrl(), Qz::NT_CleanNotSelectedTab); } } @@ -634,7 +634,7 @@ void WebView::userDefinedOpenUrlInNewTab(const QUrl &url, bool invert) if (!url.isEmpty()) { actionUrl = url; } - else if (QAction* action = qobject_cast(sender())) { + else if (auto* action = qobject_cast(sender())) { actionUrl = action->data().toUrl(); } @@ -648,7 +648,7 @@ void WebView::userDefinedOpenUrlInBgTab(const QUrl &url) if (!url.isEmpty()) { actionUrl = url; } - else if (QAction* action = qobject_cast(sender())) { + else if (auto* action = qobject_cast(sender())) { actionUrl = action->data().toUrl(); } @@ -792,7 +792,7 @@ void WebView::createPageContextMenu(QMenu* menu) void WebView::createLinkContextMenu(QMenu* menu, const WebHitTestResult &hitTest) { menu->addSeparator(); - Action* act = new Action(IconProvider::newTabIcon(), tr("Open link in new &tab")); + auto* act = new Action(IconProvider::newTabIcon(), tr("Open link in new &tab")); act->setData(hitTest.linkUrl()); connect(act, SIGNAL(triggered()), this, SLOT(userDefinedOpenUrlInNewTab())); connect(act, SIGNAL(ctrlTriggered()), this, SLOT(userDefinedOpenUrlInBgTab())); @@ -820,7 +820,7 @@ void WebView::createImageContextMenu(QMenu* menu, const WebHitTestResult &hitTes { menu->addSeparator(); if (hitTest.imageUrl() != url()) { - Action *act = new Action(tr("Show i&mage")); + auto *act = new Action(tr("Show i&mage")); act->setData(hitTest.imageUrl()); connect(act, &QAction::triggered, this, &WebView::openActionUrl); connect(act, SIGNAL(ctrlTriggered()), this, SLOT(userDefinedOpenUrlInNewTab())); @@ -861,7 +861,7 @@ void WebView::createSelectedTextContextMenu(QMenu* menu, const WebHitTestResult QUrl guessedUrl = QUrl::fromUserInput(selectedString); if (isUrlValid(guessedUrl)) { - Action* act = new Action(QIcon::fromTheme("document-open-remote"), tr("Go to &web address")); + auto* act = new Action(QIcon::fromTheme("document-open-remote"), tr("Go to &web address")); act->setData(guessedUrl); connect(act, &QAction::triggered, this, &WebView::openActionUrl); @@ -875,7 +875,7 @@ void WebView::createSelectedTextContextMenu(QMenu* menu, const WebHitTestResult selectedText.replace(QLatin1Char('\n'), QLatin1Char(' ')).replace(QLatin1Char('\t'), QLatin1Char(' ')); SearchEngine engine = mApp->searchEnginesManager()->defaultEngine(); - Action* act = new Action(engine.icon, tr("Search \"%1 ..\" with %2").arg(selectedText, engine.name)); + auto* act = new Action(engine.icon, tr("Search \"%1 ..\" with %2").arg(selectedText, engine.name)); connect(act, &QAction::triggered, this, &WebView::searchSelectedText); connect(act, &Action::ctrlTriggered, this, &WebView::searchSelectedTextInBackgroundTab); menu->addAction(act); @@ -886,7 +886,7 @@ void WebView::createSelectedTextContextMenu(QMenu* menu, const WebHitTestResult SearchEnginesManager* searchManager = mApp->searchEnginesManager(); const auto engines = searchManager->allEngines(); for (const SearchEngine &en : engines) { - Action* act = new Action(en.icon, en.name); + auto* act = new Action(en.icon, en.name); act->setData(QVariant::fromValue(en)); connect(act, &QAction::triggered, this, &WebView::searchSelectedText); @@ -1270,7 +1270,7 @@ bool WebView::eventFilter(QObject *obj, QEvent *event) if (child && child->inherits("QtWebEngineCore::RenderWidgetHostViewQtDelegateWidget")) { m_rwhvqt = child; m_rwhvqt->installEventFilter(this); - if (QQuickWidget *w = qobject_cast(m_rwhvqt)) { + if (auto *w = qobject_cast(m_rwhvqt)) { w->setClearColor(palette().color(QPalette::Window)); } } diff --git a/src/lib/webtab/searchtoolbar.cpp b/src/lib/webtab/searchtoolbar.cpp index 4ea170289..8bdf59825 100644 --- a/src/lib/webtab/searchtoolbar.cpp +++ b/src/lib/webtab/searchtoolbar.cpp @@ -47,10 +47,10 @@ SearchToolBar::SearchToolBar(WebView* view, QWidget* parent) connect(ui->previous, &QAbstractButton::clicked, this, &SearchToolBar::findPrevious); connect(ui->caseSensitive, &QAbstractButton::clicked, this, &SearchToolBar::caseSensitivityChanged); - QShortcut* findNextAction = new QShortcut(QKeySequence("F3"), this); + auto* findNextAction = new QShortcut(QKeySequence("F3"), this); connect(findNextAction, &QShortcut::activated, this, &SearchToolBar::findNext); - QShortcut* findPreviousAction = new QShortcut(QKeySequence("Shift+F3"), this); + auto* findPreviousAction = new QShortcut(QKeySequence("Shift+F3"), this); connect(findPreviousAction, &QShortcut::activated, this, &SearchToolBar::findPrevious); parent->installEventFilter(this); @@ -157,7 +157,7 @@ bool SearchToolBar::eventFilter(QObject* obj, QEvent* event) Q_UNUSED(obj); if (event->type() == QEvent::KeyPress) { - QKeyEvent *ke = static_cast(event); + auto *ke = static_cast(event); switch (ke->key()) { case Qt::Key_Escape: close(); diff --git a/src/lib/webtab/webtab.cpp b/src/lib/webtab/webtab.cpp index 7bb7e9062..930265c37 100644 --- a/src/lib/webtab/webtab.cpp +++ b/src/lib/webtab/webtab.cpp @@ -153,14 +153,14 @@ WebTab::WebTab(QWidget *parent) m_layout->setSpacing(0); m_layout->addWidget(m_webView); - QWidget *viewWidget = new QWidget(this); + auto *viewWidget = new QWidget(this); viewWidget->setLayout(m_layout); m_splitter = new QSplitter(Qt::Vertical, this); m_splitter->setChildrenCollapsible(false); m_splitter->addWidget(viewWidget); - QVBoxLayout *layout = new QVBoxLayout(this); + auto *layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); layout->addWidget(m_splitter); @@ -172,7 +172,7 @@ WebTab::WebTab(QWidget *parent) pal.setColor(QPalette::Window, pal.window().color().darker(110)); m_notificationWidget->setPalette(pal); - QVBoxLayout *nlayout = new QVBoxLayout(m_notificationWidget); + auto *nlayout = new QVBoxLayout(m_notificationWidget); nlayout->setSizeConstraint(QLayout::SetMinAndMaxSize); nlayout->setContentsMargins(0, 0, 0, 0); nlayout->setSpacing(1); @@ -221,7 +221,7 @@ void WebTab::showWebInspector(bool inspectElement) if (!WebInspector::isEnabled() || haveInspector()) return; - WebInspector *inspector = new WebInspector(this); + auto *inspector = new WebInspector(this); inspector->setView(m_webView); if (inspectElement) inspector->inspectElement(); diff --git a/src/plugins/AutoScroll/autoscroller.cpp b/src/plugins/AutoScroll/autoscroller.cpp index a2ddb25cb..0831e1203 100644 --- a/src/plugins/AutoScroll/autoscroller.cpp +++ b/src/plugins/AutoScroll/autoscroller.cpp @@ -132,7 +132,7 @@ bool AutoScroller::mouseMove(QObject* obj, QMouseEvent* event) bool AutoScroller::mousePress(QObject* obj, QMouseEvent* event) { bool middleButton = event->buttons() == Qt::MiddleButton; - WebView* view = qobject_cast(obj); + auto* view = qobject_cast(obj); Q_ASSERT(view); // Start? diff --git a/src/plugins/FlashCookieManager/fcm_dialog.cpp b/src/plugins/FlashCookieManager/fcm_dialog.cpp index 912a73d92..f80367fce 100644 --- a/src/plugins/FlashCookieManager/fcm_dialog.cpp +++ b/src/plugins/FlashCookieManager/fcm_dialog.cpp @@ -82,7 +82,7 @@ FCM_Dialog::FCM_Dialog(FCM_Plugin* manager, QWidget* parent) ui->flashCookieTree->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->flashCookieTree, &QWidget::customContextMenuRequested, this, &FCM_Dialog::cookieTreeContextMenuRequested); - QShortcut* removeShortcut = new QShortcut(QKeySequence("Del"), this); + auto* removeShortcut = new QShortcut(QKeySequence("Del"), this); connect(removeShortcut, &QShortcut::activated, this, &FCM_Dialog::deletePressed); QzTools::setWmClass("FlashCookies", this); @@ -223,7 +223,7 @@ void FCM_Dialog::refreshFlashCookiesTree() item = new QTreeWidgetItem(findParent); } else { - QTreeWidgetItem* newParent = new QTreeWidgetItem(ui->flashCookieTree); + auto* newParent = new QTreeWidgetItem(ui->flashCookieTree); newParent->setText(0, cookieOrigin); newParent->setIcon(0, IconProvider::standardIcon(QStyle::SP_DirIcon)); ui->flashCookieTree->addTopLevelItem(newParent); diff --git a/src/plugins/FlashCookieManager/fcm_plugin.cpp b/src/plugins/FlashCookieManager/fcm_plugin.cpp index 45dff0ed9..459c7c4eb 100644 --- a/src/plugins/FlashCookieManager/fcm_plugin.cpp +++ b/src/plugins/FlashCookieManager/fcm_plugin.cpp @@ -126,7 +126,7 @@ void FCM_Plugin::showSettings(QWidget* parent) void FCM_Plugin::populateExtensionsMenu(QMenu* menu) { - QAction* showFCM = new QAction(QIcon(":/flashcookiemanager/data/flash-cookie-manager.png"), tr("Flash Cookie Manager"), menu); + auto* showFCM = new QAction(QIcon(":/flashcookiemanager/data/flash-cookie-manager.png"), tr("Flash Cookie Manager"), menu); connect(showFCM, &QAction::triggered, this, &FCM_Plugin::showFlashCookieManager); menu->addAction(showFCM); } @@ -292,7 +292,7 @@ void FCM_Plugin::autoRefresh() return; } - FCM_Notification* notif = new FCM_Notification(this, newCookieList.size()); + auto* notif = new FCM_Notification(this, newCookieList.size()); weView->addNotification(notif); } } @@ -354,7 +354,7 @@ AbstractButtonInterface* FCM_Plugin::createStatusBarIcon(BrowserWindow* mainWind return m_statusBarIcons.value(mainWindow); } - FCM_Button* icon = new FCM_Button(this); + auto* icon = new FCM_Button(this); icon->setIcon(QIcon(QSL(":/flashcookiemanager/data/flash-cookie-manager.png"))); icon->setTitle(tr("Flash Cookie Manager")); icon->setToolTip(tr("Show Flash Cookie Manager")); diff --git a/src/plugins/GreaseMonkey/gm_manager.cpp b/src/plugins/GreaseMonkey/gm_manager.cpp index 69e019d6e..b1bde3e9a 100644 --- a/src/plugins/GreaseMonkey/gm_manager.cpp +++ b/src/plugins/GreaseMonkey/gm_manager.cpp @@ -64,10 +64,10 @@ void GM_Manager::showSettings(QWidget* parent) void GM_Manager::downloadScript(const QUrl &url) { - GM_Downloader *downloader = new GM_Downloader(url, this); + auto *downloader = new GM_Downloader(url, this); connect(downloader, &GM_Downloader::finished, this, [=](const QString &fileName) { bool deleteScript = true; - GM_Script *script = new GM_Script(this, fileName); + auto *script = new GM_Script(this, fileName); if (script->isValid()) { if (!containsScript(script->fullName())) { GM_AddScriptDialog dialog(this, script); @@ -99,7 +99,7 @@ QString GM_Manager::requireScripts(const QStringList &urlList) const { QDir requiresDir(m_settingsPath + QL1S("/greasemonkey/requires")); if (!requiresDir.exists() || urlList.isEmpty()) { - return QString(); + return {}; } QSettings settings(m_settingsPath + QL1S("/greasemonkey/requires/requires.ini"), QSettings::IniFormat); @@ -251,7 +251,7 @@ void GM_Manager::load() const auto fileNames = gmDir.entryList(QStringList("*.js"), QDir::Files); for (const QString &fileName : fileNames) { const QString absolutePath = gmDir.absoluteFilePath(fileName); - GM_Script* script = new GM_Script(this, absolutePath); + auto* script = new GM_Script(this, absolutePath); if (!script->isValid()) { delete script; @@ -274,7 +274,7 @@ void GM_Manager::load() void GM_Manager::scriptChanged() { - GM_Script *script = qobject_cast(sender()); + auto *script = qobject_cast(sender()); if (!script) return; @@ -291,7 +291,7 @@ bool GM_Manager::canRunOnScheme(const QString &scheme) void GM_Manager::mainWindowCreated(BrowserWindow* window) { - GM_Icon *icon = new GM_Icon(this); + auto *icon = new GM_Icon(this); window->statusBar()->addButton(icon); window->navigationBar()->addToolButton(icon); m_windows[window] = icon; diff --git a/src/plugins/GreaseMonkey/gm_script.cpp b/src/plugins/GreaseMonkey/gm_script.cpp index 11716af8e..8fa44e408 100644 --- a/src/plugins/GreaseMonkey/gm_script.cpp +++ b/src/plugins/GreaseMonkey/gm_script.cpp @@ -162,7 +162,7 @@ void GM_Script::updateScript() m_updating = true; emit updatingChanged(m_updating); - GM_Downloader *downloader = new GM_Downloader(m_downloadUrl, m_manager); + auto *downloader = new GM_Downloader(m_downloadUrl, m_manager); downloader->updateScript(m_fileName); connect(downloader, &GM_Downloader::finished, this, [this]() { m_updating = false; @@ -335,7 +335,7 @@ void GM_Script::downloadRequires() { for (const QString &url : qAsConst(m_require)) { if (m_manager->requireScripts({url}).isEmpty()) { - GM_Downloader *downloader = new GM_Downloader(QUrl(url), m_manager, GM_Downloader::DownloadRequireScript); + auto *downloader = new GM_Downloader(QUrl(url), m_manager, GM_Downloader::DownloadRequireScript); connect(downloader, &GM_Downloader::finished, this, &GM_Script::reloadScript); } } diff --git a/src/plugins/GreaseMonkey/settings/gm_settings.cpp b/src/plugins/GreaseMonkey/settings/gm_settings.cpp index 3d1685e6c..388fe45f6 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settings.cpp +++ b/src/plugins/GreaseMonkey/settings/gm_settings.cpp @@ -68,7 +68,7 @@ void GM_Settings::showItemInfo(QListWidgetItem* item) return; } - GM_SettingsScriptInfo* dialog = new GM_SettingsScriptInfo(script, this); + auto* dialog = new GM_SettingsScriptInfo(script, this); dialog->open(); } @@ -138,10 +138,10 @@ void GM_Settings::newScript() file.write(script.arg(name).toUtf8()); file.close(); - GM_Script *gmScript = new GM_Script(m_manager, file.fileName()); + auto *gmScript = new GM_Script(m_manager, file.fileName()); m_manager->addScript(gmScript); - GM_SettingsScriptInfo* dialog = new GM_SettingsScriptInfo(gmScript, this); + auto* dialog = new GM_SettingsScriptInfo(gmScript, this); dialog->open(); } @@ -154,7 +154,7 @@ void GM_Settings::loadScripts() const auto allScripts = m_manager->allScripts(); for (GM_Script* script : allScripts) { - QListWidgetItem* item = new QListWidgetItem(ui->listWidget); + auto* item = new QListWidgetItem(ui->listWidget); item->setText(script->name()); item->setIcon(script->icon()); item->setFlags(item->flags() | Qt::ItemIsUserCheckable); diff --git a/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.cpp b/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.cpp index 5e8ade759..cf36ce768 100644 --- a/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.cpp +++ b/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.cpp @@ -60,7 +60,7 @@ void KDEFrameworksIntegrationPlugin::init(InitState state, const QString &settin if (WebPage::internalSchemes().contains(protocol)) { continue; } - KIOSchemeHandler *handler = new KIOSchemeHandler(protocol, this); + auto *handler = new KIOSchemeHandler(protocol, this); m_kioSchemeHandlers.append(handler); mApp->webProfile()->installUrlSchemeHandler(protocol.toUtf8(), handler); WebPage::addSupportedScheme(protocol); diff --git a/src/plugins/MouseGestures/mousegestures.cpp b/src/plugins/MouseGestures/mousegestures.cpp index c578125c4..4e1e068b8 100644 --- a/src/plugins/MouseGestures/mousegestures.cpp +++ b/src/plugins/MouseGestures/mousegestures.cpp @@ -49,34 +49,34 @@ void MouseGestures::initFilter() m_filter = new QjtMouseGestureFilter(false, m_button, 20); - QjtMouseGesture* upGesture = new QjtMouseGesture(DirectionList() << Up, m_filter); + auto* upGesture = new QjtMouseGesture(DirectionList() << Up, m_filter); connect(upGesture, &QjtMouseGesture::gestured, this, &MouseGestures::upGestured); - QjtMouseGesture* downGesture = new QjtMouseGesture(DirectionList() << Down, m_filter); + auto* downGesture = new QjtMouseGesture(DirectionList() << Down, m_filter); connect(downGesture, &QjtMouseGesture::gestured, this, &MouseGestures::downGestured); - QjtMouseGesture* leftGesture = new QjtMouseGesture(DirectionList() << Left, m_filter); + auto* leftGesture = new QjtMouseGesture(DirectionList() << Left, m_filter); connect(leftGesture, &QjtMouseGesture::gestured, this, &MouseGestures::leftGestured); - QjtMouseGesture* rightGesture = new QjtMouseGesture(DirectionList() << Right, m_filter); + auto* rightGesture = new QjtMouseGesture(DirectionList() << Right, m_filter); connect(rightGesture, &QjtMouseGesture::gestured, this, &MouseGestures::rightGestured); - QjtMouseGesture* downRightGesture = new QjtMouseGesture(DirectionList() << Down << Right, m_filter); + auto* downRightGesture = new QjtMouseGesture(DirectionList() << Down << Right, m_filter); connect(downRightGesture, &QjtMouseGesture::gestured, this, &MouseGestures::downRightGestured); - QjtMouseGesture* downLeftGesture = new QjtMouseGesture(DirectionList() << Down << Left, m_filter); + auto* downLeftGesture = new QjtMouseGesture(DirectionList() << Down << Left, m_filter); connect(downLeftGesture, &QjtMouseGesture::gestured, this, &MouseGestures::downLeftGestured); - QjtMouseGesture* downUpGesture = new QjtMouseGesture(DirectionList() << Down << Up, m_filter); + auto* downUpGesture = new QjtMouseGesture(DirectionList() << Down << Up, m_filter); connect(downUpGesture, &QjtMouseGesture::gestured, this, &MouseGestures::downUpGestured); - QjtMouseGesture* upDownGesture = new QjtMouseGesture(DirectionList() << Up << Down, m_filter); + auto* upDownGesture = new QjtMouseGesture(DirectionList() << Up << Down, m_filter); connect(upDownGesture, &QjtMouseGesture::gestured, this, &MouseGestures::upDownGestured); - QjtMouseGesture* upLeftGesture = new QjtMouseGesture(DirectionList() << Up << Left, m_filter); + auto* upLeftGesture = new QjtMouseGesture(DirectionList() << Up << Left, m_filter); connect(upLeftGesture, &QjtMouseGesture::gestured, this, &MouseGestures::upLeftGestured); - QjtMouseGesture* upRightGesture = new QjtMouseGesture(DirectionList() << Up << Right, m_filter); + auto* upRightGesture = new QjtMouseGesture(DirectionList() << Up << Right, m_filter); connect(upRightGesture, &QjtMouseGesture::gestured, this, &MouseGestures::upRightGestured); m_filter->addGesture(upGesture); @@ -172,7 +172,7 @@ void MouseGestures::upGestured() void MouseGestures::downGestured() { - TabbedWebView* view = qobject_cast(m_view.data()); + auto* view = qobject_cast(m_view.data()); if (!view) return; @@ -218,7 +218,7 @@ void MouseGestures::rightGestured() void MouseGestures::downRightGestured() { - TabbedWebView *view = qobject_cast(m_view.data()); + auto *view = qobject_cast(m_view.data()); if (!view) return; @@ -245,7 +245,7 @@ void MouseGestures::downLeftGestured() void MouseGestures::downUpGestured() { - TabbedWebView* view = qobject_cast(m_view.data()); + auto* view = qobject_cast(m_view.data()); if (!view) return; @@ -268,7 +268,7 @@ void MouseGestures::upDownGestured() void MouseGestures::upLeftGestured() { - TabbedWebView* view = qobject_cast(m_view.data()); + auto* view = qobject_cast(m_view.data()); if (!view) return; @@ -284,7 +284,7 @@ void MouseGestures::upLeftGestured() void MouseGestures::upRightGestured() { - TabbedWebView* view = qobject_cast(m_view.data()); + auto* view = qobject_cast(m_view.data()); if (!view) return; diff --git a/src/plugins/MouseGestures/mousegesturessettingsdialog.cpp b/src/plugins/MouseGestures/mousegesturessettingsdialog.cpp index 8dd2f0012..b7f0275f1 100644 --- a/src/plugins/MouseGestures/mousegesturessettingsdialog.cpp +++ b/src/plugins/MouseGestures/mousegesturessettingsdialog.cpp @@ -55,7 +55,7 @@ MouseGesturesSettingsDialog::~MouseGesturesSettingsDialog() void MouseGesturesSettingsDialog::showLicense() { - LicenseViewer* v = new LicenseViewer(this); + auto* v = new LicenseViewer(this); v->setLicenseFile(":mousegestures/data/copyright"); v->show(); diff --git a/src/plugins/PIM/PIM_handler.cpp b/src/plugins/PIM/PIM_handler.cpp index 03b10898e..df001e945 100644 --- a/src/plugins/PIM/PIM_handler.cpp +++ b/src/plugins/PIM/PIM_handler.cpp @@ -111,7 +111,7 @@ void PIM_Handler::populateWebViewMenu(QMenu* menu, WebView* view, const WebHitTe loadSettings(); } - QMenu* pimMenu = new QMenu(tr("Insert Personal Information")); + auto* pimMenu = new QMenu(tr("Insert Personal Information")); pimMenu->setIcon(QIcon(QStringLiteral(":/PIM/data/PIM.png"))); if (!m_allInfo[PI_FirstName].isEmpty() && !m_allInfo[PI_LastName].isEmpty()) { @@ -187,7 +187,7 @@ void PIM_Handler::pimInsert() if (!m_view || m_clickedPos.isNull()) return; - QAction* action = qobject_cast(sender()); + auto* action = qobject_cast(sender()); if (!action) return; @@ -206,7 +206,7 @@ void PIM_Handler::pimInsert() void PIM_Handler::pageLoadFinished() { - WebPage* page = qobject_cast(sender()); + auto* page = qobject_cast(sender()); if (!page) { return; } diff --git a/src/plugins/PIM/PIM_plugin.cpp b/src/plugins/PIM/PIM_plugin.cpp index d77e338c8..e3228e6de 100644 --- a/src/plugins/PIM/PIM_plugin.cpp +++ b/src/plugins/PIM/PIM_plugin.cpp @@ -67,7 +67,7 @@ void PIM_Plugin::populateWebViewMenu(QMenu* menu, WebView* view, const WebHitTes bool PIM_Plugin::keyPress(Qz::ObjectName type, QObject* obj, QKeyEvent* event) { if (type == Qz::ON_WebView) { - WebView* view = qobject_cast(obj); + auto* view = qobject_cast(obj); return m_handler->keyPress(view, event); } diff --git a/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp b/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp index cd18ee48d..efdf816d9 100644 --- a/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp +++ b/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp @@ -125,13 +125,13 @@ void SBI_IconsManager::destroyIcons() void SBI_IconsManager::mainWindowCreated(BrowserWindow* window) { if (m_showImagesIcon) { - SBI_ImagesIcon* w = new SBI_ImagesIcon(window, m_settingsPath); + auto* w = new SBI_ImagesIcon(window, m_settingsPath); window->statusBar()->addPermanentWidget(w); m_windows[window].append(w); } if (m_showJavaScriptIcon) { - SBI_JavaScriptIcon* w = new SBI_JavaScriptIcon(window); + auto* w = new SBI_JavaScriptIcon(window); window->statusBar()->addPermanentWidget(w); m_windows[window].append(w); } @@ -141,13 +141,13 @@ void SBI_IconsManager::mainWindowCreated(BrowserWindow* window) m_networkManager = new SBI_NetworkManager(m_settingsPath, this); } - SBI_NetworkIcon* w = new SBI_NetworkIcon(window); + auto* w = new SBI_NetworkIcon(window); window->statusBar()->addPermanentWidget(w); m_windows[window].append(w); } if (m_showZoomWidget) { - SBI_ZoomWidget* w = new SBI_ZoomWidget(window); + auto* w = new SBI_ZoomWidget(window); window->statusBar()->addPermanentWidget(w); m_windows[window].append(w); } diff --git a/src/plugins/StatusBarIcons/sbi_imagesicon.cpp b/src/plugins/StatusBarIcons/sbi_imagesicon.cpp index db61f92ce..ccd0d03ce 100644 --- a/src/plugins/StatusBarIcons/sbi_imagesicon.cpp +++ b/src/plugins/StatusBarIcons/sbi_imagesicon.cpp @@ -113,7 +113,7 @@ void SBI_ImagesIcon::updateIcon() setGraphicsEffect(0); } else { - QGraphicsColorizeEffect* effect = new QGraphicsColorizeEffect(this); + auto* effect = new QGraphicsColorizeEffect(this); effect->setColor(Qt::gray); setGraphicsEffect(effect); } diff --git a/src/plugins/StatusBarIcons/sbi_javascripticon.cpp b/src/plugins/StatusBarIcons/sbi_javascripticon.cpp index c646af78b..a6da495e8 100644 --- a/src/plugins/StatusBarIcons/sbi_javascripticon.cpp +++ b/src/plugins/StatusBarIcons/sbi_javascripticon.cpp @@ -74,7 +74,7 @@ void SBI_JavaScriptIcon::updateIcon() setGraphicsEffect(0); } else { - QGraphicsColorizeEffect* effect = new QGraphicsColorizeEffect(this); + auto* effect = new QGraphicsColorizeEffect(this); effect->setColor(Qt::gray); setGraphicsEffect(effect); } @@ -105,6 +105,6 @@ void SBI_JavaScriptIcon::toggleJavaScript() void SBI_JavaScriptIcon::openJavaScriptSettings() { - JsOptions* dialog = new JsOptions(m_window); + auto* dialog = new JsOptions(m_window); dialog->open(); } diff --git a/src/plugins/StatusBarIcons/sbi_networkicon.cpp b/src/plugins/StatusBarIcons/sbi_networkicon.cpp index 1fc72d68a..1c85ce61d 100644 --- a/src/plugins/StatusBarIcons/sbi_networkicon.cpp +++ b/src/plugins/StatusBarIcons/sbi_networkicon.cpp @@ -52,7 +52,7 @@ void SBI_NetworkIcon::onlineStateChanged(bool online) void SBI_NetworkIcon::showDialog() { - SBI_NetworkIconDialog* dialog = new SBI_NetworkIconDialog(m_window); + auto* dialog = new SBI_NetworkIconDialog(m_window); dialog->open(); } @@ -88,7 +88,7 @@ void SBI_NetworkIcon::showMenu(const QPoint &pos) void SBI_NetworkIcon::useProxy() { - if (QAction* act = qobject_cast(sender())) { + if (auto* act = qobject_cast(sender())) { SBINetManager->setCurrentProxy(act->data().toString()); } } diff --git a/src/plugins/StatusBarIcons/sbi_networkmanager.cpp b/src/plugins/StatusBarIcons/sbi_networkmanager.cpp index acafe7573..e7169a913 100644 --- a/src/plugins/StatusBarIcons/sbi_networkmanager.cpp +++ b/src/plugins/StatusBarIcons/sbi_networkmanager.cpp @@ -50,7 +50,7 @@ void SBI_NetworkManager::loadSettings() continue; } - SBI_NetworkProxy* proxy = new SBI_NetworkProxy; + auto* proxy = new SBI_NetworkProxy; settings.beginGroup(group); proxy->loadFromSettings(settings); diff --git a/src/plugins/StatusBarIcons/sbi_proxywidget.cpp b/src/plugins/StatusBarIcons/sbi_proxywidget.cpp index 00375f86b..00b93ef67 100644 --- a/src/plugins/StatusBarIcons/sbi_proxywidget.cpp +++ b/src/plugins/StatusBarIcons/sbi_proxywidget.cpp @@ -39,7 +39,7 @@ void SBI_ProxyWidget::clear() SBI_NetworkProxy* SBI_ProxyWidget::getProxy() const { - SBI_NetworkProxy* proxy = new SBI_NetworkProxy; + auto* proxy = new SBI_NetworkProxy; proxy->setHostName(ui->proxyServer->text()); proxy->setPort(ui->proxyPort->text().toInt()); diff --git a/src/plugins/StatusBarIcons/statusbariconsplugin.cpp b/src/plugins/StatusBarIcons/statusbariconsplugin.cpp index de679619f..2de32c882 100644 --- a/src/plugins/StatusBarIcons/statusbariconsplugin.cpp +++ b/src/plugins/StatusBarIcons/statusbariconsplugin.cpp @@ -66,6 +66,6 @@ bool StatusBarIconsPlugin::testPlugin() void StatusBarIconsPlugin::showSettings(QWidget* parent) { - SBI_SettingsDialog* dialog = new SBI_SettingsDialog(m_manager, parent); + auto* dialog = new SBI_SettingsDialog(m_manager, parent); dialog->open(); } diff --git a/src/plugins/TabManager/tabmanagerplugin.cpp b/src/plugins/TabManager/tabmanagerplugin.cpp index e63f86606..28c6b6d87 100644 --- a/src/plugins/TabManager/tabmanagerplugin.cpp +++ b/src/plugins/TabManager/tabmanagerplugin.cpp @@ -87,7 +87,7 @@ bool TabManagerPlugin::testPlugin() void TabManagerPlugin::showSettings(QWidget* parent) { - TabManagerSettings* settings = new TabManagerSettings(this, parent); + auto* settings = new TabManagerSettings(this, parent); settings->exec(); } diff --git a/src/plugins/TabManager/tabmanagerwidget.cpp b/src/plugins/TabManager/tabmanagerwidget.cpp index 9ace567c7..87935cf51 100644 --- a/src/plugins/TabManager/tabmanagerwidget.cpp +++ b/src/plugins/TabManager/tabmanagerwidget.cpp @@ -77,7 +77,7 @@ TabManagerWidget::TabManagerWidget(BrowserWindow* mainClass, QWidget* parent, bo ui->treeWidget->installEventFilter(this); ui->filterBar->installEventFilter(this); - QPushButton* closeButton = new QPushButton(ui->filterBar); + auto* closeButton = new QPushButton(ui->filterBar); closeButton->setFlat(true); closeButton->setIcon(style()->standardIcon(QStyle::SP_TitleBarCloseButton)); ui->filterBar->addWidget(closeButton, LineEdit::RightSide); @@ -122,7 +122,7 @@ QString TabManagerWidget::domainFromUrl(const QUrl &url, bool useHostName) return urlString.append(appendString); } - if (useHostName || host.contains(QRegExp("^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$"))) { + if (useHostName || host.contains(QRegExp(R"(^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$)"))) { if (host.startsWith("www.", Qt::CaseInsensitive)) { host.remove(0, 4); } @@ -174,7 +174,7 @@ void TabManagerWidget::refreshTree() } for (int j = 0; j < winItem->childCount(); ++j) { - TabItem* tabItem = static_cast(winItem->child(j)); + auto* tabItem = static_cast(winItem->child(j)); if (!tabItem || tabItem->checkState(0) == Qt::Unchecked) { continue; } @@ -203,7 +203,7 @@ void TabManagerWidget::refreshTree() QTreeWidgetItem* winItem = ui->treeWidget->topLevelItem(i); for (int j = 0; j < winItem->childCount(); ++j) { - TabItem* tabItem = static_cast(winItem->child(j)); + auto* tabItem = static_cast(winItem->child(j)); if (tabItem && selectedTabs.contains(tabItem->webTab())) { tabItem->setCheckState(0, Qt::Checked); @@ -223,7 +223,7 @@ void TabManagerWidget::refreshTree() void TabManagerWidget::onItemActivated(QTreeWidgetItem* item, int column) { - TabItem* tabItem = static_cast(item); + auto* tabItem = static_cast(item); if (!tabItem) { return; } @@ -276,7 +276,7 @@ void TabManagerWidget::customContextMenuRequested(const QPoint &pos) { QMenu* menu = nullptr; - TabItem* item = static_cast(ui->treeWidget->itemAt(pos)); + auto* item = static_cast(ui->treeWidget->itemAt(pos)); if (item) { BrowserWindow* mainWindow = item->window(); @@ -364,7 +364,7 @@ void TabManagerWidget::filterChanged(const QString &filter, bool force) QTreeWidgetItem* parentItem = ui->treeWidget->topLevelItem(i); int visibleChildCount = 0; for (int j = 0; j < parentItem->childCount(); ++j) { - TabItem* childItem = static_cast(parentItem->child(j)); + auto* childItem = static_cast(parentItem->child(j)); if (!childItem) { continue; } @@ -400,7 +400,7 @@ void TabManagerWidget::filterBarClosed() bool TabManagerWidget::eventFilter(QObject* obj, QEvent* event) { if (event->type() == QEvent::KeyPress) { - QKeyEvent *keyEvent = static_cast(event); + auto *keyEvent = static_cast(event); const QString text = keyEvent->text().simplified(); if (obj == ui->treeWidget) { @@ -463,7 +463,7 @@ void TabManagerWidget::processActions() } for (int j = 0; j < winItem->childCount(); ++j) { - TabItem* tabItem = static_cast(winItem->child(j)); + auto* tabItem = static_cast(winItem->child(j)); if (!tabItem || tabItem->checkState(0) == Qt::Unchecked) { continue; } @@ -503,7 +503,7 @@ void TabManagerWidget::processActions() void TabManagerWidget::changeGroupType() { - QAction* action = qobject_cast(sender()); + auto* action = qobject_cast(sender()); if (action) { int type = action->data().toInt(); @@ -568,12 +568,12 @@ void TabManagerWidget::detachSelectedTabs(const QHash & bool TabManagerWidget::bookmarkSelectedTabs(const QHash &tabsHash) { - QDialog* dialog = new QDialog(getWindow(), Qt::WindowStaysOnTopHint | Qt::MSWindowsFixedSizeDialogHint); - QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, dialog); - QLabel* label = new QLabel(dialog); - BookmarksFoldersButton* folderButton = new BookmarksFoldersButton(dialog); + auto* dialog = new QDialog(getWindow(), Qt::WindowStaysOnTopHint | Qt::MSWindowsFixedSizeDialogHint); + auto* layout = new QBoxLayout(QBoxLayout::TopToBottom, dialog); + auto* label = new QLabel(dialog); + auto* folderButton = new BookmarksFoldersButton(dialog); - QDialogButtonBox* box = new QDialogButtonBox(dialog); + auto* box = new QDialogButtonBox(dialog); box->addButton(QDialogButtonBox::Ok); box->addButton(QDialogButtonBox::Cancel); QObject::connect(box, &QDialogButtonBox::rejected, dialog, &QDialog::reject); @@ -597,7 +597,7 @@ bool TabManagerWidget::bookmarkSelectedTabs(const QHash for (WebTab* tab : tabsHash) { if (!tab->url().isEmpty()) { - BookmarkItem* bookmark = new BookmarkItem(BookmarkItem::Url); + auto* bookmark = new BookmarkItem(BookmarkItem::Url); bookmark->setTitle(tab->title()); bookmark->setUrl(tab->url()); mApp->bookmarks()->addBookmark(folderButton->selectedFolder(), bookmark); @@ -651,7 +651,7 @@ QTreeWidgetItem* TabManagerWidget::groupByDomainName(bool useHostName) QString domain = domainFromUrl(webTab->url(), useHostName); if (!tabsGroupedByDomain.contains(domain)) { - TabItem* groupItem = new TabItem(ui->treeWidget, false, false, 0, false); + auto* groupItem = new TabItem(ui->treeWidget, false, false, 0, false); groupItem->setTitle(domain); groupItem->setIsActiveOrCaption(true); @@ -660,7 +660,7 @@ QTreeWidgetItem* TabManagerWidget::groupByDomainName(bool useHostName) QTreeWidgetItem* groupItem = tabsGroupedByDomain.value(domain); - TabItem* tabItem = new TabItem(ui->treeWidget, false, true, groupItem); + auto* tabItem = new TabItem(ui->treeWidget, false, true, groupItem); tabItem->setBrowserWindow(mainWin); tabItem->setWebTab(webTab); @@ -700,7 +700,7 @@ QTreeWidgetItem* TabManagerWidget::groupByWindow() for (int win = 0; win < windows.count(); ++win) { BrowserWindow* mainWin = windows.at(win); - TabItem* winItem = new TabItem(ui->treeWidget, true, false); + auto* winItem = new TabItem(ui->treeWidget, true, false); winItem->setBrowserWindow(mainWin); winItem->setText(0, tr("Window %1").arg(QString::number(win + 1))); winItem->setToolTip(0, tr("Double click to switch")); @@ -714,7 +714,7 @@ QTreeWidgetItem* TabManagerWidget::groupByWindow() m_webPage = 0; continue; } - TabItem* tabItem = new TabItem(ui->treeWidget, true, true, winItem); + auto* tabItem = new TabItem(ui->treeWidget, true, true, winItem); tabItem->setBrowserWindow(mainWin); tabItem->setWebTab(webTab); @@ -882,13 +882,13 @@ QStringList TabTreeWidget::mimeTypes() const QMimeData *TabTreeWidget::mimeData(const QList items) const { - QMimeData* mimeData = new QMimeData(); + auto* mimeData = new QMimeData(); QByteArray encodedData; QDataStream stream(&encodedData, QIODevice::WriteOnly); if (items.size() > 0) { - TabItem* tabItem = static_cast(items.at(0)); + auto* tabItem = static_cast(items.at(0)); if (!tabItem || !tabItem->isTab()) return 0; @@ -908,7 +908,7 @@ bool TabTreeWidget::dropMimeData(QTreeWidgetItem *parent, int index, const QMime return true; } - TabItem* parentItem = static_cast(parent); + auto* parentItem = static_cast(parent); if (!data->hasFormat(MIMETYPE) || !parentItem) { return false; @@ -927,8 +927,8 @@ bool TabTreeWidget::dropMimeData(QTreeWidgetItem *parent, int index, const QMime stream >> windowPtr >> webTabPtr; - WebTab* webTab = (WebTab*) webTabPtr; - BrowserWindow* window = (BrowserWindow*) windowPtr; + auto* webTab = (WebTab*) webTabPtr; + auto* window = (BrowserWindow*) windowPtr; if (window == targetWindow) { if (index > 0 && webTab->tabIndex() < index) diff --git a/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp b/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp index 0ba3df479..525d1d9c5 100644 --- a/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp +++ b/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp @@ -61,8 +61,7 @@ TabManagerWidgetController::TabManagerWidgetController(QObject* parent) } TabManagerWidgetController::~TabManagerWidgetController() -{ -} += default; QString TabManagerWidgetController::title() const { @@ -71,7 +70,7 @@ QString TabManagerWidgetController::title() const QAction* TabManagerWidgetController::createMenuAction() { - QAction* act = new QAction(tr("Tab Manager"), this); + auto* act = new QAction(tr("Tab Manager"), this); act->setCheckable(true); act->setIcon(QIcon(":tabmanager/data/tabmanager.png")); act->setShortcut(QKeySequence("Ctrl+Shift+M")); @@ -95,7 +94,7 @@ AbstractButtonInterface* TabManagerWidgetController::createStatusBarIcon(Browser return m_statusBarIcons.value(mainWindow); } - TabManagerButton* icon = new TabManagerButton(this); + auto* icon = new TabManagerButton(this); icon->setIcon(QPixmap(":tabmanager/data/tabmanager.png")); icon->setTitle(tr("Tab Manager")); icon->setToolTip(tr("Show Tab Manager")); @@ -141,7 +140,7 @@ void TabManagerWidgetController::setGroupType(TabManagerWidget::GroupType type) TabManagerWidget* TabManagerWidgetController::createTabManagerWidget(BrowserWindow* mainClass, QWidget* parent, bool defaultWidget) { - TabManagerWidget* tabManagerWidget = new TabManagerWidget(mainClass, parent, defaultWidget); + auto* tabManagerWidget = new TabManagerWidget(mainClass, parent, defaultWidget); tabManagerWidget->setGroupType(m_groupType); if (defaultWidget) { diff --git a/src/plugins/TabManager/tldextractor/tldextractor.cpp b/src/plugins/TabManager/tldextractor/tldextractor.cpp index 8f5df7e77..86af2f4cc 100644 --- a/src/plugins/TabManager/tldextractor/tldextractor.cpp +++ b/src/plugins/TabManager/tldextractor/tldextractor.cpp @@ -59,7 +59,7 @@ bool TLDExtractor::isDataLoaded() QString TLDExtractor::TLD(const QString &host) { if (host.isEmpty() || host.startsWith(QLatin1Char('.'))) { - return QString(); + return {}; } QString cleanHost = normalizedHost(host); @@ -156,7 +156,7 @@ QString TLDExtractor::domain(const QString &host) QString TLDExtractor::domainHelper(const QString &host, const QString &tldPart) { if (host.isEmpty() || tldPart.isEmpty()) { - return QString(); + return {}; } QString temp = normalizedHost(host); @@ -172,7 +172,7 @@ QString TLDExtractor::domainHelper(const QString &host, const QString &tldPart) QString TLDExtractor::registrableDomainHelper(const QString &domainPart, const QString &tldPart) { if (tldPart.isEmpty() || domainPart.isEmpty()) { - return QString(); + return {}; } else { return QString("%1.%2").arg(domainPart).arg(tldPart); @@ -193,7 +193,7 @@ QString TLDExtractor::subdomainHelper(const QString &host, const QString ®ist return subdomain; } - return QString(); + return {}; } QString TLDExtractor::registrableDomain(const QString &host) diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp index d884449d1..80bc79c9d 100644 --- a/src/plugins/TestPlugin/testplugin.cpp +++ b/src/plugins/TestPlugin/testplugin.cpp @@ -94,12 +94,12 @@ void TestPlugin::showSettings(QWidget* parent) if (!m_settings) { m_settings = new QDialog(parent); - QPushButton* b = new QPushButton("Example Plugin v0.0.1"); - QPushButton* closeButton = new QPushButton(tr("Close")); - QLabel* label = new QLabel(); + auto* b = new QPushButton("Example Plugin v0.0.1"); + auto* closeButton = new QPushButton(tr("Close")); + auto* label = new QLabel(); label->setPixmap(QPixmap(":icons/other/about.svg")); - QVBoxLayout* l = new QVBoxLayout(m_settings.data()); + auto* l = new QVBoxLayout(m_settings.data()); l->addWidget(label); l->addWidget(b); l->addWidget(closeButton); diff --git a/src/plugins/TestPlugin/testplugin_sidebar.cpp b/src/plugins/TestPlugin/testplugin_sidebar.cpp index 74d04219e..699e70451 100644 --- a/src/plugins/TestPlugin/testplugin_sidebar.cpp +++ b/src/plugins/TestPlugin/testplugin_sidebar.cpp @@ -37,7 +37,7 @@ QAction* TestPlugin_Sidebar::createMenuAction() // The action must be parented to some object from plugin, otherwise // there may be a crash when unloading the plugin. - QAction* act = new QAction(tr("Testing Sidebar"), this); + auto* act = new QAction(tr("Testing Sidebar"), this); act->setCheckable(true); return act; @@ -47,12 +47,12 @@ QWidget* TestPlugin_Sidebar::createSideBarWidget(BrowserWindow* mainWindow) { Q_UNUSED(mainWindow) - QWidget* w = new QWidget; - QPushButton* b = new QPushButton("Example Plugin v0.0.1"); - QLabel* label = new QLabel(); + auto* w = new QWidget; + auto* b = new QPushButton("Example Plugin v0.0.1"); + auto* label = new QLabel(); label->setPixmap(QPixmap(":icons/other/about.svg")); - QVBoxLayout* l = new QVBoxLayout(w); + auto* l = new QVBoxLayout(w); l->addWidget(label); l->addWidget(b); w->setLayout(l); diff --git a/src/plugins/VerticalTabs/loadinganimator.cpp b/src/plugins/VerticalTabs/loadinganimator.cpp index d0b5ff22c..f5add4471 100644 --- a/src/plugins/VerticalTabs/loadinganimator.cpp +++ b/src/plugins/VerticalTabs/loadinganimator.cpp @@ -29,7 +29,7 @@ public: : QObject(animator) , m_animator(animator) { - QTimer *timer = new QTimer(this); + auto *timer = new QTimer(this); timer->setInterval(TabIcon::data()->animationInterval); connect(timer, &QTimer::timeout, this, [this]() { m_currentFrame = (m_currentFrame + 1) % TabIcon::data()->framesCount; diff --git a/src/plugins/VerticalTabs/tablistview.cpp b/src/plugins/VerticalTabs/tablistview.cpp index 476cf9de3..e075bda5c 100644 --- a/src/plugins/VerticalTabs/tablistview.cpp +++ b/src/plugins/VerticalTabs/tablistview.cpp @@ -98,7 +98,7 @@ void TabListView::adjustStyleOption(QStyleOptionViewItem *option) QModelIndex TabListView::indexAfter(const QModelIndex &index) const { if (!index.isValid()) { - return QModelIndex(); + return {}; } const QRect rect = visualRect(index); return indexAt(QPoint(rect.right() + rect.width() / 2, rect.y())); @@ -107,7 +107,7 @@ QModelIndex TabListView::indexAfter(const QModelIndex &index) const QModelIndex TabListView::indexBefore(const QModelIndex &index) const { if (!index.isValid()) { - return QModelIndex(); + return {}; } const QRect rect = visualRect(index); return indexAt(QPoint(rect.left() - rect.width() / 2, rect.y())); @@ -149,9 +149,9 @@ bool TabListView::viewportEvent(QEvent *event) { switch (event->type()) { case QEvent::MouseButtonPress: { - QMouseEvent *me = static_cast(event); + auto *me = static_cast(event); const QModelIndex index = indexAt(me->pos()); - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); if (me->buttons() == Qt::MiddleButton && tab) { tab->closeTab(); } @@ -169,7 +169,7 @@ bool TabListView::viewportEvent(QEvent *event) } case QEvent::MouseButtonRelease: { - QMouseEvent *me = static_cast(event); + auto *me = static_cast(event); if (me->buttons() != Qt::NoButton) { break; } @@ -179,7 +179,7 @@ bool TabListView::viewportEvent(QEvent *event) } DelegateButton button = buttonAt(me->pos(), index); if (m_pressedButton == button) { - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); if (tab && m_pressedButton == AudioButton) { tab->toggleMuted(); } @@ -188,7 +188,7 @@ bool TabListView::viewportEvent(QEvent *event) } case QEvent::ToolTip: { - QHelpEvent *he = static_cast(event); + auto *he = static_cast(event); const QModelIndex index = indexAt(he->pos()); DelegateButton button = buttonAt(he->pos(), index); if (button == AudioButton) { @@ -205,9 +205,9 @@ bool TabListView::viewportEvent(QEvent *event) } case QEvent::ContextMenu: { - QContextMenuEvent *ce = static_cast(event); + auto *ce = static_cast(event); const QModelIndex index = indexAt(ce->pos()); - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); const int tabIndex = tab ? tab->tabIndex() : -1; TabContextMenu::Options options = TabContextMenu::HorizontalTabs | TabContextMenu::ShowDetachTabAction; TabContextMenu menu(tabIndex, m_window, options); diff --git a/src/plugins/VerticalTabs/tabtreedelegate.cpp b/src/plugins/VerticalTabs/tabtreedelegate.cpp index 250331dfc..8f078adb9 100644 --- a/src/plugins/VerticalTabs/tabtreedelegate.cpp +++ b/src/plugins/VerticalTabs/tabtreedelegate.cpp @@ -95,7 +95,7 @@ TabTreeDelegate::TabTreeDelegate(TabTreeView *view) connect(m_loadingAnimator, &LoadingAnimator::updateIndex, m_view, &TabTreeView::updateIndex); // Needed to make it stylable the same way as real tabbar close button - QTabBar *tabBar = new QTabBar(m_view); + auto *tabBar = new QTabBar(m_view); tabBar->setObjectName(QSL("tabtree_tabbar")); tabBar->lower(); diff --git a/src/plugins/VerticalTabs/tabtreeview.cpp b/src/plugins/VerticalTabs/tabtreeview.cpp index ac89d5deb..e7e692d14 100644 --- a/src/plugins/VerticalTabs/tabtreeview.cpp +++ b/src/plugins/VerticalTabs/tabtreeview.cpp @@ -59,7 +59,7 @@ TabTreeView::TabTreeView(BrowserWindow *window, QWidget *parent) if (m_initializing) { return; } - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); if (tab) { tab->setSessionData(m_expandedSessionKey, expanded); } @@ -197,10 +197,10 @@ bool TabTreeView::viewportEvent(QEvent *event) { switch (event->type()) { case QEvent::MouseButtonPress: { - QMouseEvent *me = static_cast(event); + auto *me = static_cast(event); const QModelIndex index = indexAt(me->pos()); updateIndex(index); - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); if (me->buttons() == Qt::MiddleButton) { if (tab) { if (isExpanded(index)) { @@ -240,7 +240,7 @@ bool TabTreeView::viewportEvent(QEvent *event) } case QEvent::MouseMove: { - QMouseEvent *me = static_cast(event); + auto *me = static_cast(event); if (m_pressedButton == CloseButton) { me->accept(); return true; @@ -249,7 +249,7 @@ bool TabTreeView::viewportEvent(QEvent *event) } case QEvent::MouseButtonRelease: { - QMouseEvent *me = static_cast(event); + auto *me = static_cast(event); if (me->buttons() != Qt::NoButton) { break; } @@ -264,7 +264,7 @@ bool TabTreeView::viewportEvent(QEvent *event) me->accept(); return true; } - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); if (tab) { if (m_pressedButton == CloseButton) { tab->closeTab(); @@ -281,7 +281,7 @@ bool TabTreeView::viewportEvent(QEvent *event) } case QEvent::MouseButtonDblClick: { - QMouseEvent *me = static_cast(event); + auto *me = static_cast(event); const QModelIndex index = indexAt(me->pos()); if (me->button() == Qt::LeftButton && !index.isValid()) { m_window->addTab(); @@ -292,7 +292,7 @@ bool TabTreeView::viewportEvent(QEvent *event) case QEvent::HoverEnter: case QEvent::HoverLeave: case QEvent::HoverMove: { - QHoverEvent *he = static_cast(event); + auto *he = static_cast(event); updateIndex(m_hoveredIndex); m_hoveredIndex = indexAt(he->pos()); updateIndex(m_hoveredIndex); @@ -300,7 +300,7 @@ bool TabTreeView::viewportEvent(QEvent *event) } case QEvent::ToolTip: { - QHelpEvent *he = static_cast(event); + auto *he = static_cast(event); const QModelIndex index = indexAt(he->pos()); DelegateButton button = buttonAt(he->pos(), index); if (button == AudioButton) { @@ -321,9 +321,9 @@ bool TabTreeView::viewportEvent(QEvent *event) } case QEvent::ContextMenu: { - QContextMenuEvent *ce = static_cast(event); + auto *ce = static_cast(event); const QModelIndex index = indexAt(ce->pos()); - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); const int tabIndex = tab ? tab->tabIndex() : -1; TabContextMenu::Options options = TabContextMenu::VerticalTabs | TabContextMenu::ShowDetachTabAction; if (m_tabsInOrder) { @@ -347,7 +347,7 @@ void TabTreeView::initView() for (int i = 0; i < model()->rowCount(); ++i) { const QModelIndex index = model()->index(i, 0); reverseTraverse(index, [this](const QModelIndex &index) { - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); if (tab) { setExpanded(index, tab->sessionData().value(m_expandedSessionKey, true).toBool()); } @@ -410,7 +410,7 @@ void TabTreeView::closeTree(const QModelIndex &root) { QVector tabs; reverseTraverse(root, [&](const QModelIndex &index) { - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); if (tab) { tabs.append(tab); } @@ -423,7 +423,7 @@ void TabTreeView::closeTree(const QModelIndex &root) void TabTreeView::unloadTree(const QModelIndex &root) { reverseTraverse(root, [&](const QModelIndex &index) { - WebTab *tab = index.data(TabModel::WebTabRole).value(); + auto *tab = index.data(TabModel::WebTabRole).value(); if (tab && tab->isRestored()) { tab->unload(); } diff --git a/src/plugins/VerticalTabs/verticaltabscontroller.cpp b/src/plugins/VerticalTabs/verticaltabscontroller.cpp index 7135175e5..a67095da1 100644 --- a/src/plugins/VerticalTabs/verticaltabscontroller.cpp +++ b/src/plugins/VerticalTabs/verticaltabscontroller.cpp @@ -37,14 +37,14 @@ QString VerticalTabsController::title() const QAction *VerticalTabsController::createMenuAction() { - QAction *act = new QAction(title(), this); + auto *act = new QAction(title(), this); act->setCheckable(true); return act; } QWidget *VerticalTabsController::createSideBarWidget(BrowserWindow *window) { - VerticalTabsWidget *widget = new VerticalTabsWidget(window); + auto *widget = new VerticalTabsWidget(window); widget->setViewType(m_plugin->viewType()); widget->setStyleSheet(m_plugin->styleSheet()); connect(m_plugin, &VerticalTabsPlugin::viewTypeChanged, widget, &VerticalTabsWidget::setViewType); diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.cpp b/src/plugins/VerticalTabs/verticaltabsplugin.cpp index d179bb1c1..7ab1571f1 100644 --- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp +++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp @@ -91,7 +91,7 @@ bool VerticalTabsPlugin::testPlugin() void VerticalTabsPlugin::showSettings(QWidget *parent) { - VerticalTabsSettings *settings = new VerticalTabsSettings(this, parent); + auto *settings = new VerticalTabsSettings(this, parent); settings->exec(); } diff --git a/src/plugins/VerticalTabs/verticaltabswidget.cpp b/src/plugins/VerticalTabs/verticaltabswidget.cpp index f6aa46d95..d3d54547e 100644 --- a/src/plugins/VerticalTabs/verticaltabswidget.cpp +++ b/src/plugins/VerticalTabs/verticaltabswidget.cpp @@ -36,12 +36,12 @@ VerticalTabsWidget::VerticalTabsWidget(BrowserWindow *window) : QWidget() , m_window(window) { - QVBoxLayout *layout = new QVBoxLayout(this); + auto *layout = new QVBoxLayout(this); layout->setSpacing(0); layout->setContentsMargins(0, 0, 0, 0); m_pinnedView = new TabListView(m_window, this); - TabFilterModel *model = new TabFilterModel(m_pinnedView); + auto *model = new TabFilterModel(m_pinnedView); model->setFilterPinnedTabs(false); model->setRejectDropOnLastIndex(true); model->setSourceModel(m_window->tabModel()); @@ -51,7 +51,7 @@ VerticalTabsWidget::VerticalTabsWidget(BrowserWindow *window) m_normalView = new TabTreeView(m_window, this); m_pinnedView->setFocusProxy(m_normalView); - ToolButton *buttonAddTab = new ToolButton(this); + auto *buttonAddTab = new ToolButton(this); buttonAddTab->setObjectName(QSL("verticaltabs-button-addtab")); buttonAddTab->setAutoRaise(true); buttonAddTab->setFocusPolicy(Qt::NoFocus); @@ -72,7 +72,7 @@ VerticalTabsWidget::VerticalTabsWidget(BrowserWindow *window) void VerticalTabsWidget::setViewType(VerticalTabsPlugin::ViewType type) { - TabFilterModel *model = new TabFilterModel(m_normalView); + auto *model = new TabFilterModel(m_normalView); model->setFilterPinnedTabs(true); delete m_normalView->model(); diff --git a/tests/benchmarks/adblockparserule.cpp b/tests/benchmarks/adblockparserule.cpp index 1366aac5a..5c2273bb9 100644 --- a/tests/benchmarks/adblockparserule.cpp +++ b/tests/benchmarks/adblockparserule.cpp @@ -33,7 +33,7 @@ private Q_SLOTS: void AdBlockParseRule::parseEasyList() { QBENCHMARK { - AdBlockSubscription* subscription = new AdBlockSubscription(QSL("EasyList"), this); + auto* subscription = new AdBlockSubscription(QSL("EasyList"), this); subscription->setFilePath(QSL(":/files/easylist.txt")); subscription->loadSubscription(QStringList()); }