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

Clang: remove dead code.

Browse Source 
Change-Id: I06bac5443af41a27c2641199948705c45e8a4586
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2014-09-11 10:44:13 +02:00
parent b4f336f142
commit ce49f92cb7
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/clangcodemodel/clangcompletion.cpp
View File

@@ -688,13 +688,10 @@ int ClangCompletionAssistProcessor::startCompletionHelper()
m_model->m_completionOperator = T_LPAREN; m_model->m_completionOperator = T_LPAREN;
} }
QString expression;
int startOfExpression = m_interface->position();
tc.setPosition(endOfExpression); tc.setPosition(endOfExpression);
if (m_model->m_completionOperator) { if (m_model->m_completionOperator) {
expression = expressionUnderCursor(tc); const QString expression = expressionUnderCursor(tc);
startOfExpression = endOfExpression - expression.length();
if (m_model->m_completionOperator == T_LPAREN) { if (m_model->m_completionOperator == T_LPAREN) {
if (expression.endsWith(QLatin1String("SIGNAL"))) if (expression.endsWith(QLatin1String("SIGNAL")))
@@ -705,19 +702,13 @@ int ClangCompletionAssistProcessor::startCompletionHelper()
else if (m_interface->position() != endOfOperator) { else if (m_interface->position() != endOfOperator) {
// We don't want a function completion when the cursor isn't at the opening brace // We don't want a function completion when the cursor isn't at the opening brace
expression.clear();
m_model->m_completionOperator = T_EOF_SYMBOL; m_model->m_completionOperator = T_EOF_SYMBOL;
m_startPosition = startOfName; m_startPosition = startOfName;
startOfExpression = m_interface->position();
} }
} }
} else if (expression.isEmpty()) {
while (startOfExpression > 0 && m_interface->characterAt(startOfExpression).isSpace())
--startOfExpression;
} }
int line = 0, column = 0; int line = 0, column = 0;
// Convenience::convertPosition(m_interface->document(), startOfExpression, &line, &column);
Convenience::convertPosition(m_interface->textDocument(), endOfOperator, &line, &column); Convenience::convertPosition(m_interface->textDocument(), endOfOperator, &line, &column);
return startCompletionInternal(fileName, line, column, endOfOperator); return startCompletionInternal(fileName, line, column, endOfOperator);
} }