feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Pass context object to lambda connections

Browse Source 
Remove some unneeded lambda () brackets.

Change-Id: I6b7e07cad8a240a7021c6ddacc84a971809ee717
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2022-12-07 14:34:32 +01:00
parent 166f710e62
commit 9afcf870a1
14 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/delegates.cpp
View File

@@ -119,7 +119,7 @@ QWidget *PathChooserDelegate::createEditor(QWidget *parent, const QStyleOptionVi
editor->setAutoFillBackground(true); // To hide the text beneath the editor widget
editor->lineEdit()->setMinimumWidth(0);
connect(editor, &PathChooser::browsingFinished, this, [this, editor]() {
connect(editor, &PathChooser::browsingFinished, this, [this, editor] {
emit const_cast<PathChooserDelegate*>(this)->commitData(editor);
});

2
src/libs/utils/deviceshell.cpp
View File

@@ -108,7 +108,7 @@ RunResult DeviceShell::run(const CommandLine &cmd, const QByteArray &stdInData)
const int id = ++m_currentId;
const auto it = m_commandOutput.insert(id, CommandRun{{-1, {}, {}}, &waiter});
QMetaObject::invokeMethod(m_shellProcess.get(), [this, id, cmd, stdInData]() {
QMetaObject::invokeMethod(m_shellProcess.get(), [this, id, cmd, stdInData] {
const QString command = QString("%1 \"%2\" %3\n")
.arg(id)
.arg(QString::fromLatin1(stdInData.toBase64()))

2
src/libs/utils/executeondestruction.h
View File

@@ -10,7 +10,7 @@ namespace Utils {
class ExecuteOnDestruction
{
public:
ExecuteOnDestruction() noexcept : destructionCode([](){}) {}
ExecuteOnDestruction() noexcept : destructionCode([] {}) {}
ExecuteOnDestruction(std::function<void()> code) : destructionCode(std::move(code)) {}
~ExecuteOnDestruction() { if (destructionCode) destructionCode(); }

2
src/libs/utils/fancymainwindow.cpp
View File

@@ -248,7 +248,7 @@ DockWidget::DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable)
connect(&m_timer, &QTimer::timeout, this, &DockWidget::handleMouseTimeout);
connect(this, &QDockWidget::topLevelChanged, this, &DockWidget::handleToplevelChanged);
connect(toggleViewAction(), &QAction::triggered, [this] {
connect(toggleViewAction(), &QAction::triggered, this, [this] {
if (isVisible())
raise();
});

6
src/libs/utils/infobar.cpp
View File

@@ -300,7 +300,7 @@ void InfoBarDisplay::update()
showDetailsButton->setCheckable(true);
showDetailsButton->setChecked(m_isShowingDetailsWidget);
showDetailsButton->setText(tr("&Show Details"));
connect(showDetailsButton, &QToolButton::clicked, [this, vbox, info] (bool) {
connect(showDetailsButton, &QToolButton::clicked, this, [this, vbox, info] (bool) {
QWidget *detailsWidget = vbox->count() == 2 ? vbox->itemAt(1)->widget() : nullptr;
if (!detailsWidget) {
detailsWidget = info.m_detailsWidgetCreator();
@@ -323,7 +323,7 @@ void InfoBarDisplay::update()
cb->addItem(comboInfo.displayText, comboInfo.data);
if (info.m_combo.currentIndex >= 0 && info.m_combo.currentIndex < cb->count())
cb->setCurrentIndex(info.m_combo.currentIndex);
connect(cb, &QComboBox::currentIndexChanged, this, [cb, info]() {
connect(cb, &QComboBox::currentIndexChanged, this, [cb, info] {
info.m_combo.callback({cb->currentText(), cb->currentData()});
}, Qt::QueuedConnection);
@@ -334,7 +334,7 @@ void InfoBarDisplay::update()
auto infoWidgetButton = new QToolButton;
infoWidgetButton->setText(button.text);
infoWidgetButton->setToolTip(button.tooltip);
connect(infoWidgetButton, &QAbstractButton::clicked, [button]() { button.callback(); });
connect(infoWidgetButton, &QAbstractButton::clicked, [button] { button.callback(); });
hbox->addWidget(infoWidgetButton);
}

2
src/libs/utils/launcherinterface.cpp
View File

@@ -160,7 +160,7 @@ LauncherInterface::LauncherInterface()
m_private->setPathToLauncher(s_pathToLauncher);
const FilePath launcherFilePath = FilePath::fromString(m_private->launcherFilePath())
.cleanPath().withExecutableSuffix();
auto launcherIsNotExecutable = [&launcherFilePath]() {
auto launcherIsNotExecutable = [&launcherFilePath] {
qWarning() << "The Creator's process launcher"
<< launcherFilePath << "is not executable.";
};

2
src/libs/utils/macroexpander.cpp
View File

@@ -360,7 +360,7 @@ void MacroExpander::registerIntVariable(const QByteArray &variable,
{
const MacroExpander::IntFunction valuecopy = value; // do not capture a reference in a lambda
registerVariable(variable, description,
[valuecopy]() { return QString::number(valuecopy ? valuecopy() : 0); });
[valuecopy] { return QString::number(valuecopy ? valuecopy() : 0); });
}
/*!

2
src/libs/utils/mapreduce.h
View File

@@ -77,7 +77,7 @@ protected:
&& m_mapWatcher.size() < std::max(m_threadPool->maxThreadCount(), 1)) {
didSchedule = true;
auto watcher = new QFutureWatcher<MapResult>();
connect(watcher, &QFutureWatcher<MapResult>::finished, this, [this, watcher]() {
connect(watcher, &QFutureWatcher<MapResult>::finished, this, [this, watcher] {
mapFinished(watcher);
});
if (m_handleProgress) {

2
src/libs/utils/minimizableinfobars.cpp
View File

@@ -45,7 +45,7 @@ void MinimizableInfoBars::createActions()
auto action = new QAction(this);
action->setToolTip(entry.text());
action->setIcon(Icons::WARNING_TOOLBAR.pixmap());
connect(action, &QAction::triggered, this, [this, id]() {
connect(action, &QAction::triggered, this, [this, id] {
setShowInInfoBar(id, true);
updateInfo(id);
});

2
src/libs/utils/namevaluevalidator.cpp
View File

@@ -22,7 +22,7 @@ NameValueValidator::NameValueValidator(QWidget *parent,
{
m_hideTipTimer.setInterval(2000);
m_hideTipTimer.setSingleShot(true);
connect(&m_hideTipTimer, &QTimer::timeout, this, []() { ToolTip::hide(); });
connect(&m_hideTipTimer, &QTimer::timeout, this, [] { ToolTip::hide(); });
}
QValidator::State NameValueValidator::validate(QString &in, int &pos) const

2
src/libs/utils/progressindicator.cpp
View File

@@ -72,7 +72,7 @@ static FilePath imageFileNameForIndicatorSize(ProgressIndicatorSize size)
ProgressIndicatorPainter::ProgressIndicatorPainter(ProgressIndicatorSize size)
{
m_timer.setSingleShot(false);
QObject::connect(&m_timer, &QTimer::timeout, [this] {
QObject::connect(&m_timer, &QTimer::timeout, &m_timer, [this] {
nextAnimationStep();
if (m_callback)
m_callback();

6
src/libs/utils/runextensions.h
View File

@@ -594,7 +594,7 @@ const QFuture<T> &onFinished(const QFuture<T> &future,
QObject::connect(watcher,
&QFutureWatcherBase::finished,
receiver,
[receiver, member, watcher]() { (receiver->*member)(watcher->future()); });
[receiver, member, watcher] { (receiver->*member)(watcher->future()); });
watcher->setFuture(future);
return future;
}
@@ -610,7 +610,7 @@ const QFuture<T> &onFinished(const QFuture<T> &future, QObject *guard, Function
{
auto watcher = new QFutureWatcher<T>();
QObject::connect(watcher, &QFutureWatcherBase::finished, watcher, &QObject::deleteLater);
QObject::connect(watcher, &QFutureWatcherBase::finished, guard, [f, watcher]() {
QObject::connect(watcher, &QFutureWatcherBase::finished, guard, [f, watcher] {
f(watcher->future());
});
watcher->setFuture(future);
@@ -627,7 +627,7 @@ const QFuture<T> &onFinished(const QFuture<T> &future, Function f)
{
auto watcher = new QFutureWatcher<T>();
QObject::connect(watcher, &QFutureWatcherBase::finished, watcher, &QObject::deleteLater);
QObject::connect(watcher, &QFutureWatcherBase::finished, [f, watcher]() {
QObject::connect(watcher, &QFutureWatcherBase::finished, [f, watcher] {
f(watcher->future());
});
watcher->setFuture(future);

2
src/libs/utils/variablechooser.cpp
View File

@@ -376,7 +376,7 @@ VariableChooser::VariableChooser(QWidget *parent) :
setFocusPolicy(Qt::StrongFocus);
setFocusProxy(d->m_variableTree);
setGeometry(QRect(0, 0, 400, 500));
addMacroExpanderProvider([]() { return globalMacroExpander(); });
addMacroExpanderProvider([] { return globalMacroExpander(); });
}
/*!

2
src/libs/utils/wizardpage.h
View File

@@ -31,7 +31,7 @@ public:
auto widget = new ObjectToFieldWidgetConverter();
widget->toVariantFunction = toVariantFunction;
connect(sender, &QObject::destroyed, widget, &QObject::deleteLater);
connect(sender, member, widget, [widget]() { emit widget->valueChanged(widget->value()); });
connect(sender, member, widget, [widget] { emit widget->valueChanged(widget->value()); });
return widget;
}