CppTools: Use namespace CppTools consistently

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>

1 files changed, 9 insertions, 15 deletions

diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 1e811c912e..55fc760850 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -49,22 +49,16 @@
 #include <QTimer>
 #include <QTextEdit> // for QTextEdit::ExtraSelection
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace TextEditor {
 class ITextEditor;
 class BaseTextEditorWidget;
-}
+} // namespace TextEditor
 
-namespace ProjectExplorer {
-class ProjectExplorerPlugin;
-}
+namespace ProjectExplorer { class ProjectExplorerPlugin; }
 
-namespace CPlusPlus {
-    class ParseManager;
-}
+namespace CPlusPlus { class ParseManager; }
 
 namespace CppTools {
 
@@ -77,7 +71,7 @@ class CppEditorSupport;
 class CppPreprocessor;
 class CppFindReferences;
 
-class CPPTOOLS_EXPORT CppModelManager : public CPlusPlus::CppModelManagerInterface
+class CPPTOOLS_EXPORT CppModelManager : public CppTools::CppModelManagerInterface
 {
     Q_OBJECT
 
@@ -96,7 +90,7 @@ public:
     virtual QList<ProjectInfo> projectInfos() const;
     virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const;
     virtual void updateProjectInfo(const ProjectInfo &pinfo);
-    virtual QList<CPlusPlus::ProjectPart::Ptr> projectPart(const QString &fileName) const;
+    virtual QList<CppTools::ProjectPart::Ptr> projectPart(const QString &fileName) const;
 
     virtual CPlusPlus::Snapshot snapshot() const;
     virtual Document::Ptr document(const QString &fileName) const;
@@ -246,7 +240,7 @@ private:
     mutable QMutex m_protectExtraDiagnostics;
     QHash<QString, QHash<int, QList<Document::DiagnosticMessage> > > m_extraDiagnostics;
 
-    QMap<QString, QList<CPlusPlus::ProjectPart::Ptr> > m_srcToProjectPart;
+    QMap<QString, QList<CppTools::ProjectPart::Ptr> > m_srcToProjectPart;
 
     CppCompletionAssistProvider *m_completionAssistProvider;
     CppCompletionAssistProvider *m_completionFallback;
@@ -265,7 +259,7 @@ public:
     virtual ~CppPreprocessor();
 
     void setRevision(unsigned revision);
-    void setWorkingCopy(const CPlusPlus::CppModelManagerInterface::WorkingCopy &workingCopy);
+    void setWorkingCopy(const CppTools::CppModelManagerInterface::WorkingCopy &workingCopy);
     void setIncludePaths(const QStringList &includePaths);
     void setFrameworkPaths(const QStringList &frameworkPaths);
     void addFrameworkPath(const QString &frameworkPath);
@@ -316,7 +310,7 @@ private:
     CPlusPlus::Environment m_env;
     CPlusPlus::Preprocessor m_preprocess;
     QStringList m_includePaths;
-    CPlusPlus::CppModelManagerInterface::WorkingCopy m_workingCopy;
+    CppTools::CppModelManagerInterface::WorkingCopy m_workingCopy;
     QStringList m_frameworkPaths;
     QSet<QString> m_included;
     CPlusPlus::Document::Ptr m_currentDoc;