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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
This commit is contained in:
Oswald Buddenhagen
2013-01-16 16:42:56 +01:00
parent 72e3605a01 6ec9dd10a5
commit 65c169c80e
23 changed files with 299 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
View File

@@ -285,22 +285,27 @@ bool BasicProposalItemListModel::keepPerfectMatch(AssistReason reason) const
QString BasicProposalItemListModel::proposalPrefix() const
{
if (m_currentItems.size() >= kMaxPrefixFilter)
if (m_currentItems.size() >= kMaxPrefixFilter || m_currentItems.isEmpty())
return QString();
// Compute common prefix
QString firstKey = m_currentItems.first()->text();
QString lastKey = m_currentItems.last()->text();
const int length = qMin(firstKey.length(), lastKey.length());
firstKey.truncate(length);
lastKey.truncate(length);
QString commonPrefix = m_currentItems.first()->text();
for (int i = 1, ei = m_currentItems.size(); i < ei; ++i) {
QString nextItem = m_currentItems.at(i)->text();
const int length = qMin(commonPrefix.length(), nextItem.length());
commonPrefix.truncate(length);
nextItem.truncate(length);
while (firstKey != lastKey) {
firstKey.chop(1);
lastKey.chop(1);
while (commonPrefix != nextItem) {
commonPrefix.chop(1);
nextItem.chop(1);
}
if (commonPrefix.isEmpty()) // there is no common prefix, so return.
return commonPrefix;
}
return firstKey;
return commonPrefix;
}
IAssistProposalItem *BasicProposalItemListModel::proposalItem(int index) const