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

CppEditor: Code cosmetics in cppeditoroutline.cpp

Browse Source 
Mostly inlining and namepsaces.

Change-Id: Ib5d22d40844d55ae029158d8cf3d694ecf2bc4c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2024-02-02 15:17:41 +01:00
parent b72c3bc8a2
commit a7bf5f17c5
1 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/cppeditor/cppeditoroutline.cpp
View File

@@ -37,20 +37,17 @@ enum { UpdateOutlineIntervalInMs = 500 };
using namespace Core; using namespace Core;
using namespace Utils; using namespace Utils;
namespace { namespace CppEditor::Internal {
class OutlineProxyModel : public QSortFilterProxyModel class OutlineProxyModel final : public QSortFilterProxyModel
{ {
Q_OBJECT
public: public:
OutlineProxyModel(CppEditor::Internal::OutlineModel &sourceModel, QObject *parent) OutlineProxyModel(OutlineModel &sourceModel, QObject *parent)
: QSortFilterProxyModel(parent) : QSortFilterProxyModel(parent)
, m_sourceModel(sourceModel) , m_sourceModel(sourceModel)
{ {}
}
bool filterAcceptsRow(int sourceRow,const QModelIndex &sourceParent) const override bool filterAcceptsRow(int sourceRow,const QModelIndex &sourceParent) const final
{ {
// Ignore generated symbols, e.g. by macro expansion (Q_OBJECT) // Ignore generated symbols, e.g. by macro expansion (Q_OBJECT)
const QModelIndex sourceIndex = m_sourceModel.index(sourceRow, 0, sourceParent); const QModelIndex sourceIndex = m_sourceModel.index(sourceRow, 0, sourceParent);
@@ -63,19 +60,6 @@ private:
CppEditor::Internal::OutlineModel &m_sourceModel; CppEditor::Internal::OutlineModel &m_sourceModel;
}; };
QTimer *newSingleShotTimer(QObject *parent, int msInternal, const QString &objectName)
{
auto *timer = new QTimer(parent);
timer->setObjectName(objectName);
timer->setSingleShot(true);
timer->setInterval(msInternal);
return timer;
}
} // anonymous namespace
namespace CppEditor::Internal {
static Key sortEditorDocumentOutlineKey() static Key sortEditorDocumentOutlineKey()
{ {
return Key(Constants::CPPEDITOR_SETTINGSGROUP) return Key(Constants::CPPEDITOR_SETTINGSGROUP)
@@ -101,7 +85,7 @@ static void setSortedEditorDocumentOutline(bool sorted)
CppEditorOutline::CppEditorOutline(CppEditorWidget *editorWidget) CppEditorOutline::CppEditorOutline(CppEditorWidget *editorWidget)
: QObject(editorWidget) : QObject(editorWidget)
, m_editorWidget(editorWidget) , m_editorWidget(editorWidget)
, m_combo(new Utils::TreeViewComboBox) , m_combo(new TreeViewComboBox)
{ {
m_model = &editorWidget->cppEditorDocument()->outlineModel(); m_model = &editorWidget->cppEditorDocument()->outlineModel();
m_proxyModel = new OutlineProxyModel(*m_model, this); m_proxyModel = new OutlineProxyModel(*m_model, this);
@@ -134,9 +118,13 @@ CppEditorOutline::CppEditorOutline(CppEditorWidget *editorWidget)
connect(m_combo, &QComboBox::currentIndexChanged, this, &CppEditorOutline::updateToolTip); connect(m_combo, &QComboBox::currentIndexChanged, this, &CppEditorOutline::updateToolTip);
connect(m_model, &OutlineModel::modelReset, this, &CppEditorOutline::updateNow); connect(m_model, &OutlineModel::modelReset, this, &CppEditorOutline::updateNow);
// Set up timers // Set up timers
m_updateIndexTimer = newSingleShotTimer(this, UpdateOutlineIntervalInMs, m_updateIndexTimer = new QTimer(this);
QLatin1String("CppEditorOutline::m_updateIndexTimer")); m_updateIndexTimer->setObjectName("CppEditorOutline::m_updateIndexTimer");
m_updateIndexTimer->setSingleShot(true);
m_updateIndexTimer->setInterval(UpdateOutlineIntervalInMs);
connect(m_updateIndexTimer, &QTimer::timeout, this, &CppEditorOutline::updateIndexNow); connect(m_updateIndexTimer, &QTimer::timeout, this, &CppEditorOutline::updateIndexNow);
} }
@@ -191,16 +179,14 @@ void CppEditorOutline::gotoSymbolInEditor()
const QModelIndex modelIndex = m_combo->view()->currentIndex(); const QModelIndex modelIndex = m_combo->view()->currentIndex();
const QModelIndex sourceIndex = m_proxyModel->mapToSource(modelIndex); const QModelIndex sourceIndex = m_proxyModel->mapToSource(modelIndex);
const Utils::Link link = m_model->linkFromIndex(sourceIndex); const Link link = m_model->linkFromIndex(sourceIndex);
if (!link.hasValidTarget()) if (!link.hasValidTarget())
return; return;
Core::EditorManager::cutForwardNavigationHistory(); EditorManager::cutForwardNavigationHistory();
Core::EditorManager::addCurrentPositionToNavigationHistory(); EditorManager::addCurrentPositionToNavigationHistory();
m_editorWidget->gotoLine(link.targetLine, link.targetColumn, true, true); m_editorWidget->gotoLine(link.targetLine, link.targetColumn, true, true);
emit m_editorWidget->activateEditor(); emit m_editorWidget->activateEditor();
} }
} // namespace CppEditor::Internal } // namespace CppEditor::Internal
#include <cppeditoroutline.moc>