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

CppEditor: Don't show 'generated' symbols in the outline

Browse Source 
Don't show e.g. all the methods that are defined by the Q_OBJECT
macro in the outline. We skip these by checking for Symbol->isGenerated
in the two proxy models used.
This commit is contained in:
Kai Koehne
2010-07-08 17:03:38 +02:00
parent 82497a9545
commit d3c4f329d7
3 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cppeditor/cppoutline.cpp
View File

@@ -30,9 +30,11 @@ CppOutlineTreeView::CppOutlineTreeView(QWidget *parent) :
setExpandsOnDoubleClick(false);
}
CppOutlineFilterModel::CppOutlineFilterModel(QObject *parent) :
QSortFilterProxyModel(parent)
CppOutlineFilterModel::CppOutlineFilterModel(CPlusPlus::OverviewModel *sourceModel, QObject *parent) :
QSortFilterProxyModel(parent),
m_sourceModel(sourceModel)
{
setSourceModel(m_sourceModel);
}
bool CppOutlineFilterModel::filterAcceptsRow(int sourceRow,
@@ -42,6 +44,12 @@ bool CppOutlineFilterModel::filterAcceptsRow(int sourceRow,
if (!sourceParent.isValid() && sourceRow == 0) {
return false;
}
// ignore generated symbols, e.g. by macro expansion (Q_OBJECT)
const QModelIndex sourceIndex = m_sourceModel->index(sourceRow, 0, sourceParent);
CPlusPlus::Symbol *symbol = m_sourceModel->symbolFromIndex(sourceIndex);
if (symbol && symbol->isGenerated())
return false;
return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
}
@@ -51,7 +59,7 @@ CppOutlineWidget::CppOutlineWidget(CPPEditor *editor) :
m_editor(editor),
m_treeView(new CppOutlineTreeView(this)),
m_model(m_editor->overviewModel()),
m_proxyModel(new CppOutlineFilterModel(this)),
m_proxyModel(new CppOutlineFilterModel(m_model, this)),
m_enableCursorSync(true),
m_blockCursorSync(false)
{
@@ -61,7 +69,6 @@ CppOutlineWidget::CppOutlineWidget(CPPEditor *editor) :
layout->addWidget(m_treeView);
setLayout(layout);
m_proxyModel->setSourceModel(m_model);
m_treeView->setModel(m_proxyModel);
connect(m_model, SIGNAL(modelReset()), this, SLOT(modelUpdated()));