diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp index 4c032fb7694..bfc2a2a37ee 100644 --- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp +++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include @@ -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 { diff --git a/src/plugins/cpptools/cppcodemodelinspectordumper.cpp b/src/plugins/cpptools/cppcodemodelinspectordumper.cpp index d2600cdce17..28f9efbaf64 100644 --- a/src/plugins/cpptools/cppcodemodelinspectordumper.cpp +++ b/src/plugins/cpptools/cppcodemodelinspectordumper.cpp @@ -572,6 +572,28 @@ void Dumper::dumpWorkingCopy(const CppModelManagerInterface::WorkingCopy &workin } } +void Dumper::dumpMergedEntities(const QStringList &mergedIncludePaths, + const QStringList &mergedFrameworkPaths, + const QByteArray &mergedMacros) +{ + m_out << "Merged Entities{{{1\n"; + const QByteArray i2 = indent(2); + const QByteArray i3 = indent(3); + + m_out << i2 << "Merged Include Paths{{{2\n"; + dumpStringList(mergedIncludePaths, i3); + m_out << i2 << "Merged Framework Paths{{{2\n"; + dumpStringList(mergedFrameworkPaths, i3); + m_out << i2 << "Merged Defines{{{2\n"; + m_out << mergedMacros; +} + +void Dumper::dumpStringList(const QStringList &list, const QByteArray &indent) +{ + foreach (const QString &item, list) + m_out << indent << item << "\n"; +} + void Dumper::dumpDocuments(const QList &documents, bool skipDetails) { const QByteArray i2 = indent(2); diff --git a/src/plugins/cpptools/cppcodemodelinspectordumper.h b/src/plugins/cpptools/cppcodemodelinspectordumper.h index b58f32acbcd..911317915a2 100644 --- a/src/plugins/cpptools/cppcodemodelinspectordumper.h +++ b/src/plugins/cpptools/cppcodemodelinspectordumper.h @@ -72,8 +72,12 @@ public: const QString &title, bool isGlobalSnapshot = false); void dumpWorkingCopy(const CppTools::CppModelManagerInterface::WorkingCopy &workingCopy); + void dumpMergedEntities(const QStringList &mergedIncludePaths, + const QStringList &mergedFrameworkPaths, + const QByteArray &mergedMacros); private: + void dumpStringList(const QStringList &list, const QByteArray &indent); void dumpDocuments(const QList &documents, bool skipDetails = false); static QByteArray indent(int level);