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

CppTools: Use namespace CppTools consistently

Browse Source 
There were quite a few classes using CPlusPlus namespace in the
CppTools plugin. Rename them and do some other small namespace
related coding style fixups.

Change-Id: I093fc1f3fc394fd9923e3f18d5f66522e288f21d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Tobias Hunger
2013-04-02 11:28:11 +02:00
parent ff3bf32435
commit ea23948efb
54 changed files with 291 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -243,13 +243,13 @@ void GenericProject::refresh(RefreshOptions options)
if (options & Files)
m_rootNode->refresh(oldFileList);
CPlusPlus::CppModelManagerInterface *modelManager =
CPlusPlus::CppModelManagerInterface::instance();
CppTools::CppModelManagerInterface *modelManager =
CppTools::CppModelManagerInterface::instance();
if (modelManager) {
CPlusPlus::CppModelManagerInterface::ProjectInfo pinfo = modelManager->projectInfo(this);
CppTools::CppModelManagerInterface::ProjectInfo pinfo = modelManager->projectInfo(this);
pinfo.clearProjectParts();
CPlusPlus::ProjectPart::Ptr part(new CPlusPlus::ProjectPart);
CppTools::ProjectPart::Ptr part(new CppTools::ProjectPart);
Kit *k = activeTarget() ? activeTarget()->kit() : KitManager::instance()->defaultKit();
if (ToolChain *tc = ToolChainKitInformation::toolChain(k)) {
@@ -271,22 +271,22 @@ void GenericProject::refresh(RefreshOptions options)
// ### add _defines.
// Add any C/C++ files to be parsed
CPlusPlus::ProjectFileAdder adder(part->files);
CppTools::ProjectFileAdder adder(part->files);
foreach (const QString &file, files())
adder.maybeAdd(file);
QStringList filesToUpdate;
if (options & Configuration) {
foreach (const CPlusPlus::ProjectFile &file, part->files)
foreach (const CppTools::ProjectFile &file, part->files)
filesToUpdate << file.path;
filesToUpdate.append(CPlusPlus::CppModelManagerInterface::configurationFileName());
filesToUpdate.append(CppTools::CppModelManagerInterface::configurationFileName());
// Full update, if there's a code model update, cancel it
m_codeModelFuture.cancel();
} else if (options & Files) {
// Only update files that got added to the list
QSet<QString> newFileList;
foreach (const CPlusPlus::ProjectFile &file, part->files)
foreach (const CppTools::ProjectFile &file, part->files)
newFileList.insert(file.path);
newFileList.subtract(oldFileList);
filesToUpdate.append(newFileList.toList());