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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -257,7 +257,7 @@ Core::IEditor *DiffEditor::duplicate()
editor->m_sync = m_sync;
editor->m_showDescription = m_showDescription;
Core::Id id = currentView()->id();
Utils::Id id = currentView()->id();
IDiffView *view = Utils::findOr(editor->m_views, editor->m_views.at(0),
Utils::equal(&IDiffView::id, id));
QTC_ASSERT(view, view = editor->currentView());
@@ -523,7 +523,7 @@ IDiffView *DiffEditor::loadSettings()
m_sync = s->value(horizontalScrollBarSynchronizationKeyC, true).toBool();
m_document->setIgnoreWhitespace(s->value(ignoreWhitespaceKeyC, false).toBool());
m_document->setContextLineCount(s->value(contextLineCountKeyC, 3).toInt());
Core::Id id = Core::Id::fromSetting(s->value(diffViewKeyC));
Utils::Id id = Utils::Id::fromSetting(s->value(diffViewKeyC));
s->endGroup();
IDiffView *view = Utils::findOr(m_views, m_views.at(0),