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

Utils: Avoid repetitive calls

Browse Source 
Change-Id: Ie0a28f41c8e4309c62d87c90c462846f1eb9a194
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Orgad Shaneh
2014-05-19 18:25:48 +03:00
committed by Orgad Shaneh
parent e665366a64
commit ad13c91200
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/completingtextedit.cpp
View File

@@ -160,14 +160,15 @@ void CompletingTextEdit::keyPressEvent(QKeyEvent *e)
QTextEdit::keyPressEvent(e);
const bool ctrlOrShift = e->modifiers() & (Qt::ControlModifier | Qt::ShiftModifier);
if (completer() == 0 || (ctrlOrShift && e->text().isEmpty()))
const QString text = e->text();
if (completer() == 0 || (ctrlOrShift && text.isEmpty()))
return;
const bool hasModifier = (e->modifiers() != Qt::NoModifier) && !ctrlOrShift;
const QString newCompletionPrefix = d->textUnderCursor();
const QChar lastChar = e->text().isEmpty() ? QChar() : e->text().right(1).at(0);
const QChar lastChar = text.isEmpty() ? QChar() : text.right(1).at(0);
if (!isShortcut && (hasModifier || e->text().isEmpty() || isEndOfWordChar(lastChar)
if (!isShortcut && (hasModifier || text.isEmpty() || isEndOfWordChar(lastChar)
|| !d->acceptsCompletionPrefix(newCompletionPrefix))) {
completer()->popup()->hide();
return;