CppEditor: Dump also merged entities if invoking CppCodeModelInspector

Change-Id: I6a167b47363fb14452bd8ba3dc9d4242d17c25b6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-03-17 09:03:01 -03:00
parent 25be7e087d
commit 4b99d218d5
3 changed files with 31 additions and 2 deletions

View File

@@ -34,7 +34,7 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <cpptools/cppcodemodelinspectordumper.h>
#include <cpptools/cppmodelmanagerinterface.h>
#include <cpptools/cppmodelmanager.h>
#include <cpptools/cpptoolseditorsupport.h>
#include <projectexplorer/project.h>
@@ -1335,7 +1335,7 @@ void CppCodeModelInspectorDialog::onWorkingCopyDocumentSelected(const QModelInde
void CppCodeModelInspectorDialog::refresh()
{
CppModelManagerInterface *cmm = CppModelManagerInterface::instance();
CppTools::Internal::CppModelManager *cmm = CppTools::Internal::CppModelManager::instance();
const int oldSnapshotIndex = m_ui->snapshotSelector->currentIndex();
const bool selectEditorRelevant
@@ -1443,6 +1443,9 @@ void CppCodeModelInspectorDialog::refresh()
}
m_workingCopyView->selectIndex(index);
}
// Merged entities
dumper.dumpMergedEntities(cmm->includePaths(), cmm->frameworkPaths(), cmm->definedMacros());
}
enum DocumentTabs {