forked from qt-creator/qt-creator
CppTools: Change CppModelManager implementation pattern
Replace the CppModelManagerInterface/derived CppModelManager combo by a more common CppModelManager/CppModelManagerPrivate pimpl pattern. Change-Id: Ia4582845ed94d5ef60b8571bab9b2260c6290287 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
#include <utils/qtcassert.h>
|
||||
#include <projectexplorer/projectexplorer.h>
|
||||
#include <projectexplorer/session.h>
|
||||
#include <cpptools/cppmodelmanagerinterface.h>
|
||||
#include <cpptools/cppmodelmanager.h>
|
||||
#include <cpptools/cpptoolsconstants.h>
|
||||
#include <coreplugin/progressmanager/progressmanager.h>
|
||||
#include <coreplugin/editormanager/editormanager.h>
|
||||
@@ -269,8 +269,8 @@ void Manager::initialize()
|
||||
&d->parser, SLOT(setFlatMode(bool)), Qt::QueuedConnection);
|
||||
|
||||
// connect to the cpp model manager for signals about document updates
|
||||
CppTools::CppModelManagerInterface *codeModelManager
|
||||
= CppTools::CppModelManagerInterface::instance();
|
||||
CppTools::CppModelManager *codeModelManager
|
||||
= CppTools::CppModelManager::instance();
|
||||
|
||||
// when code manager signals that document is updated - handle it by ourselves
|
||||
connect(codeModelManager, SIGNAL(documentUpdated(CPlusPlus::Document::Ptr)),
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
#include <cplusplus/Name.h>
|
||||
|
||||
// other
|
||||
#include <cpptools/cppmodelmanagerinterface.h>
|
||||
#include <cpptools/cppmodelmanager.h>
|
||||
#include <cplusplus/Overview.h>
|
||||
#include <cplusplus/Icons.h>
|
||||
#include <projectexplorer/projectexplorer.h>
|
||||
@@ -666,7 +666,7 @@ void Parser::resetData(const CPlusPlus::Snapshot &snapshot)
|
||||
void Parser::resetDataToCurrentState()
|
||||
{
|
||||
// get latest data
|
||||
CppTools::CppModelManagerInterface *codeModel = CppTools::CppModelManagerInterface::instance();
|
||||
CppTools::CppModelManager *codeModel = CppTools::CppModelManager::instance();
|
||||
if (codeModel)
|
||||
resetData(codeModel->snapshot());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user