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/qt4projectmanager/qt4project.cpp
View File

@@ -446,9 +446,9 @@ bool Qt4Project::equalFileList(const QStringList &a, const QStringList &b)
QStringList::const_iterator bend = b.constEnd();
while (ait != aend && bit != bend) {
if (*ait == CPlusPlus::CppModelManagerInterface::configurationFileName())
if (*ait == CppTools::CppModelManagerInterface::configurationFileName())
++ait;
else if (*bit == CPlusPlus::CppModelManagerInterface::configurationFileName())
else if (*bit == CppTools::CppModelManagerInterface::configurationFileName())
++bit;
else if (*ait == *bit)
++ait, ++bit;
@@ -472,8 +472,8 @@ void Qt4Project::updateCodeModels()
void Qt4Project::updateCppCodeModel()
{
typedef CPlusPlus::ProjectPart ProjectPart;
typedef CPlusPlus::ProjectFile ProjectFile;
typedef CppTools::ProjectPart ProjectPart;
typedef CppTools::ProjectFile ProjectFile;
Kit *k = 0;
QtSupport::BaseQtVersion *qtVersion = 0;
@@ -485,8 +485,8 @@ void Qt4Project::updateCppCodeModel()
qtVersion = QtSupport::QtKitInformation::qtVersion(k);
tc = ToolChainKitInformation::toolChain(k);
CPlusPlus::CppModelManagerInterface *modelmanager =
CPlusPlus::CppModelManagerInterface::instance();
CppTools::CppModelManagerInterface *modelmanager =
CppTools::CppModelManagerInterface::instance();
if (!modelmanager)
return;
@@ -494,7 +494,7 @@ void Qt4Project::updateCppCodeModel()
FindQt4ProFiles findQt4ProFiles;
QList<Qt4ProFileNode *> proFiles = findQt4ProFiles(rootProjectNode());
CPlusPlus::CppModelManagerInterface::ProjectInfo pinfo = modelmanager->projectInfo(this);
CppTools::CppModelManagerInterface::ProjectInfo pinfo = modelmanager->projectInfo(this);
pinfo.clearProjectParts();
ProjectPart::QtVersion qtVersionForPart = ProjectPart::NoQt;
if (qtVersion) {
@@ -567,7 +567,7 @@ void Qt4Project::updateCppCodeModel()
part->files << ProjectFile(file, ProjectFile::CXXHeader);
}
part->files.prepend(ProjectFile(CPlusPlus::CppModelManagerInterface::configurationFileName(),
part->files.prepend(ProjectFile(CppTools::CppModelManagerInterface::configurationFileName(),
ProjectFile::CXXSource));
foreach (const QString &file, pro->variableValue(ObjCSourceVar)) {
allFiles << file;