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

TextEditor: use QScopeGuard instead of ExecuteOnDestruction

Browse Source 
Change-Id: I2d7c04d69ad49a121b157af2750eaed26bab9480
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2023-03-28 14:33:39 +02:00
parent 0f3f5fb4d8
commit 73c645820f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/texteditor/texteditor.cpp
View File

@@ -2533,7 +2533,7 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e)
{ {
ICore::restartTrimmer(); ICore::restartTrimmer();
ExecuteOnDestruction eod([&]() { d->clearBlockSelection(); }); auto clearBlockSelectionGuard = qScopeGuard([&]() { d->clearBlockSelection(); });
if (!isModifier(e) && mouseHidingEnabled()) if (!isModifier(e) && mouseHidingEnabled())
viewport()->setCursor(Qt::BlankCursor); viewport()->setCursor(Qt::BlankCursor);
@@ -2803,8 +2803,7 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e)
} }
if (blockSelectionOperation != QTextCursor::NoMove) { if (blockSelectionOperation != QTextCursor::NoMove) {
auto doNothing = [](){}; clearBlockSelectionGuard.dismiss();
eod.reset(doNothing);
d->handleMoveBlockSelection(blockSelectionOperation); d->handleMoveBlockSelection(blockSelectionOperation);
} else if (!d->cursorMoveKeyEvent(e)) { } else if (!d->cursorMoveKeyEvent(e)) {
QTextCursor cursor = textCursor(); QTextCursor cursor = textCursor();