diff options
-rw-r--r-- | src/plugins/debugger/cdb/cdbengine.cpp | 6 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerdialogs.cpp | 12 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 11 | ||||
-rw-r--r-- | src/plugins/debugger/debuggertooltipmanager.cpp | 6 | ||||
-rw-r--r-- | src/plugins/debugger/enginemanager.cpp | 2 | ||||
-rw-r--r-- | src/plugins/debugger/localsandexpressionswindow.cpp | 2 | ||||
-rw-r--r-- | src/plugins/debugger/uvsc/uvscengine.cpp | 4 |
7 files changed, 19 insertions, 24 deletions
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index f2167c80c2..7f976861da 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -948,9 +948,7 @@ void CdbEngine::runCommand(const DebuggerCommand &dbgCmd) QString cmd = dbgCmd.function + dbgCmd.argsToString(); if (!m_accessible) { - doInterruptInferior([this, dbgCmd](){ - runCommand(dbgCmd); - }); + doInterruptInferior([this, dbgCmd] { runCommand(dbgCmd); }); const QString msg = QString("Attempt to issue command \"%1\" to non-accessible session (%2)... interrupting") .arg(cmd, stateName(state())); showMessage(msg, LogMisc); @@ -1412,7 +1410,7 @@ void CdbEngine::fetchMemory(MemoryAgent *agent, quint64 address, quint64 length) StringInputStream str(args); str << address << ' ' << length; cmd.args = args; - cmd.callback = [=] (const DebuggerResponse &response) { + cmd.callback = [=](const DebuggerResponse &response) { if (!agent) return; if (response.resultClass == ResultDone) { diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 3b8a5ae480..0f690dad90 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -604,14 +604,10 @@ StartRemoteCdbDialog::StartRemoteCdbDialog(QWidget *parent) : m_okButton = box->button(QDialogButtonBox::Ok); m_okButton->setEnabled(false); - connect(m_lineEdit, &QLineEdit::textChanged, - this, &StartRemoteCdbDialog::textChanged); - connect(m_lineEdit, &QLineEdit::returnPressed, - [this] { m_okButton->animateClick(); }); - connect(box, &QDialogButtonBox::accepted, - this, &StartRemoteCdbDialog::accept); - connect(box, &QDialogButtonBox::rejected, - this, &QDialog::reject); + connect(m_lineEdit, &QLineEdit::textChanged, this, &StartRemoteCdbDialog::textChanged); + connect(m_lineEdit, &QLineEdit::returnPressed, m_okButton, &QAbstractButton::animateClick); + connect(box, &QDialogButtonBox::accepted, this, &StartRemoteCdbDialog::accept); + connect(box, &QDialogButtonBox::rejected, this, &QDialog::reject); } void StartRemoteCdbDialog::accept() diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 1277f26854..fbc7e0f50a 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -796,9 +796,9 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(const QStringList &arguments) vbox->insertWidget(0, label); }; - const auto addFontSizeAdaptation = [](QWidget *widget) { + const auto addFontSizeAdaptation = [this](QWidget *widget) { QObject::connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged, - [widget](const FontSettings &settings) { + this, [widget](const FontSettings &settings) { if (!debuggerSettings()->fontSizeFollowsEditor.value()) return; qreal size = settings.fontZoom() * settings.fontSize() / 100.; @@ -1148,7 +1148,8 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(const QStringList &arguments) DebuggerMainWindow::leaveDebugMode(); }); - connect(ModeManager::instance(), &ModeManager::currentModeChanged, [](Id mode, Id oldMode) { + connect(ModeManager::instance(), &ModeManager::currentModeChanged, + this, [](Id mode, Id oldMode) { QTC_ASSERT(mode != oldMode, return); if (mode == MODE_DEBUG) { DebuggerMainWindow::enterDebugMode(); @@ -1876,7 +1877,7 @@ void DebuggerPluginPrivate::requestContextMenu(TextEditorWidget *widget, : Tr::tr("Set Breakpoint at Line %1").arg(lineNumber); auto act = menu->addAction(text); act->setEnabled(args.isValid()); - connect(act, &QAction::triggered, [this, args] { + connect(act, &QAction::triggered, this, [this, args] { breakpointSetMarginActionTriggered(false, args); }); @@ -1886,7 +1887,7 @@ void DebuggerPluginPrivate::requestContextMenu(TextEditorWidget *widget, : Tr::tr("Set Message Tracepoint at Line %1...").arg(lineNumber); act = menu->addAction(tracePointText); act->setEnabled(args.isValid()); - connect(act, &QAction::triggered, [this, args] { + connect(act, &QAction::triggered, this, [this, args] { breakpointSetMarginActionTriggered(true, args); }); } diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index d853bc8f00..9d35c8f98d 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -771,7 +771,7 @@ DebuggerToolTipHolder::DebuggerToolTipHolder(const DebuggerToolTipContext &conte state = New; - QObject::connect(widget->pinButton, &QAbstractButton::clicked, [this] { + QObject::connect(widget->pinButton, &QAbstractButton::clicked, widget, [this] { if (widget->isPinned) widget->close(); else @@ -1194,7 +1194,7 @@ void DebuggerToolTipManagerPrivate::slotTooltipOverrideRequested context.expression = localVariable->name; context.iname = localVariable->iname; - auto reusable = [context] (DebuggerToolTipHolder *tooltip) { + auto reusable = [context](DebuggerToolTipHolder *tooltip) { return tooltip->context.isSame(context); }; DebuggerToolTipHolder *tooltip = Utils::findOrDefault(m_tooltips, reusable); @@ -1215,7 +1215,7 @@ void DebuggerToolTipManagerPrivate::slotTooltipOverrideRequested } else { context.iname = "tooltip." + toHex(context.expression); - auto reusable = [context] (DebuggerToolTipHolder *tooltip) { + auto reusable = [context](DebuggerToolTipHolder *tooltip) { return tooltip->context.isSame(context); }; DebuggerToolTipHolder *tooltip = Utils::findOrDefault(m_tooltips, reusable); diff --git a/src/plugins/debugger/enginemanager.cpp b/src/plugins/debugger/enginemanager.cpp index d691048e26..3053a2d6ab 100644 --- a/src/plugins/debugger/enginemanager.cpp +++ b/src/plugins/debugger/enginemanager.cpp @@ -445,7 +445,7 @@ void EngineManager::deactivateDebugMode() // "previously active application"), doing the switch synchronously // leads to funny effects with floating dock widgets const Utils::Id mode = d->m_previousMode; - QTimer::singleShot(0, d, [mode]() { ModeManager::activateMode(mode); }); + QTimer::singleShot(0, d, [mode] { ModeManager::activateMode(mode); }); d->m_previousMode = Id(); } } diff --git a/src/plugins/debugger/localsandexpressionswindow.cpp b/src/plugins/debugger/localsandexpressionswindow.cpp index 0f9db288a4..b3397e5c1f 100644 --- a/src/plugins/debugger/localsandexpressionswindow.cpp +++ b/src/plugins/debugger/localsandexpressionswindow.cpp @@ -38,7 +38,7 @@ LocalsAndInspectorWindow::LocalsAndInspectorWindow(QWidget *locals, // when debugger engine changes states. m_timer.setSingleShot(true); m_timer.setInterval(500); // TODO: remove the magic number! - connect(&m_timer, &QTimer::timeout, [this, localsAndInspector] { + connect(&m_timer, &QTimer::timeout, this, [this, localsAndInspector] { localsAndInspector->setCurrentIndex(m_showLocals ? LocalsIndex : InspectorIndex); }); } diff --git a/src/plugins/debugger/uvsc/uvscengine.cpp b/src/plugins/debugger/uvsc/uvscengine.cpp index 019f5eca4d..437e47bcd8 100644 --- a/src/plugins/debugger/uvsc/uvscengine.cpp +++ b/src/plugins/debugger/uvsc/uvscengine.cpp @@ -719,7 +719,7 @@ void UvscEngine::handleUpdateLocals(bool partial) watchHandler()->appendFormatRequests(&cmd); watchHandler()->appendWatchersAndTooltipRequests(&cmd); - auto enumerateExpandedINames = [&cmd]() { + auto enumerateExpandedINames = [&cmd] { QStringList inames; const QJsonArray array = cmd.args["expanded"].toArray(); for (const QJsonValue &value : array) @@ -727,7 +727,7 @@ void UvscEngine::handleUpdateLocals(bool partial) return inames; }; - auto enumerateRootWatchers = [&cmd]() { + auto enumerateRootWatchers = [&cmd] { std::vector<std::pair<QString, QString>> inames; const QJsonArray array = cmd.args["watchers"].toArray(); for (const QJsonValue &value : array) { |