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

CppTools: Change CppModelManager implementation pattern

Browse Source 
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:
hjk
2014-09-15 00:12:27 +02:00
committed by Nikolai Kosjar
parent e5e8693148
commit b26a17f30d
89 changed files with 429 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/designer/qtcreatorintegration.cpp
View File

@@ -34,7 +34,7 @@
#include <widgethost.h>
#include <designer/cpp/formclasswizardpage.h>
#include <cpptools/cppmodelmanagerinterface.h>
#include <cpptools/cppmodelmanager.h>
#include <cpptools/cpptoolsconstants.h>
#include <cpptools/cppworkingcopy.h>
#include <cpptools/insertionpointlocator.h>
@@ -248,7 +248,7 @@ static Function *findDeclaration(const Class *cl, const QString &functionName)
// TODO: remove me, this is taken from cppeditor.cpp. Find some common place for this function
static Document::Ptr findDefinition(Function *functionDeclaration, int *line)
{
if (CppTools::CppModelManagerInterface *cppModelManager = CppTools::CppModelManagerInterface::instance()) {
if (CppTools::CppModelManager *cppModelManager = CppTools::CppModelManager::instance()) {
const Snapshot snapshot = cppModelManager->snapshot();
CppTools::SymbolFinder symbolFinder;
if (Function *fun = symbolFinder.findMatchingDefinition(functionDeclaration, snapshot)) {
@@ -523,7 +523,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
const QString uicedName = QLatin1String("ui_") + fi.completeBaseName() + QLatin1String(".h");
// Retrieve code model snapshot restricted to project of ui file or the working copy.
Snapshot docTable = CppTools::CppModelManagerInterface::instance()->snapshot();
Snapshot docTable = CppTools::CppModelManager::instance()->snapshot();
Snapshot newDocTable;
const Project *uiProject = SessionManager::projectForFile(currentUiFile);
if (uiProject) {
@@ -535,12 +535,12 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
}
} else {
const CppTools::WorkingCopy workingCopy =
CppTools::CppModelManagerInterface::instance()->workingCopy();
CppTools::CppModelManager::instance()->workingCopy();
QHashIterator<QString, QPair<QByteArray, unsigned> > it = workingCopy.iterator();
while (it.hasNext()) {
it.next();
const QString fileName = it.key();
if (fileName != CppTools::CppModelManagerInterface::configurationFileName())
if (fileName != CppTools::CppModelManager::configurationFileName())
newDocTable.insert(docTable.document(fileName));
}
}
@@ -613,7 +613,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
} else {
// add function declaration to cl
CppTools::WorkingCopy workingCopy =
CppTools::CppModelManagerInterface::instance()->workingCopy();
CppTools::CppModelManager::instance()->workingCopy();
const QString fileName = doc->fileName();
getParsedDocument(fileName, workingCopy, docTable);
addDeclaration(docTable, fileName, cl, functionNameWithParameterNames);