From 80f46e055c5d4ca06dffc883cd74f65322f52df0 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 7 Jun 2024 12:10:27 +0200 Subject: [PATCH] Use non-null valies for LB connection guards Task-number: QTCREATORBUG-31024 Change-Id: I532d2daade968ff4aa2f3dc1ba89d2a3a4e9c2eb Reviewed-by: Marcus Tillmanns --- src/plugins/fakevim/fakevimactions.cpp | 6 +++--- src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp | 2 +- src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp | 4 ++-- src/plugins/vcsbase/commonvcssettings.cpp | 2 +- .../layoutbuilder/tst_manual_widgets_layoutbuilder.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp index e6a2a661d52..35cdce0bafb 100644 --- a/src/plugins/fakevim/fakevimactions.cpp +++ b/src/plugins/fakevim/fakevimactions.cpp @@ -199,7 +199,7 @@ FakeVimSettings::FakeVimSettings() autoIndent.setValue(true); smartIndent.setValue(tps.m_autoIndent); incSearch.setValue(true); - }, nullptr), + }, this), }, PushButton { text(Tr::tr("Set Qt Style")), @@ -213,7 +213,7 @@ FakeVimSettings::FakeVimSettings() incSearch.setVolatileValue(true); backspace.setVolatileValue(QString("indent,eol,start")); passKeys.setVolatileValue(true); - }, nullptr), + }, this), }, PushButton { text(Tr::tr("Set Plain Style")), @@ -227,7 +227,7 @@ FakeVimSettings::FakeVimSettings() incSearch.setVolatileValue(false); backspace.setVolatileValue(QString()); passKeys.setVolatileValue(false); - }, nullptr), + }, this), }, st }, diff --git a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp index ad8c5d79950..13e6e09dd31 100644 --- a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp +++ b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp @@ -50,7 +50,7 @@ CustomQbsPropertiesDialog::CustomQbsPropertiesDialog(const QVariantMap &properti Column { PushButton { text(Tr::tr("&Add")), - onClicked([this] { addProperty(); }, nullptr), + onClicked([this] { addProperty(); }, this), }, m_removeButton, st diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index 9b25c17d341..34bc379db2a 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -133,11 +133,11 @@ QbsProfilesSettingsWidget::QbsProfilesSettingsWidget() Column { PushButton { text(Tr::tr("E&xpand All")), - onClicked([this] { m_propertiesView->expandAll(); }, nullptr), + onClicked([this] { m_propertiesView->expandAll(); }, this), }, PushButton { text(Tr::tr("&Collapse All")), - onClicked([this] { m_propertiesView->collapseAll(); }, nullptr), + onClicked([this] { m_propertiesView->collapseAll(); }, this), }, st, }, diff --git a/src/plugins/vcsbase/commonvcssettings.cpp b/src/plugins/vcsbase/commonvcssettings.cpp index 1dbbb130dc5..9bc924c1d4c 100644 --- a/src/plugins/vcsbase/commonvcssettings.cpp +++ b/src/plugins/vcsbase/commonvcssettings.cpp @@ -94,7 +94,7 @@ CommonVcsSettings::CommonVcsSettings() text(Tr::tr("Reset VCS Cache")), Layouting::toolTip(Tr::tr("Reset information about which " "version control system handles which directory.")), - onClicked(&VcsManager::clearVersionControlCache, (QObject *)nullptr) + onClicked(&VcsManager::clearVersionControlCache, this) } } }; diff --git a/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp b/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp index eda6a565b1d..772b32ac04a 100644 --- a/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp +++ b/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp @@ -24,9 +24,9 @@ int main(int argc, char *argv[]) }; Row { - PushButton { text("-"), onClicked(minusClick, nullptr) }, + PushButton { text("-"), onClicked(minusClick, qApp) }, lineEdit, - PushButton { text("+"), onClicked(plusClick, nullptr) }, + PushButton { text("+"), onClicked(plusClick, qApp) }, Group { title("Splitter in Group"), Column {