From 95aae8bb5ef615d40286b25921477fc63c65c3b0 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 5 May 2010 12:12:00 +0200
Subject: [PATCH] Get rid of ugly using namespace directives.

---
 src/plugins/cpptools/cppmodelmanager.h | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index ac35ef0e5bc..2e6651cb12e 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -237,7 +237,6 @@ private:
 };
 #endif
 
-using namespace CPlusPlus;
 class CppPreprocessor: public CPlusPlus::Client
 {
 public:
@@ -264,7 +263,7 @@ public:
     { return m_todo; }
 
 public: // attributes
-    Snapshot snapshot;
+    CPlusPlus::Snapshot snapshot;
 
 protected:
     CPlusPlus::Document::Ptr switchDocument(CPlusPlus::Document::Ptr doc);
@@ -274,15 +273,15 @@ protected:
 
     void mergeEnvironment(CPlusPlus::Document::Ptr doc);
 
-    virtual void macroAdded(const Macro &macro);
-    virtual void passedMacroDefinitionCheck(unsigned offset, const Macro &macro);
+    virtual void macroAdded(const CPlusPlus::Macro &macro);
+    virtual void passedMacroDefinitionCheck(unsigned offset, const CPlusPlus::Macro &macro);
     virtual void failedMacroDefinitionCheck(unsigned offset, const QByteArray &name);
     virtual void startExpandingMacro(unsigned offset,
-                                     const Macro &macro,
+                                     const CPlusPlus::Macro &macro,
                                      const QByteArray &originalText,
                                      bool inCondition,
-                                     const QVector<MacroArgumentReference> &actuals);
-    virtual void stopExpandingMacro(unsigned offset, const Macro &macro);
+                                     const QVector<CPlusPlus::MacroArgumentReference> &actuals);
+    virtual void stopExpandingMacro(unsigned offset, const CPlusPlus::Macro &macro);
     virtual void startSkippingBlocks(unsigned offset);
     virtual void stopSkippingBlocks(unsigned offset);
     virtual void sourceNeeded(QString &fileName, IncludeType type,
@@ -292,15 +291,15 @@ private:
 #ifndef ICHECK_BUILD
     QPointer<CppModelManager> m_modelManager;
 #endif
-    Environment env;
-    Preprocessor preprocess;
+    CPlusPlus::Environment env;
+    CPlusPlus::Preprocessor preprocess;
     QStringList m_includePaths;
     QStringList m_systemIncludePaths;
     CppModelManagerInterface::WorkingCopy m_workingCopy;
     QStringList m_projectFiles;
     QStringList m_frameworkPaths;
     QSet<QString> m_included;
-    Document::Ptr m_currentDoc;
+    CPlusPlus::Document::Ptr m_currentDoc;
     QSet<QString> m_todo;
     QSet<QString> m_processed;
     unsigned m_revision;
-- 
GitLab