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

CppEditor: Re-use also the code to find the right index

Browse Source 
Don't calculate the right QModelIndex twice.
This commit is contained in:
Kai Koehne
2010-07-08 16:00:41 +02:00
parent 2ba49e4e72
commit 82497a9545
4 changed files with 49 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -1070,20 +1070,17 @@ void CPPEditor::updateMethodBoxIndexNow()
int line = 0, column = 0;
convertPosition(position(), &line, &column);
QModelIndex lastIndex;
QModelIndex m_overviewModelIndex = indexForPosition(line, column);
emit overviewModelIndexChanged(m_overviewModelIndex);
const int rc = m_overviewModel->rowCount();
for (int row = 0; row < rc; ++row) {
const QModelIndex index = m_overviewModel->index(row, 0, QModelIndex());
Symbol *symbol = m_overviewModel->symbolFromIndex(index);
if (symbol && symbol->line() > unsigned(line))
break;
lastIndex = index;
}
// ComboBox only let's you select top level indexes!
QModelIndex comboIndex = indexForPosition(line, column);
while (comboIndex.parent().isValid())
comboIndex = comboIndex.parent();
if (lastIndex.isValid()) {
if (comboIndex.isValid()) {
bool blocked = m_methodCombo->blockSignals(true);
m_methodCombo->setCurrentIndex(m_proxyModel->mapFromSource(lastIndex).row());
m_methodCombo->setCurrentIndex(m_proxyModel->mapFromSource(comboIndex).row());
updateMethodBoxToolTip();
(void) m_methodCombo->blockSignals(blocked);
}
@@ -1422,6 +1419,11 @@ CPlusPlus::OverviewModel *CPPEditor::overviewModel() const
return m_overviewModel;
}
QModelIndex CPPEditor::overviewModelIndex() const
{
return m_overviewModelIndex;
}
bool CPPEditor::isElectricCharacter(QChar ch) const
{
if (ch == QLatin1Char('{') ||
@@ -2166,3 +2168,24 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
return semanticInfo;
}
QModelIndex CPPEditor::indexForPosition(int line, int column, const QModelIndex &rootIndex)
{
QModelIndex lastIndex = rootIndex;
const int rowCount = m_overviewModel->rowCount(rootIndex);
for (int row = 0; row < rowCount; ++row) {
const QModelIndex index = m_overviewModel->index(row, 0, rootIndex);
Symbol *symbol = m_overviewModel->symbolFromIndex(index);
if (symbol && symbol->line() > unsigned(line))
break;
lastIndex = index;
}
if (lastIndex != rootIndex) {
// recurse
lastIndex = indexForPosition(line, column, lastIndex);
}
return lastIndex;
}