diff options
Diffstat (limited to 'src/plugins/cpptools')
23 files changed, 173 insertions, 190 deletions
diff --git a/src/plugins/cpptools/ModelManagerInterface.cpp b/src/plugins/cpptools/ModelManagerInterface.cpp index e9548f185d..9799277180 100644 --- a/src/plugins/cpptools/ModelManagerInterface.cpp +++ b/src/plugins/cpptools/ModelManagerInterface.cpp @@ -34,7 +34,7 @@ #include <QtCore/QSet> /*! - \enum CPlusPlus::CppModelManagerInterface::QtVersion + \enum CppTools::CppModelManagerInterface::QtVersion Allows C++ parser engine to inject headers or change inner settings as needed to parse Qt language extensions for concrete major Qt version \value UnknownQt @@ -47,12 +47,12 @@ Parser may enable tricks for Qt v5.x */ -using namespace CPlusPlus; +using namespace CppTools; static CppModelManagerInterface *g_instance = 0; const QString CppModelManagerInterface::configurationFileName() -{ return Preprocessor::configurationFileName; } +{ return CPlusPlus::Preprocessor::configurationFileName; } CppModelManagerInterface::CppModelManagerInterface(QObject *parent) : QObject(parent) diff --git a/src/plugins/cpptools/ModelManagerInterface.h b/src/plugins/cpptools/ModelManagerInterface.h index ceb82e6f86..d900e4d8c6 100644 --- a/src/plugins/cpptools/ModelManagerInterface.h +++ b/src/plugins/cpptools/ModelManagerInterface.h @@ -42,28 +42,17 @@ #include <QStringList> #include <QFuture> -namespace Core { - class IEditor; -} - -namespace CPlusPlus { - class LookupContext; -} - -namespace ProjectExplorer { - class Project; -} +namespace Core { class IEditor; } +namespace CPlusPlus { class LookupContext; } +namespace ProjectExplorer { class Project; } namespace CppTools { - class AbstractEditorSupport; - class CppCompletionSupport; - class CppCompletionAssistProvider; - class CppHighlightingSupport; - class CppHighlightingSupportFactory; - class CppIndexingSupport; -} - -namespace CPlusPlus { +class AbstractEditorSupport; +class CppCompletionSupport; +class CppCompletionAssistProvider; +class CppHighlightingSupport; +class CppHighlightingSupportFactory; +class CppIndexingSupport; class CPPTOOLS_EXPORT ProjectPart { @@ -268,6 +257,6 @@ public Q_SLOTS: virtual void GC() = 0; }; -} // namespace CPlusPlus +} // namespace CppTools #endif // CPPMODELMANAGERINTERFACE_H diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.cpp b/src/plugins/cpptools/TypeHierarchyBuilder.cpp index d1bb186964..dd1e546f26 100644 --- a/src/plugins/cpptools/TypeHierarchyBuilder.cpp +++ b/src/plugins/cpptools/TypeHierarchyBuilder.cpp @@ -38,7 +38,7 @@ #include <cplusplus/Symbols.h> #include <cplusplus/TranslationUnit.h> -using namespace CPlusPlus; +using namespace CppTools; namespace { @@ -50,7 +50,7 @@ QString unqualifyName(const QString &qualifiedName) return qualifiedName.right(qualifiedName.length() - index - 2); } -class DerivedHierarchyVisitor : public SymbolVisitor +class DerivedHierarchyVisitor : public CPlusPlus::SymbolVisitor { public: DerivedHierarchyVisitor(const QString &qualifiedName) @@ -58,47 +58,48 @@ public: , _unqualifiedName(unqualifyName(qualifiedName)) {} - void execute(const Document::Ptr &doc, const Snapshot &snapshot); + void execute(const CPlusPlus::Document::Ptr &doc, const CPlusPlus::Snapshot &snapshot); - virtual bool visit(Class *); + virtual bool visit(CPlusPlus::Class *); - const QList<Symbol *> &derived() { return _derived; } + const QList<CPlusPlus::Symbol *> &derived() { return _derived; } const QStringList otherBases() { return _otherBases; } private: - LookupContext _context; + CPlusPlus::LookupContext _context; QString _qualifiedName; QString _unqualifiedName; - Overview _overview; - QHash<Symbol *, QString> _actualBases; + CPlusPlus::Overview _overview; + QHash<CPlusPlus::Symbol *, QString> _actualBases; QStringList _otherBases; - QList<Symbol *> _derived; + QList<CPlusPlus::Symbol *> _derived; }; -void DerivedHierarchyVisitor::execute(const Document::Ptr &doc, const Snapshot &snapshot) +void DerivedHierarchyVisitor::execute(const CPlusPlus::Document::Ptr &doc, + const CPlusPlus::Snapshot &snapshot) { _derived.clear(); _otherBases.clear(); - _context = LookupContext(doc, snapshot); + _context = CPlusPlus::LookupContext(doc, snapshot); for (unsigned i = 0; i < doc->globalSymbolCount(); ++i) accept(doc->globalSymbolAt(i)); } -bool DerivedHierarchyVisitor::visit(Class *symbol) +bool DerivedHierarchyVisitor::visit(CPlusPlus::Class *symbol) { for (unsigned i = 0; i < symbol->baseClassCount(); ++i) { - BaseClass *baseSymbol = symbol->baseClassAt(i); + CPlusPlus::BaseClass *baseSymbol = symbol->baseClassAt(i); QString baseName = _actualBases.value(baseSymbol); if (baseName.isEmpty()) { - QList<LookupItem> items = _context.lookup(baseSymbol->name(), symbol->enclosingScope()); + QList<CPlusPlus::LookupItem> items = _context.lookup(baseSymbol->name(), symbol->enclosingScope()); if (items.isEmpty() || !items.first().declaration()) continue; - Symbol *actualBaseSymbol = items.first().declaration(); + CPlusPlus::Symbol *actualBaseSymbol = items.first().declaration(); if (actualBaseSymbol->isTypedef()) { - NamedType *namedType = actualBaseSymbol->type()->asNamedType(); + CPlusPlus::NamedType *namedType = actualBaseSymbol->type()->asNamedType(); if (!namedType) { // Anonymous aggregate such as: typedef struct {} Empty; continue; @@ -112,7 +113,8 @@ bool DerivedHierarchyVisitor::visit(Class *symbol) } } - const QList<const Name *> &full = LookupContext::fullyQualifiedName(actualBaseSymbol); + const QList<const CPlusPlus::Name *> &full + = CPlusPlus::LookupContext::fullyQualifiedName(actualBaseSymbol); baseName = _overview.prettyName(full); _actualBases.insert(baseSymbol, baseName); } @@ -126,15 +128,15 @@ bool DerivedHierarchyVisitor::visit(Class *symbol) return true; } -} +} // namespace TypeHierarchy::TypeHierarchy() : _symbol(0) {} -TypeHierarchy::TypeHierarchy(Symbol *symbol) : _symbol(symbol) +TypeHierarchy::TypeHierarchy(CPlusPlus::Symbol *symbol) : _symbol(symbol) {} -Symbol *TypeHierarchy::symbol() const +CPlusPlus::Symbol *TypeHierarchy::symbol() const { return _symbol; } @@ -144,12 +146,12 @@ const QList<TypeHierarchy> &TypeHierarchy::hierarchy() const return _hierarchy; } -TypeHierarchyBuilder::TypeHierarchyBuilder(Symbol *symbol, const Snapshot &snapshot) +TypeHierarchyBuilder::TypeHierarchyBuilder(CPlusPlus::Symbol *symbol, const CPlusPlus::Snapshot &snapshot) : _symbol(symbol) , _snapshot(snapshot) , _dependencies(QString::fromUtf8(symbol->fileName(), symbol->fileNameLength())) { - DependencyTable dependencyTable; + CPlusPlus::DependencyTable dependencyTable; dependencyTable.build(_snapshot); _dependencies.append(dependencyTable.filesDependingOn(_dependencies.first())); } @@ -170,17 +172,17 @@ TypeHierarchy TypeHierarchyBuilder::buildDerivedTypeHierarchy() void TypeHierarchyBuilder::buildDerived(TypeHierarchy *typeHierarchy) { - Symbol *symbol = typeHierarchy->_symbol; + CPlusPlus::Symbol *symbol = typeHierarchy->_symbol; if (_visited.contains(symbol)) return; _visited.insert(symbol); - const QString &symbolName = _overview.prettyName(LookupContext::fullyQualifiedName(symbol)); + const QString &symbolName = _overview.prettyName(CPlusPlus::LookupContext::fullyQualifiedName(symbol)); DerivedHierarchyVisitor visitor(symbolName); foreach (const QString &fileName, _dependencies) { - Document::Ptr doc = _snapshot.document(fileName); + CPlusPlus::Document::Ptr doc = _snapshot.document(fileName); if ((_candidates.contains(fileName) && !_candidates.value(fileName).contains(symbolName)) || !doc->control()->findIdentifier(symbol->identifier()->chars(), symbol->identifier()->size())) { @@ -193,7 +195,7 @@ void TypeHierarchyBuilder::buildDerived(TypeHierarchy *typeHierarchy) foreach (const QString &candidate, visitor.otherBases()) _candidates[fileName].insert(candidate); - foreach (Symbol *s, visitor.derived()) { + foreach (CPlusPlus::Symbol *s, visitor.derived()) { TypeHierarchy derivedHierarchy(s); buildDerived(&derivedHierarchy); typeHierarchy->_hierarchy.append(derivedHierarchy); diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.h b/src/plugins/cpptools/TypeHierarchyBuilder.h index 8f44e049c9..2357487b0f 100644 --- a/src/plugins/cpptools/TypeHierarchyBuilder.h +++ b/src/plugins/cpptools/TypeHierarchyBuilder.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef TYPEHIERARCHYBUILDER_H -#define TYPEHIERARCHYBUILDER_H +#ifndef CPPTOOLS_TYPEHIERARCHYBUILDER_H +#define CPPTOOLS_TYPEHIERARCHYBUILDER_H #include "cpptools_global.h" #include "ModelManagerInterface.h" @@ -40,7 +40,7 @@ #include <QStringList> #include <QSet> -namespace CPlusPlus { +namespace CppTools { class CPPTOOLS_EXPORT TypeHierarchy { @@ -48,20 +48,20 @@ class CPPTOOLS_EXPORT TypeHierarchy public: TypeHierarchy(); - TypeHierarchy(Symbol *symbol); + TypeHierarchy(CPlusPlus::Symbol *symbol); - Symbol *symbol() const; + CPlusPlus::Symbol *symbol() const; const QList<TypeHierarchy> &hierarchy() const; private: - Symbol *_symbol; + CPlusPlus::Symbol *_symbol; QList<TypeHierarchy> _hierarchy; }; class CPPTOOLS_EXPORT TypeHierarchyBuilder { public: - TypeHierarchyBuilder(Symbol *symbol, const Snapshot &snapshot); + TypeHierarchyBuilder(CPlusPlus::Symbol *symbol, const CPlusPlus::Snapshot &snapshot); TypeHierarchy buildDerivedTypeHierarchy(); @@ -69,14 +69,14 @@ private: void reset(); void buildDerived(TypeHierarchy *typeHierarchy); - Symbol *_symbol; - Snapshot _snapshot; + CPlusPlus::Symbol *_symbol; + CPlusPlus::Snapshot _snapshot; QStringList _dependencies; - QSet<Symbol *> _visited; + QSet<CPlusPlus::Symbol *> _visited; QHash<QString, QSet<QString> > _candidates; - Overview _overview; + CPlusPlus::Overview _overview; }; -} // CPlusPlus +} // CppTools -#endif // TYPEHIERARCHYBUILDER_H +#endif // CPPTOOLS_TYPEHIERARCHYBUILDER_H diff --git a/src/plugins/cpptools/abstracteditorsupport.cpp b/src/plugins/cpptools/abstracteditorsupport.cpp index a1e910b802..6c493247c3 100644 --- a/src/plugins/cpptools/abstracteditorsupport.cpp +++ b/src/plugins/cpptools/abstracteditorsupport.cpp @@ -45,8 +45,6 @@ #include <QDebug> -using namespace CPlusPlus; - namespace CppTools { AbstractEditorSupport::AbstractEditorSupport(CppModelManagerInterface *modelmanager) : @@ -97,5 +95,6 @@ QString AbstractEditorSupport::licenseTemplate(const QString &file, const QStrin { return Internal::CppFileSettings::licenseTemplate(file, className); } -} + +} // namespace CppTools 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 diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp index 5f8659c210..696ba8c301 100644 --- a/src/plugins/cpptools/builtinindexingsupport.cpp +++ b/src/plugins/cpptools/builtinindexingsupport.cpp @@ -54,7 +54,7 @@ static void parse(QFutureInterface<void> &future, future.setProgressRange(0, files.size()); - const QString conf = CPlusPlus::CppModelManagerInterface::configurationFileName(); + const QString conf = CppModelManagerInterface::configurationFileName(); bool processingHeaders = false; for (int i = 0; i < files.size(); ++i) { diff --git a/src/plugins/cpptools/builtinindexingsupport.h b/src/plugins/cpptools/builtinindexingsupport.h index f96168df53..8bd3b2ad69 100644 --- a/src/plugins/cpptools/builtinindexingsupport.h +++ b/src/plugins/cpptools/builtinindexingsupport.h @@ -40,7 +40,7 @@ namespace Internal { class BuiltinIndexingSupport: public CppIndexingSupport { public: - typedef CPlusPlus::CppModelManagerInterface::WorkingCopy WorkingCopy; + typedef CppModelManagerInterface::WorkingCopy WorkingCopy; public: BuiltinIndexingSupport(); diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h index b1af819730..823e805b9f 100644 --- a/src/plugins/cpptools/cppchecksymbols.h +++ b/src/plugins/cpptools/cppchecksymbols.h @@ -44,10 +44,10 @@ #include <QFuture> #include <QtConcurrentRun> -namespace CPlusPlus { +namespace CppTools { class CPPTOOLS_EXPORT CheckSymbols: - protected ASTVisitor, + protected CPlusPlus::ASTVisitor, public QRunnable, public QFutureInterface<TextEditor::SemanticHighlighter::Result> { @@ -70,7 +70,9 @@ public: return future; } - static Future go(Document::Ptr doc, const LookupContext &context, const QList<Use> ¯oUses); + static Future go(CPlusPlus::Document::Ptr doc, + const CPlusPlus::LookupContext &context, + const QList<Use> ¯oUses); static QMap<int, QVector<Use> > chunks(const QFuture<Use> &future, int from, int to) { @@ -92,93 +94,98 @@ protected: using ASTVisitor::visit; using ASTVisitor::endVisit; - CheckSymbols(Document::Ptr doc, const LookupContext &context, const QList<Use> ¯oUses); + CheckSymbols(CPlusPlus::Document::Ptr doc, + const CPlusPlus::LookupContext &context, + const QList<Use> ¯oUses); - bool hasVirtualDestructor(Class *klass) const; - bool hasVirtualDestructor(ClassOrNamespace *binding) const; + bool hasVirtualDestructor(CPlusPlus::Class *klass) const; + bool hasVirtualDestructor(CPlusPlus::ClassOrNamespace *binding) const; bool warning(unsigned line, unsigned column, const QString &text, unsigned length = 0); - bool warning(AST *ast, const QString &text); + bool warning(CPlusPlus::AST *ast, const QString &text); - QByteArray textOf(AST *ast) const; + QByteArray textOf(CPlusPlus::AST *ast) const; - bool maybeType(const Name *name) const; - bool maybeField(const Name *name) const; - bool maybeStatic(const Name *name) const; - bool maybeFunction(const Name *name) const; + bool maybeType(const CPlusPlus::Name *name) const; + bool maybeField(const CPlusPlus::Name *name) const; + bool maybeStatic(const CPlusPlus::Name *name) const; + bool maybeFunction(const CPlusPlus::Name *name) const; - void checkNamespace(NameAST *name); - void checkName(NameAST *ast, Scope *scope = 0); - ClassOrNamespace *checkNestedName(QualifiedNameAST *ast); + void checkNamespace(CPlusPlus::NameAST *name); + void checkName(CPlusPlus::NameAST *ast, CPlusPlus::Scope *scope = 0); + CPlusPlus::ClassOrNamespace *checkNestedName(CPlusPlus::QualifiedNameAST *ast); void addUse(const Use &use); void addUse(unsigned tokenIndex, UseKind kind); - void addUse(NameAST *name, UseKind kind); + void addUse(CPlusPlus::NameAST *name, UseKind kind); - void addType(ClassOrNamespace *b, NameAST *ast); + void addType(CPlusPlus::ClassOrNamespace *b, CPlusPlus::NameAST *ast); - bool maybeAddTypeOrStatic(const QList<LookupItem> &candidates, NameAST *ast); - bool maybeAddField(const QList<LookupItem> &candidates, NameAST *ast); - bool maybeAddFunction(const QList<LookupItem> &candidates, NameAST *ast, unsigned argumentCount); + bool maybeAddTypeOrStatic(const QList<CPlusPlus::LookupItem> &candidates, + CPlusPlus::NameAST *ast); + bool maybeAddField(const QList<CPlusPlus::LookupItem> &candidates, + CPlusPlus::NameAST *ast); + bool maybeAddFunction(const QList<CPlusPlus::LookupItem> &candidates, + CPlusPlus::NameAST *ast, unsigned argumentCount); - bool isTemplateClass(Symbol *s) const; + bool isTemplateClass(CPlusPlus::Symbol *s) const; - Scope *enclosingScope() const; - FunctionDefinitionAST *enclosingFunctionDefinition(bool skipTopOfStack = false) const; - TemplateDeclarationAST *enclosingTemplateDeclaration() const; + CPlusPlus::Scope *enclosingScope() const; + CPlusPlus::FunctionDefinitionAST *enclosingFunctionDefinition(bool skipTopOfStack = false) const; + CPlusPlus::TemplateDeclarationAST *enclosingTemplateDeclaration() const; - virtual bool preVisit(AST *); - virtual void postVisit(AST *); + virtual bool preVisit(CPlusPlus::AST *); + virtual void postVisit(CPlusPlus::AST *); - virtual bool visit(NamespaceAST *); - virtual bool visit(UsingDirectiveAST *); - virtual bool visit(SimpleDeclarationAST *); - virtual bool visit(TypenameTypeParameterAST *ast); - virtual bool visit(TemplateTypeParameterAST *ast); - virtual bool visit(FunctionDefinitionAST *ast); - virtual bool visit(ParameterDeclarationAST *ast); + virtual bool visit(CPlusPlus::NamespaceAST *); + virtual bool visit(CPlusPlus::UsingDirectiveAST *); + virtual bool visit(CPlusPlus::SimpleDeclarationAST *); + virtual bool visit(CPlusPlus::TypenameTypeParameterAST *ast); + virtual bool visit(CPlusPlus::TemplateTypeParameterAST *ast); + virtual bool visit(CPlusPlus::FunctionDefinitionAST *ast); + virtual bool visit(CPlusPlus::ParameterDeclarationAST *ast); - virtual bool visit(ElaboratedTypeSpecifierAST *ast); + virtual bool visit(CPlusPlus::ElaboratedTypeSpecifierAST *ast); - virtual bool visit(SimpleNameAST *ast); - virtual bool visit(DestructorNameAST *ast); - virtual bool visit(QualifiedNameAST *ast); - virtual bool visit(TemplateIdAST *ast); + virtual bool visit(CPlusPlus::SimpleNameAST *ast); + virtual bool visit(CPlusPlus::DestructorNameAST *ast); + virtual bool visit(CPlusPlus::QualifiedNameAST *ast); + virtual bool visit(CPlusPlus::TemplateIdAST *ast); - virtual bool visit(MemberAccessAST *ast); - virtual bool visit(CallAST *ast); - virtual bool visit(NewExpressionAST *ast); + virtual bool visit(CPlusPlus::MemberAccessAST *ast); + virtual bool visit(CPlusPlus::CallAST *ast); + virtual bool visit(CPlusPlus::NewExpressionAST *ast); - virtual bool visit(GotoStatementAST *ast); - virtual bool visit(LabeledStatementAST *ast); - virtual bool visit(SimpleSpecifierAST *ast); - virtual bool visit(ClassSpecifierAST *ast); + virtual bool visit(CPlusPlus::GotoStatementAST *ast); + virtual bool visit(CPlusPlus::LabeledStatementAST *ast); + virtual bool visit(CPlusPlus::SimpleSpecifierAST *ast); + virtual bool visit(CPlusPlus::ClassSpecifierAST *ast); - virtual bool visit(MemInitializerAST *ast); - virtual bool visit(EnumeratorAST *ast); + virtual bool visit(CPlusPlus::MemInitializerAST *ast); + virtual bool visit(CPlusPlus::EnumeratorAST *ast); - NameAST *declaratorId(DeclaratorAST *ast) const; + CPlusPlus::NameAST *declaratorId(CPlusPlus::DeclaratorAST *ast) const; - static unsigned referenceToken(NameAST *name); + static unsigned referenceToken(CPlusPlus::NameAST *name); void flush(); private: - Document::Ptr _doc; - LookupContext _context; - TypeOfExpression typeOfExpression; + CPlusPlus::Document::Ptr _doc; + CPlusPlus::LookupContext _context; + CPlusPlus::TypeOfExpression typeOfExpression; QString _fileName; QSet<QByteArray> _potentialTypes; QSet<QByteArray> _potentialFields; QSet<QByteArray> _potentialFunctions; QSet<QByteArray> _potentialStatics; - QList<AST *> _astStack; + QList<CPlusPlus::AST *> _astStack; QVector<Use> _usages; int _chunkSize; unsigned _lineOfLastUsage; QList<Use> _macroUses; }; -} // namespace CPlusPlus +} // namespace CppTools #endif // CPLUSPLUSCHECKSYMBOLS_H diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h index 428c5e6ebd..47009488bd 100644 --- a/src/plugins/cpptools/cppcompletionassist.h +++ b/src/plugins/cpptools/cppcompletionassist.h @@ -60,7 +60,7 @@ class LookupItem; class ClassOrNamespace; class Function; class LookupContext; -} +} // namespace CPlusPlus namespace CppTools { namespace Internal { diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index a175d207a7..10f87b0afb 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -70,6 +70,7 @@ #include <functional> using namespace CppTools::Internal; +using namespace CppTools; using namespace CPlusPlus; static QString getSource(const QString &fileName, diff --git a/src/plugins/cpptools/cppfindreferences.h b/src/plugins/cpptools/cppfindreferences.h index 200dc616bd..4fa992c8c2 100644 --- a/src/plugins/cpptools/cppfindreferences.h +++ b/src/plugins/cpptools/cppfindreferences.h @@ -50,11 +50,9 @@ namespace Find { class SearchResult; } // namespace Find -namespace CPlusPlus { +namespace CppTools { class CppModelManagerInterface; -} -namespace CppTools { namespace Internal { class CppFindReferencesParameters @@ -69,7 +67,7 @@ class CppFindReferences: public QObject Q_OBJECT public: - CppFindReferences(CPlusPlus::CppModelManagerInterface *modelManager); + CppFindReferences(CppModelManagerInterface *modelManager); virtual ~CppFindReferences(); QList<int> references(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context) const; @@ -106,7 +104,7 @@ private: const CPlusPlus::Snapshot &snapshot); private: - QPointer<CPlusPlus::CppModelManagerInterface> _modelManager; + QPointer<CppModelManagerInterface> _modelManager; QMap<QFutureWatcher<CPlusPlus::Usage> *, QPointer<Find::SearchResult> > m_watchers; mutable QMutex m_depsLock; diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 5176c95069..efe7a91f1a 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -86,7 +86,7 @@ #include <iostream> #include <sstream> -namespace CPlusPlus { +namespace CppTools { uint qHash(const ProjectPart &p) { @@ -119,7 +119,7 @@ bool operator==(const ProjectPart &p1, return p1.frameworkPaths == p2.frameworkPaths; } -} // namespace CPlusPlus +} // namespace CppTools using namespace CppTools; using namespace CppTools::Internal; 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; diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 34cfd7dd86..fbaaeb9a5a 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -40,9 +40,9 @@ using namespace CppTools::Internal; typedef CPlusPlus::Document Document; -typedef CPlusPlus::CppModelManagerInterface::ProjectInfo ProjectInfo; -typedef CPlusPlus::ProjectPart ProjectPart; -typedef CPlusPlus::ProjectFile ProjectFile; +typedef CppTools::CppModelManagerInterface::ProjectInfo ProjectInfo; +typedef CppTools::ProjectPart ProjectPart; +typedef CppTools::ProjectFile ProjectFile; typedef ProjectExplorer::Project Project; namespace { diff --git a/src/plugins/cpptools/cppprojectfile.cpp b/src/plugins/cpptools/cppprojectfile.cpp index ed4a29a6f7..331b183c18 100644 --- a/src/plugins/cpptools/cppprojectfile.cpp +++ b/src/plugins/cpptools/cppprojectfile.cpp @@ -35,7 +35,7 @@ #include <QDebug> -namespace CPlusPlus { +namespace CppTools { ProjectFile::ProjectFile() : kind(CHeader) @@ -81,24 +81,24 @@ void ProjectFileAdder::addMapping(const char *mimeName, ProjectFile::Kind kind) m_mapping.append(Pair(mimeType, kind)); } -QDebug operator<<(QDebug stream, const CPlusPlus::ProjectFile &cxxFile) +QDebug operator<<(QDebug stream, const CppTools::ProjectFile &cxxFile) { const char *kind; switch (cxxFile.kind) { - case CPlusPlus::ProjectFile::CHeader: kind = "CHeader"; break; - case CPlusPlus::ProjectFile::CSource: kind = "CSource"; break; - case CPlusPlus::ProjectFile::CXXHeader: kind = "CXXHeader"; break; - case CPlusPlus::ProjectFile::CXXSource: kind = "CXXSource"; break; - case CPlusPlus::ProjectFile::ObjCHeader: kind = "ObjCHeader"; break; - case CPlusPlus::ProjectFile::ObjCSource: kind = "ObjCSource"; break; - case CPlusPlus::ProjectFile::ObjCXXHeader: kind = "ObjCXXHeader"; break; - case CPlusPlus::ProjectFile::ObjCXXSource: kind = "ObjCXXSource"; break; - case CPlusPlus::ProjectFile::CudaSource: kind = "CudaSource"; break; - case CPlusPlus::ProjectFile::OpenCLSource: kind = "OpenCLSource"; break; + case CppTools::ProjectFile::CHeader: kind = "CHeader"; break; + case CppTools::ProjectFile::CSource: kind = "CSource"; break; + case CppTools::ProjectFile::CXXHeader: kind = "CXXHeader"; break; + case CppTools::ProjectFile::CXXSource: kind = "CXXSource"; break; + case CppTools::ProjectFile::ObjCHeader: kind = "ObjCHeader"; break; + case CppTools::ProjectFile::ObjCSource: kind = "ObjCSource"; break; + case CppTools::ProjectFile::ObjCXXHeader: kind = "ObjCXXHeader"; break; + case CppTools::ProjectFile::ObjCXXSource: kind = "ObjCXXSource"; break; + case CppTools::ProjectFile::CudaSource: kind = "CudaSource"; break; + case CppTools::ProjectFile::OpenCLSource: kind = "OpenCLSource"; break; default: kind = "INVALID"; break; } stream << cxxFile.path << QLatin1String(", ") << kind; return stream; } -} // namespace CPlusPlus +} // namespace CppTools diff --git a/src/plugins/cpptools/cppprojectfile.h b/src/plugins/cpptools/cppprojectfile.h index b03db499d2..66393cd0e7 100644 --- a/src/plugins/cpptools/cppprojectfile.h +++ b/src/plugins/cpptools/cppprojectfile.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_CPPPROJECTFILE_H -#define CPLUSPLUS_CPPPROJECTFILE_H +#ifndef CPPTOOLS_CPPPROJECTFILE_H +#define CPPTOOLS_CPPPROJECTFILE_H #include "cpptools_global.h" @@ -37,7 +37,7 @@ #include <QString> #include <QMap> -namespace CPlusPlus { +namespace CppTools { class CPPTOOLS_EXPORT ProjectFile { @@ -81,8 +81,8 @@ private: QFileInfo m_fileInfo; }; -QDebug operator<<(QDebug stream, const CPlusPlus::ProjectFile &cxxFile); +QDebug operator<<(QDebug stream, const CppTools::ProjectFile &cxxFile); -} // namespace CPlusPlus +} // namespace CppTools -#endif // CPLUSPLUS_CPPPROJECTFILE_H +#endif // CPPTOOLS_CPPPROJECTFILE_H diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp index 9a51703695..3c411b7707 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.cpp +++ b/src/plugins/cpptools/cpprefactoringchanges.cpp @@ -87,9 +87,9 @@ public: m_modelManager->updateSourceFiles(QStringList(fileName)); } - CPlusPlus::Snapshot m_snapshot; - CPlusPlus::CppModelManagerInterface *m_modelManager; - CPlusPlus::CppModelManagerInterface::WorkingCopy m_workingCopy; + Snapshot m_snapshot; + CppModelManagerInterface *m_modelManager; + CppModelManagerInterface::WorkingCopy m_workingCopy; }; diff --git a/src/plugins/cpptools/cpptoolseditorsupport.h b/src/plugins/cpptools/cpptoolseditorsupport.h index 5d7e157e42..46dfc30012 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.h +++ b/src/plugins/cpptools/cpptoolseditorsupport.h @@ -43,13 +43,11 @@ QT_BEGIN_NAMESPACE class QTimer; QT_END_NAMESPACE -namespace CPlusPlus { - class AST; -} +namespace CPlusPlus { class AST; } namespace TextEditor { - class ITextEditor; - class ITextMark; +class ITextEditor; +class ITextMark; } // namespace TextEditor namespace CppTools { diff --git a/src/plugins/cpptools/cpptoolsreuse.h b/src/plugins/cpptools/cpptoolsreuse.h index d1eed216f9..062f1046d6 100644 --- a/src/plugins/cpptools/cpptoolsreuse.h +++ b/src/plugins/cpptools/cpptoolsreuse.h @@ -38,7 +38,7 @@ QT_FORWARD_DECLARE_CLASS(QStringRef) namespace CPlusPlus { class Symbol; class LookupContext; -} +} // namespace CPlusPlus namespace CppTools { diff --git a/src/plugins/cpptools/doxygengenerator.h b/src/plugins/cpptools/doxygengenerator.h index ae8cd5a149..032c18ae09 100644 --- a/src/plugins/cpptools/doxygengenerator.h +++ b/src/plugins/cpptools/doxygengenerator.h @@ -37,9 +37,7 @@ #include <QLatin1String> #include <QTextCursor> -namespace CPlusPlus { -class DeclarationAST; -} +namespace CPlusPlus { class DeclarationAST; } namespace CppTools { @@ -97,6 +95,6 @@ private: QString m_commentOffset; }; -} // CppTools +} // namespace CppTools #endif // DOXYGENGENERATOR_H diff --git a/src/plugins/cpptools/modelmanagertesthelper.h b/src/plugins/cpptools/modelmanagertesthelper.h index f51092859e..ade58b32f6 100644 --- a/src/plugins/cpptools/modelmanagertesthelper.h +++ b/src/plugins/cpptools/modelmanagertesthelper.h @@ -72,7 +72,7 @@ class ModelManagerTestHelper: public QObject Q_OBJECT public: - typedef CPlusPlus::CppModelManagerInterface::ProjectInfo ProjectInfo; + typedef CppModelManagerInterface::ProjectInfo ProjectInfo; typedef ProjectExplorer::Project Project; explicit ModelManagerTestHelper(QObject *parent = 0); diff --git a/src/plugins/cpptools/uicodecompletionsupport.h b/src/plugins/cpptools/uicodecompletionsupport.h index 10e0752b42..219e13bc94 100644 --- a/src/plugins/cpptools/uicodecompletionsupport.h +++ b/src/plugins/cpptools/uicodecompletionsupport.h @@ -43,7 +43,7 @@ namespace CppTools { class CPPTOOLS_EXPORT UiCodeModelSupport : public AbstractEditorSupport { public: - UiCodeModelSupport(CPlusPlus::CppModelManagerInterface *modelmanager, + UiCodeModelSupport(CppTools::CppModelManagerInterface *modelmanager, const QString &sourceFile, const QString &uiHeaderFile); ~UiCodeModelSupport(); |