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, 5 insertions, 8 deletions

diff --git a/src/plugins/cpptools/abstracteditorsupport.h b/src/plugins/cpptools/abstracteditorsupport.h
index e52eebf319..0e7f6f4109 100644
--- a/src/plugins/cpptools/abstracteditorsupport.h
+++ b/src/plugins/cpptools/abstracteditorsupport.h
@@ -34,16 +34,13 @@
 
 #include <QString>
 
-namespace CPlusPlus {
-class CppModelManagerInterface;
-}
-
 namespace CppTools {
+class CppModelManagerInterface;
 
 class CPPTOOLS_EXPORT AbstractEditorSupport
 {
 public:
-    explicit AbstractEditorSupport(CPlusPlus::CppModelManagerInterface *modelmanager);
+    explicit AbstractEditorSupport(CppModelManagerInterface *modelmanager);
     virtual ~AbstractEditorSupport();
 
     virtual QByteArray contents() const = 0;
@@ -52,16 +49,16 @@ public:
     void updateDocument();
 
     // TODO: find a better place for common utility functions
-    static QString functionAt(const CPlusPlus::CppModelManagerInterface *mm,
+    static QString functionAt(const CppModelManagerInterface *mm,
                               const QString &fileName,
                               int line, int column);
 
     static QString licenseTemplate(const QString &file = QString(), const QString &className = QString());
 
 private:
-    CPlusPlus::CppModelManagerInterface *m_modelmanager;
+    CppModelManagerInterface *m_modelmanager;
 };
 
-}
+} // namespace CppTools
 
 #endif // ABSTRACTEDITORSUPPORT_H