From 9e73d0dac0774955348a5164087363c5b33927b8 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Fri, 18 Jan 2019 16:56:54 +0100 Subject: Add tools/report-clang-tidy.sh - Fix various clang-tidy warnings - Fix use-after-free crash when deleting profiles --- src/session/session.cpp | 2 +- src/session/sessiondialog.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/session') diff --git a/src/session/session.cpp b/src/session/session.cpp index 51575bf..67cea70 100644 --- a/src/session/session.cpp +++ b/src/session/session.cpp @@ -120,7 +120,7 @@ void Session::restoreView(WebView *view, const QJsonObject &data) Q_CHECK_PTR(profileManager); auto *profile = profileManager->profile(data["profile"].toString()); - if(profile) + if(profile != nullptr) view->setProfile(profile); auto url = data.value("url"); diff --git a/src/session/sessiondialog.cpp b/src/session/sessiondialog.cpp index 184c44d..b734088 100644 --- a/src/session/sessiondialog.cpp +++ b/src/session/sessiondialog.cpp @@ -35,11 +35,11 @@ SessionDialog::SessionDialog(QWidget *parent) connect(ui->listWidget, &QListWidget::currentItemChanged, this, [this](QListWidgetItem *currentItem, QListWidgetItem *previousItem) { auto *currentWidget = qobject_cast(ui->listWidget->itemWidget(currentItem)); - if(currentWidget) + if(currentWidget != nullptr) currentWidget->ui->delete_toolButton->show(); auto *previousWidget = qobject_cast(ui->listWidget->itemWidget(previousItem)); - if(previousWidget) + if(previousWidget != nullptr) previousWidget->ui->delete_toolButton->hide(); }); @@ -53,7 +53,7 @@ SessionDialog::SessionDialog(QWidget *parent) accepted_connection = connect(this, &SessionDialog::accepted, this, [this, browser]() { auto *currentWidget = qobject_cast(ui->listWidget->itemWidget(ui->listWidget->currentItem())); - if(currentWidget) + if(currentWidget != nullptr) this->openSession(currentWidget->ui->label->text()); else browser->createWindow(); @@ -76,7 +76,7 @@ std::optional SessionDialog::pickSession() } auto *currentWidget = qobject_cast(ui->listWidget->itemWidget(ui->listWidget->currentItem())); - if(currentWidget) { + if(currentWidget != nullptr) { QFile json(currentWidget->ui->label->text()); if(json.open(QIODevice::ReadOnly | QIODevice::Text)) { auto doc = QJsonDocument::fromJson(json.readAll()); -- cgit v1.2.1