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

Merge remote branch 'origin/1.3'

Browse Source 
Conflicts:
	src/libs/cplusplus/CheckUndefinedSymbols.cpp
	src/plugins/qmleditor/qmlcodecompletion.cpp
This commit is contained in:
Erik Verbruggen
2009-10-06 11:41:00 +02:00
parent c3e08337fc 06abe6b813
commit 49f6b740cd
318 changed files with 2873 additions and 1577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmleditor/qmlcodecompletion.cpp
View File

@@ -105,7 +105,7 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
continue;
TextEditor::CompletionItem item(this);
item.m_text = word;
item.text = word;
m_completions.append(item);
}
}
@@ -154,9 +154,9 @@ void QmlCodeCompletion::completions(QList<TextEditor::CompletionItem> *completio
const QRegExp regExp(keyRegExp, Qt::CaseSensitive);
foreach (TextEditor::CompletionItem item, m_completions) {
if (regExp.indexIn(item.m_text) == 0) {
item.m_relevance = (key.length() > 0 &&
item.m_text.startsWith(key, Qt::CaseInsensitive)) ? 1 : 0;
if (regExp.indexIn(item.text) == 0) {
item.relevance = (key.length() > 0 &&
item.text.startsWith(key, Qt::CaseInsensitive)) ? 1 : 0;
(*completions) << item;
}
}
@@ -165,7 +165,7 @@ void QmlCodeCompletion::completions(QList<TextEditor::CompletionItem> *completio
void QmlCodeCompletion::complete(const TextEditor::CompletionItem &item)
{
const QString toInsert = item.m_text;
const QString toInsert = item.text;
const int length = m_editor->position() - m_startPosition;
m_editor->setCurPos(m_startPosition);
m_editor->replace(length, toInsert);
@@ -178,8 +178,8 @@ bool QmlCodeCompletion::partiallyComplete(const QList<TextEditor::CompletionItem
return true;
} else {
// Compute common prefix
QString firstKey = completionItems.first().m_text;
QString lastKey = completionItems.last().m_text;
QString firstKey = completionItems.first().text;
QString lastKey = completionItems.last().text;
const int length = qMin(firstKey.length(), lastKey.length());
firstKey.truncate(length);
lastKey.truncate(length);