Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

Modernize code

Browse Source
This commit is contained in:
Laurent Montel 2022-06-19 09:24:25 +02:00
parent 4543c74436
commit 3fa1e81105
189 changed files with 717 additions and 744 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotests/databaseencryptedpasswordbackendtest.cpp
View File

@ -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)));

2
autotests/locationbartest.cpp
View File

@ -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");

14
autotests/qml/qmlbookmarksapitest.cpp
View File

@ -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<QObject*>(bookmark->property("parent"));
auto* parent = qvariant_cast<QObject*>(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<QObject*>(qmlBookmarksSpy.at(0).at(0));
auto *created = qvariant_cast<QObject*>(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<BookmarkItem*>(bookmarksSpy.at(0).at(0));
auto* createdItem = qvariant_cast<BookmarkItem*>(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<QObject*>(qmlBookmarksSpy.at(0).at(0));
auto *modified = qvariant_cast<QObject*>(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<BookmarkItem*>(bookmarksSpy.at(0).at(0));
auto* modifiedItem = qvariant_cast<BookmarkItem*>(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<QObject*>(qmlBookmarksSpy.at(0).at(0));
auto *removed = qvariant_cast<QObject*>(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<BookmarkItem*>(bookmarksSpy.at(0).at(0));
auto* removedItem = qvariant_cast<BookmarkItem*>(bookmarksSpy.at(0).at(0));
QVERIFY(removedItem);
QCOMPARE(removedItem->title(), QString("Modified Example Plugin"));
}

4
autotests/qml/qmlcookiesapitest.cpp
View File

@ -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<QObject*>(addedQmlCookieMap.value("cookie"));
auto *addedQmlCookie = qvariant_cast<QObject*>(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<QObject*>(removedQmlCookieMap.value("cookie"));
auto *removedQmlCookie = qvariant_cast<QObject*>(removedQmlCookieMap.value("cookie"));
removed = removedQmlCookieMap.value("removed").toBool();
QCOMPARE(removedQmlCookie->property("name").toString(), QSL("Example"));
QCOMPARE(removed, true);

4
autotests/qml/qmltopsitesapitest.cpp
View File

@ -37,7 +37,7 @@ void QmlTopSitesApiTest::testTopSites()
qDebug() << "Top sites list size=" << list.length();
for( const auto& site : list )
{
QObject* object = qvariant_cast<QObject*>(site);
auto* object = qvariant_cast<QObject*>(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<QObject*>(list.at(0));
auto* object = qvariant_cast<QObject*>(list.at(0));
QVERIFY(object);
QCOMPARE(object->property("title").toString(), QSL("Example Domain"));
QCOMPARE(object->property("url").toString(), QSL("https://example.com"));

10
autotests/qml/qmluserscriptapitest.cpp
View File

@ -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<QmlUserScripts*>(object);
auto *userScripts = dynamic_cast<QmlUserScripts*>(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<QmlUserScripts*>(object);
auto *userScripts = dynamic_cast<QmlUserScripts*>(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<QmlUserScripts*>(object);
auto *userScripts = dynamic_cast<QmlUserScripts*>(object);
QVERIFY(userScripts);
QmlUserScript *userScript = new QmlUserScript();
auto *userScript = new QmlUserScript();
userScript->setProperty("name", "Hello World");
userScript->setProperty("sourceCode", "(function() {"
" alert('Hello World')"

2
autotests/qml/qmlwindowsapitest.cpp
View File

@ -57,7 +57,7 @@ void QmlWindowsApiTest::testWindowsAPI()
QTRY_COMPARE(qmlWindowCreatedSignal.count(), 2);
QTRY_COMPARE(windowCreatedSingal.count(), 2);
QObject *newQmlSignalWindow = qvariant_cast<QObject*>(qmlWindowCreatedSignal.at(1).at(0));
auto *newQmlSignalWindow = qvariant_cast<QObject*>(qmlWindowCreatedSignal.at(1).at(0));
QVERIFY(newQmlSignalWindow);
QCOMPARE(newQmlWindow->property("id").toInt(), newQmlSignalWindow->property("id").toInt());

8
autotests/qztoolstest.cpp
View File

@ -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");

2
autotests/sqldatabasetest.cpp
View File

@ -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));

6
autotests/webviewtest.cpp
View File

@ -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);

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

@ -56,7 +56,7 @@ void FancyTabProxyStyle::drawControl(
QPainter* p, const QWidget* widget) const
{
const QStyleOptionTab* v_opt = qstyleoption_cast<const QStyleOptionTab*>(option);
const auto* v_opt = qstyleoption_cast<const QStyleOptionTab*>(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<QPropertyAnimation*>();
auto* animation = widget->property(animation_key.toUtf8().constData()).value<QPropertyAnimation*>();
if (!animation) {
QWidget* mut_widget = const_cast<QWidget*>(widget);
auto* mut_widget = const_cast<QWidget*>(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<QTabBar*>(o);
auto* bar = qobject_cast<QTabBar*>(o);
if (bar && (e->type() == QEvent::MouseMove || e->type() == QEvent::Leave)) {
QMouseEvent* event = static_cast<QMouseEvent*>(e);
auto* event = static_cast<QMouseEvent*>(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<FancyTabBar*>(tab_bar_)) {
if (auto* bar = qobject_cast<FancyTabBar*>(tab_bar_)) {
bar->setCurrentIndex(index);
}
else if (QTabBar* bar = qobject_cast<QTabBar*>(tab_bar_)) {
else if (auto* bar = qobject_cast<QTabBar*>(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);

20
src/lib/3rdparty/lineedit.cpp vendored
View File

@ -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()) {

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

@ -73,7 +73,7 @@ class FALKON_EXPORT LineEdit : public QLineEdit
Q_PROPERTY(int minHeight READ minHeight WRITE setMinHeight)
public:
typedef QList<QTextLayout::FormatRange> TextFormat;
using TextFormat = QList<QTextLayout::FormatRange>;
enum WidgetPosition {
LeftSide,

4
src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp vendored
View File

@ -56,8 +56,8 @@ typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
static PProcessIdToSessionId pProcessIdToSessionId = 0;
#endif
#if defined(Q_OS_UNIX)
#include <ctime>
#include <sys/types.h>
#include <time.h>
#include <unistd.h>
#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);
}

6
src/lib/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp vendored
View File

@ -38,10 +38,10 @@
**
****************************************************************************/
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <cerrno>
#include <cstring>
#include <fcntl.h>
#include <unistd.h>
#include "qtlockedfile.h"

4
src/lib/3rdparty/squeezelabelv2.cpp vendored
View File

@ -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);

4
src/lib/3rdparty/stylehelper.h vendored
View File

@ -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);

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

@ -49,7 +49,7 @@ private:
QString title;
QString url;
Subscription() {}
Subscription() = default;
Subscription(const QString &t, const QString &u) {
title = t;

10
src/lib/adblock/adblockdialog.cpp
View File

@ -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<AdBlockTreeWidget*>(tabWidget->widget(i));
auto* treeWidget = qobject_cast<AdBlockTreeWidget*>(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<AdBlockTreeWidget*>(tabWidget->widget(i));
auto* treeWidget = qobject_cast<AdBlockTreeWidget*>(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());
}

6
src/lib/adblock/adblockicon.cpp
View File

@ -54,7 +54,7 @@ QString AdBlockIcon::name() const
void AdBlockIcon::toggleCustomFilter()
{
QAction* action = qobject_cast<QAction*>(sender());
auto* action = qobject_cast<QAction*>(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();

18
src/lib/adblock/adblockmanager.cpp
View File

@ -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<AdBlockCustomList*>(subscription);
auto* list = qobject_cast<AdBlockCustomList*>(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<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
const AdBlockRule* rule = static_cast<const AdBlockRule*>(action->data().value<void*>());
if (rule) {

2
src/lib/adblock/adblockplugin.cpp
View File

@ -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);

4
src/lib/adblock/adblockrule.cpp
View File

@ -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;

2
src/lib/adblock/adblocksubscription.cpp
View File

@ -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);
}

8
src/lib/adblock/adblocktreewidget.cpp
View File

@ -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);

39
src/lib/app/browserwindow.cpp
View File

@ -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<WebTab*>(m_tabWidget->widget(index));
auto* webTab = qobject_cast<WebTab*>(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<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(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<QAction*>(obj)) {
if (auto* action = qobject_cast<QAction*>(obj)) {
loadAddress(action->data().toUrl());
}
}
@ -799,7 +798,7 @@ void BrowserWindow::loadActionUrlInNewTab(QObject* obj)
obj = sender();
}
if (QAction* action = qobject_cast<QAction*>(obj)) {
if (auto* action = qobject_cast<QAction*>(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<QWindowStateChangeEvent*>(event);
auto *e = static_cast<QWindowStateChangeEvent*>(event);
if (!(e->oldState() & Qt::WindowFullScreen) && windowState() & Qt::WindowFullScreen) {
// Enter fullscreen
m_statusBarVisible = m_statusBar->isVisible();

2
src/lib/app/commandlineoptions.h
View File

@ -30,7 +30,7 @@ public:
QString text;
};
typedef QVector<ActionPair> ActionPairList;
using ActionPairList = QVector<ActionPair>;
explicit CommandLineOptions();
ActionPairList getActions();

5
src/lib/app/datapaths.cpp
View File

@ -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

10
src/lib/app/mainapplication.cpp
View File

@ -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<QAction*>(sender())) {
if (auto* act = qobject_cast<QAction*>(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<BrowserWindow*>(actWin);
auto* qz = static_cast<BrowserWindow*>(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<BrowserWindow*>(actWin);
auto* win = qobject_cast<BrowserWindow*>(actWin);
if (win && !actUrl.isEmpty()) {
win->loadAddress(actUrl);
@ -910,7 +910,7 @@ void MainApplication::windowDestroyed(QObject* window)
void MainApplication::onFocusChanged()
{
BrowserWindow* activeBrowserWindow = qobject_cast<BrowserWindow*>(activeWindow());
auto* activeBrowserWindow = qobject_cast<BrowserWindow*>(activeWindow());
if (activeBrowserWindow) {
m_lastActiveWindow = activeBrowserWindow;

26
src/lib/app/mainmenu.cpp
View File

@ -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<QMenu*>(sender());
auto* menu = qobject_cast<QMenu*>(sender());
Q_ASSERT(menu);
if (m_window) {
@ -429,7 +429,7 @@ void MainMenu::aboutToShowToolbarsMenu()
void MainMenu::aboutToShowSidebarsMenu()
{
QMenu* menu = qobject_cast<QMenu*>(sender());
auto* menu = qobject_cast<QMenu*>(sender());
Q_ASSERT(menu);
if (m_window) {
@ -439,7 +439,7 @@ void MainMenu::aboutToShowSidebarsMenu()
void MainMenu::aboutToShowEncodingMenu()
{
QMenu* menu = qobject_cast<QMenu*>(sender());
auto* menu = qobject_cast<QMenu*>(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

3
src/lib/app/profilemanager.cpp
View File

@ -33,8 +33,7 @@
#include <iostream>
ProfileManager::ProfileManager()
{
}
= default;
void ProfileManager::initConfigDir()
{

2
src/lib/app/proxystyle.cpp
View File

@ -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<TabBarHelper*>(option->styleObject);
auto *tabBar = qobject_cast<TabBarHelper*>(option->styleObject);
if (tabBar && tabBar->baseColor().isValid()) {
painter->setPen(QPen(tabBar->baseColor(), 0));
painter->drawLine(option->rect.topLeft(), option->rect.topRight());

2
src/lib/autofill/autofill.cpp
View File

@ -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;

2
src/lib/autofill/autofillicon.cpp
View File

@ -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());
}

2
src/lib/autofill/autofillwidget.cpp
View File

@ -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);

13
src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp
View File

@ -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);

2
src/lib/autofill/passwordbackends/passwordbackend.h
View File

@ -27,7 +27,7 @@ class FALKON_EXPORT PasswordBackend
{
public:
explicit PasswordBackend();
virtual ~PasswordBackend() { }
virtual ~PasswordBackend() = default;
virtual QString name() const = 0;

2
src/lib/bookmarks/bookmarkitem.cpp
View File

@ -85,7 +85,7 @@ QIcon BookmarkItem::icon()
case Folder:
return IconProvider::standardIcon(QStyle::SP_DirIcon);
default:
return QIcon();
return {};
}
}

2
src/lib/bookmarks/bookmarks.cpp
View File

@ -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:

3
src/lib/bookmarks/bookmarksexport/bookmarksexporter.cpp
View File

@ -23,8 +23,7 @@ BookmarksExporter::BookmarksExporter(QObject* parent)
}
BookmarksExporter::~BookmarksExporter()
{
}
= default;
bool BookmarksExporter::error() const
{

2
src/lib/bookmarks/bookmarksexport/htmlexporter.cpp
View File

@ -55,7 +55,7 @@ bool HtmlExporter::exportBookmarks(BookmarkItem* root)
stream << "<!-- This is an automatically generated file." << endl;
stream << " It will be read and overwritten." << endl;
stream << " DO NOT EDIT! -->" << endl;
stream << "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\">" << endl;
stream << R"(<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">)" << endl;
stream << "<TITLE>Bookmarks</TITLE>" << endl;
stream << "<H1>Bookmarks</H1>" << endl;

2
src/lib/bookmarks/bookmarksicon.cpp
View File

@ -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());
}

3
src/lib/bookmarks/bookmarksimport/bookmarksimporter.cpp
View File

@ -23,8 +23,7 @@ BookmarksImporter::BookmarksImporter(QObject* parent)
}
BookmarksImporter::~BookmarksImporter()
{
}
= default;
bool BookmarksImporter::error() const
{

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

@ -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()) {

4
src/lib/bookmarks/bookmarksimport/firefoximporter.cpp
View File

@ -85,7 +85,7 @@ BookmarkItem* FirefoxImporter::importBookmarks()
{
QList<Item> 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);

6
src/lib/bookmarks/bookmarksimport/htmlimporter.cpp
View File

@ -94,7 +94,7 @@ BookmarkItem* HtmlImporter::importBookmarks()
bookmarks = bookmarks.left(bookmarks.lastIndexOf(QLatin1String("</dl><p>")));
int start = bookmarks.indexOf(QLatin1String("<dl><p>"));
BookmarkItem* root = new BookmarkItem(BookmarkItem::Folder);
auto* root = new BookmarkItem(BookmarkItem::Folder);
root->setTitle(QStringLiteral("HTML Import"));
QList<BookmarkItem*> 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);
}

6
src/lib/bookmarks/bookmarksimport/ieimporter.cpp
View File

@ -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);
}

2
src/lib/bookmarks/bookmarksimport/operaimporter.cpp
View File

@ -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<BookmarkItem*> folders;

8
src/lib/bookmarks/bookmarksmanager.cpp
View File

@ -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<QFormLayout*>(ui->editBox->layout());
auto* l = static_cast<QFormLayout*>(ui->editBox->layout());
if (showAddressAndKeyword) {
// Show Address + Keyword

6
src/lib/bookmarks/bookmarksmenu.cpp
View File

@ -102,7 +102,7 @@ void BookmarksMenu::menuMiddleClicked(Menu* menu)
void BookmarksMenu::bookmarkActivated()
{
if (QAction* action = qobject_cast<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
BookmarkItem* item = static_cast<BookmarkItem*>(action->data().value<void*>());
Q_ASSERT(item);
openBookmark(item);
@ -111,7 +111,7 @@ void BookmarksMenu::bookmarkActivated()
void BookmarksMenu::bookmarkCtrlActivated()
{
if (QAction* action = qobject_cast<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
BookmarkItem* item = static_cast<BookmarkItem*>(action->data().value<void*>());
Q_ASSERT(item);
openBookmarkInNewTab(item);
@ -120,7 +120,7 @@ void BookmarksMenu::bookmarkCtrlActivated()
void BookmarksMenu::bookmarkShiftActivated()
{
if (QAction* action = qobject_cast<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
BookmarkItem* item = static_cast<BookmarkItem*>(action->data().value<void*>());
Q_ASSERT(item);
openBookmarkInNewWindow(item);

18
src/lib/bookmarks/bookmarksmodel.cpp
View File

@ -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<BookmarkItem*>(index.internalPointer());
auto* itm = static_cast<BookmarkItem*>(index.internalPointer());
return itm ? itm : m_root;
}

8
src/lib/bookmarks/bookmarkstoolbar.cpp
View File

@ -138,7 +138,7 @@ void BookmarksToolbar::showOnlyIconsChanged(bool state)
}
for (int i = 0; i < m_layout->count(); ++i) {
BookmarksToolbarButton* b = qobject_cast<BookmarksToolbarButton*>(m_layout->itemAt(i)->widget());
auto* b = qobject_cast<BookmarksToolbarButton*>(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<BookmarksToolbarButton*>(m_layout->itemAt(i)->widget());
auto* b = qobject_cast<BookmarksToolbarButton*>(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<const BookmarksButtonMimeData*>(mime);
const auto* bookmarkMime = static_cast<const BookmarksButtonMimeData*>(mime);
bookmark = bookmarkMime->item();
const int initialIndex = bookmark->parent()->children().indexOf(bookmark);
BookmarksToolbarButton* current = buttonAt(m_dropPos);

12
src/lib/bookmarks/bookmarkstoolbarbutton.cpp
View File

@ -159,7 +159,7 @@ void BookmarksToolbarButton::menuMiddleClicked(Menu* menu)
void BookmarksToolbarButton::bookmarkActivated(BookmarkItem* item)
{
if (QAction* action = qobject_cast<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
item = static_cast<BookmarkItem*>(action->data().value<void*>());
}
@ -169,7 +169,7 @@ void BookmarksToolbarButton::bookmarkActivated(BookmarkItem* item)
void BookmarksToolbarButton::bookmarkCtrlActivated(BookmarkItem* item)
{
if (QAction* action = qobject_cast<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
item = static_cast<BookmarkItem*>(action->data().value<void*>());
}
@ -179,7 +179,7 @@ void BookmarksToolbarButton::bookmarkCtrlActivated(BookmarkItem* item)
void BookmarksToolbarButton::bookmarkShiftActivated(BookmarkItem* item)
{
if (QAction* action = qobject_cast<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
item = static_cast<BookmarkItem*>(action->data().value<void*>());
}
@ -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<const BookmarksButtonMimeData*>(mime);
const auto* bookmarkMime = static_cast<const BookmarksButtonMimeData*>(mime);
bookmark = bookmarkMime->item();
} else {
const QUrl url = mime->urls().at(0);

48
src/lib/bookmarks/bookmarkstools.cpp
View File

@ -52,7 +52,7 @@ BookmarkItem* BookmarksFoldersMenu::selectedFolder() const
void BookmarksFoldersMenu::folderChoosed()
{
if (QAction* act = qobject_cast<QAction*>(sender())) {
if (auto* act = qobject_cast<QAction*>(sender())) {
BookmarkItem* folder = static_cast<BookmarkItem*>(act->data().value<void*>());
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<void*>(static_cast<void*>(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);
}

2
src/lib/bookmarks/bookmarkswidget.cpp
View File

@ -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);

4
src/lib/cookies/cookiemanager.cpp
View File

@ -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());

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

@ -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<WebPage*>(item->page());
auto *page = qobject_cast<WebPage*>(item->page());
if (!page) {
return;
}
TabbedWebView *view = qobject_cast<TabbedWebView*>(page->view());
auto *view = qobject_cast<TabbedWebView*>(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<DownloadItem*>(ui->list->itemWidget(ui->list->item(i)));
auto* downItem = qobject_cast<DownloadItem*>(ui->list->itemWidget(ui->list->item(i)));
if (!downItem || downItem->isCancelled() || !downItem->isDownloading()) {
continue;
}
@ -241,7 +241,7 @@ void DownloadManager::clearList()
{
QList<DownloadItem*> items;
for (int i = 0; i < ui->list->count(); i++) {
DownloadItem* downItem = qobject_cast<DownloadItem*>(ui->list->itemWidget(ui->list->item(i)));
auto* downItem = qobject_cast<DownloadItem*>(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<DownloadItem*>(ui->list->itemWidget(ui->list->item(i)));
auto* downItem = qobject_cast<DownloadItem*>(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<DownloadItem*>(ui->list->itemWidget(ui->list->item(i)));
auto* downItem = qobject_cast<DownloadItem*>(ui->list->itemWidget(ui->list->item(i)));
if (!downItem) {
continue;
}

2
src/lib/history/history.cpp
View File

@ -294,7 +294,7 @@ QString History::titleCaseLocalizedMonth(int month)
return tr("December");
default:
qWarning("Month number out of range!");
return QString();
return {};
}
}

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

@ -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);

10
src/lib/history/historymenu.cpp
View File

@ -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<HistoryEntry> 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<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
openUrl(action->data().toUrl());
}
}
void HistoryMenu::historyEntryCtrlActivated()
{
if (QAction* action = qobject_cast<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
openUrlInNewTab(action->data().toUrl());
}
}
void HistoryMenu::historyEntryShiftActivated()
{
if (QAction* action = qobject_cast<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
openUrlInNewWindow(action->data().toUrl());
}
}

20
src/lib/history/historymodel.cpp
View File

@ -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<HistoryItem*>(index.internalPointer());
auto* item = static_cast<HistoryItem*>(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;

2
src/lib/history/historytreeview.cpp
View File

@ -82,7 +82,7 @@ QUrl HistoryTreeView::selectedUrl() const
const QList<QModelIndex> indexes = selectionModel()->selectedRows();
if (indexes.count() != 1)
return QUrl();
return {};
// TopLevelItems have invalid (empty) UrlRole data
return indexes.at(0).data(HistoryModel::UrlRole).toUrl();

10
src/lib/navigation/completer/locationcompleter.cpp
View File

@ -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<LocationCompleterRefreshJob*>(sender());
auto* job = qobject_cast<LocationCompleterRefreshJob*>(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<QStandardItem*> 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();
}

8
src/lib/navigation/completer/locationcompleterrefreshjob.cpp
View File

@ -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());

20
src/lib/navigation/completer/locationcompleterview.cpp
View File

@ -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<QMouseEvent*>(event);
auto *e = static_cast<QMouseEvent*>(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<QKeyEvent*>(event);
auto* keyEvent = static_cast<QKeyEvent*>(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<QKeyEvent*>(event);
auto* keyEvent = static_cast<QKeyEvent*>(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<QFocusEvent*>(event);
auto *focusEvent = static_cast<QFocusEvent*>(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);

8
src/lib/navigation/locationbar.cpp
View File

@ -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<WebPage*>(m_webView->page());
auto* page = qobject_cast<WebPage*>(m_webView->page());
if (page && !page->autoFillUsernames().isEmpty()) {
m_autofillIcon->setUsernames(page->autoFillUsernames());

30
src/lib/navigation/navigationbar.cpp
View File

@ -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<QAction*>(sender());
auto *act = qobject_cast<QAction*>(sender());
if (!act) {
return;
}
@ -485,12 +485,12 @@ void NavigationBar::toolActionActivated()
if (!data.button) {
return;
}
ToolButton *buttonTools = qobject_cast<ToolButton*>(m_widgets.value(QSL("button-tools")).widget);
auto *buttonTools = qobject_cast<ToolButton*>(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<NavigationBarToolButton*>(data.widget);
auto *button = qobject_cast<NavigationBarToolButton*>(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<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
loadHistoryItem(history->itemAt(action->data().toInt()));
}
}
void NavigationBar::loadHistoryIndexInNewTab(int index)
{
if (QAction* action = qobject_cast<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
index = action->data().toInt();
}

2
src/lib/navigation/navigationbarconfigdialog.cpp
View File

@ -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

2
src/lib/navigation/navigationbartoolbutton.cpp
View File

@ -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());

6
src/lib/navigation/siteicon.cpp
View File

@ -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<QUrl>() << 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);

2
src/lib/navigation/websearchbar.cpp
View File

@ -237,7 +237,7 @@ void WebSearchBar::searchInNewTab()
void WebSearchBar::addEngineFromAction()
{
if (QAction* action = qobject_cast<QAction*>(sender())) {
if (auto* action = qobject_cast<QAction*>(sender())) {
m_searchManager->addEngine(action->data().toUrl());
}
}

34
src/lib/network/networkmanager.cpp
View File

@ -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);

2
src/lib/network/schemehandlers/extensionschemehandler.cpp
View File

@ -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);

11
src/lib/opensearch/opensearchengine.cpp
View File

@ -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<QNetworkReply*>(sender());
auto* reply = qobject_cast<QNetworkReply*>(sender());
if (!reply) {
return;

4
src/lib/opensearch/opensearchengine.h
View File

@ -58,8 +58,8 @@ Q_SIGNALS:
void suggestions(const QStringList &suggestions);
public:
typedef QPair<QString, QString> Parameter;
typedef QList<Parameter> Parameters;
using Parameter = QPair<QString, QString>;
using Parameters = QList<Parameter>;
Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(QString description READ description WRITE setDescription)

6
src/lib/opensearch/opensearchenginedelegate.cpp
View File

@ -37,15 +37,13 @@
Constructs the delegate.
*/
OpenSearchEngineDelegate::OpenSearchEngineDelegate()
{
}
= default;
/*!
Destructs the delegate.
*/
OpenSearchEngineDelegate::~OpenSearchEngineDelegate()
{
}
= default;
/*!
\fn void performSearchRequest(const QNetworkRequest &request,

2
src/lib/opensearch/opensearchreader.cpp
View File

@ -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/")) &&

4
src/lib/opensearch/searchenginesdialog.cpp
View File

@ -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);

4
src/lib/opensearch/searchenginesmanager.cpp
View File

@ -211,7 +211,7 @@ QIcon SearchEnginesManager::iconForSearchEngine(const QUrl &url)
void SearchEnginesManager::engineChangedImage()
{
OpenSearchEngine* engine = qobject_cast<OpenSearchEngine*>(sender());
auto* engine = qobject_cast<OpenSearchEngine*>(sender());
if (!engine) {
return;
@ -379,7 +379,7 @@ void SearchEnginesManager::replyFinished()
{
qApp->restoreOverrideCursor();
QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
auto* reply = qobject_cast<QNetworkReply*>(sender());
if (!reply) {
return;
}

2
src/lib/opensearch/searchenginesmanager.h
View File

@ -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);

6
src/lib/other/browsinglibrary.cpp
View File

@ -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();
}

2
src/lib/other/clearprivatedata.cpp
View File

@ -174,7 +174,7 @@ void ClearPrivateData::optimizeDb()
void ClearPrivateData::showCookieManager()
{
CookieManager* dialog = new CookieManager(this);
auto* dialog = new CookieManager(this);
dialog->show();
}

4
src/lib/other/iconchooser.cpp
View File

@ -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));
}
}

4
src/lib/other/licenseviewer.cpp
View File

@ -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);

2
src/lib/other/protocolhandlerdialog.cpp
View File

@ -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);

2
src/lib/other/protocolhandlermanager.cpp
View File

@ -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();

20
src/lib/other/siteinfo.cpp
View File

@ -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<QGraphicsPixmapItem*>(graphicsItem);
auto *pixmapItem = static_cast<QGraphicsPixmapItem*>(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"));

4
src/lib/other/statusbar.cpp
View File

@ -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;

2
src/lib/other/updater.cpp
View File

@ -136,7 +136,7 @@ void Updater::startDownloadingUpdateInfo(const QUrl &url)
void Updater::downCompleted()
{
QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
auto* reply = qobject_cast<QNetworkReply*>(sender());
if (!reply)
return;

2
src/lib/plugins/ocssupport.cpp
View File

@ -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<const KArchiveFile*>(entry)->copyTo(tempDir);

2
src/lib/plugins/plugininterface.h
View File

@ -41,7 +41,7 @@ public:
LateInitState
};
virtual ~PluginInterface() { }
virtual ~PluginInterface() = default;
virtual void init(InitState state, const QString &settingsPath) = 0;
virtual void unload() = 0;

6
src/lib/plugins/plugins.cpp
View File

@ -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 {};
}
}

2
src/lib/plugins/qml/api/bookmarks/qmlbookmarks.cpp
View File

@ -169,7 +169,7 @@ QList<QObject*> QmlBookmarks::search(const QVariantMap &map) const
{
if (!map.contains(QSL("query")) && !map.contains(QSL("url"))) {
qWarning() << "Unable to search bookmarks";
return QList<QObject*>();
return {};
}
const QString query = map.value(QSL("query")).toString();

8
src/lib/plugins/qml/api/bookmarks/qmlbookmarktreenode.cpp
View File

@ -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();

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

@ -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);

10
src/lib/plugins/qml/api/cookies/qmlcookie.cpp
View File

@ -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());
}

2
src/lib/plugins/qml/api/events/qmlkeyevent.cpp
View File

@ -83,7 +83,7 @@ quint32 QmlKeyEvent::nativeVirtualKey() const
QString QmlKeyEvent::text() const
{
if (!m_keyEvent) {
return QString();
return {};
}
return m_keyEvent->text();
}

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

@ -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);
});

8
src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp
View File

@ -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());
}

2
src/lib/plugins/qml/api/fileutils/qmlfileutils.cpp
View File

@ -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)

Some files were not shown because too many files have changed in this diff Show More