diff options
author | hjk <qtc-committer@nokia.com> | 2011-02-04 09:52:39 +0100 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2011-02-04 12:45:32 +0100 |
commit | 57eae3191e51c11449366a7e39803ef28cc8aff5 (patch) | |
tree | 7912b9663afe332bbd84779de25a331bea41dcc7 /src/libs | |
parent | d87ce08880fb1158e3c4560609142d0a2768ab38 (diff) | |
download | qt-creator-57eae3191e51c11449366a7e39803ef28cc8aff5.tar.gz |
s:// end of namespace :// namespace :g for consistency
We use the latter style everywhere else to signify the end of a namespace block.
Diffstat (limited to 'src/libs')
36 files changed, 39 insertions, 39 deletions
diff --git a/src/libs/cplusplus/BackwardsScanner.h b/src/libs/cplusplus/BackwardsScanner.h index 4e1c569d43..fae97e719a 100644 --- a/src/libs/cplusplus/BackwardsScanner.h +++ b/src/libs/cplusplus/BackwardsScanner.h @@ -90,6 +90,6 @@ private: int _startToken; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_BACKWARDSSCANNER_H diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h index 466e27f61b..d7171e9757 100644 --- a/src/libs/cplusplus/CppDocument.h +++ b/src/libs/cplusplus/CppDocument.h @@ -397,6 +397,6 @@ private: _Base _documents; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_CPPDOCUMENT_H diff --git a/src/libs/cplusplus/CppRewriter.h b/src/libs/cplusplus/CppRewriter.h index 0847352f5b..b76470daf4 100644 --- a/src/libs/cplusplus/CppRewriter.h +++ b/src/libs/cplusplus/CppRewriter.h @@ -113,6 +113,6 @@ CPLUSPLUS_EXPORT const Name *rewriteName(const Name *name, // 'std::string'. CPLUSPLUS_EXPORT QString simplifySTLType(const QString &typeIn); -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h index 49b28c6992..817391a3ab 100644 --- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h +++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h @@ -62,6 +62,6 @@ private: const Substitution _substitution; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H diff --git a/src/libs/cplusplus/FastPreprocessor.h b/src/libs/cplusplus/FastPreprocessor.h index c38e339d37..d9d2064c35 100644 --- a/src/libs/cplusplus/FastPreprocessor.h +++ b/src/libs/cplusplus/FastPreprocessor.h @@ -79,6 +79,6 @@ public: virtual void stopSkippingBlocks(unsigned) {} }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_FASTPREPROCESSOR_H diff --git a/src/libs/cplusplus/FindUsages.h b/src/libs/cplusplus/FindUsages.h index 7bf87a7c03..3177ddc37b 100644 --- a/src/libs/cplusplus/FindUsages.h +++ b/src/libs/cplusplus/FindUsages.h @@ -304,7 +304,7 @@ private: Scope *_currentScope; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_FINDUSAGES_H diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h index 317cdc9d33..3a26b521e0 100644 --- a/src/libs/cplusplus/LookupContext.h +++ b/src/libs/cplusplus/LookupContext.h @@ -252,6 +252,6 @@ private: QSharedPointer<Control> _control; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_LOOKUPCONTEXT_H diff --git a/src/libs/cplusplus/LookupItem.h b/src/libs/cplusplus/LookupItem.h index 68747a1380..c67cfcc6b8 100644 --- a/src/libs/cplusplus/LookupItem.h +++ b/src/libs/cplusplus/LookupItem.h @@ -80,7 +80,7 @@ private: uint qHash(const CPlusPlus::LookupItem &result); -} // end of namespace CPlusPlus +} // namespace CPlusPlus #if defined(Q_CC_MSVC) && _MSC_VER <= 1300 //this ensures that code outside QmlJS can use the hash function diff --git a/src/libs/cplusplus/MatchingText.h b/src/libs/cplusplus/MatchingText.h index a159ddcb9f..df48293144 100644 --- a/src/libs/cplusplus/MatchingText.h +++ b/src/libs/cplusplus/MatchingText.h @@ -57,6 +57,6 @@ private: bool shouldInsertNewline(const QTextCursor &tc) const; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // MATCHINGTEXT_H diff --git a/src/libs/cplusplus/NamePrettyPrinter.h b/src/libs/cplusplus/NamePrettyPrinter.h index ce3647b6a9..e1ff807473 100644 --- a/src/libs/cplusplus/NamePrettyPrinter.h +++ b/src/libs/cplusplus/NamePrettyPrinter.h @@ -66,6 +66,6 @@ private: QString _name; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_NAMEPRETTYPRINTER_H diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h index f48a571466..e8aa9cb78b 100644 --- a/src/libs/cplusplus/Overview.h +++ b/src/libs/cplusplus/Overview.h @@ -100,6 +100,6 @@ private: bool _showTemplateParameters: 1; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_OVERVIEW_H diff --git a/src/libs/cplusplus/OverviewModel.h b/src/libs/cplusplus/OverviewModel.h index 43cd50b1f5..ef4ad021bc 100644 --- a/src/libs/cplusplus/OverviewModel.h +++ b/src/libs/cplusplus/OverviewModel.h @@ -79,6 +79,6 @@ private: Icons _icons; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_OVERVIEWMODEL_H diff --git a/src/libs/cplusplus/ResolveExpression.h b/src/libs/cplusplus/ResolveExpression.h index ced9322f8b..aeb3715ff5 100644 --- a/src/libs/cplusplus/ResolveExpression.h +++ b/src/libs/cplusplus/ResolveExpression.h @@ -128,6 +128,6 @@ private: bool _reference; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_RESOLVEEXPRESSION_H diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h index 468ba0d890..35bad251de 100644 --- a/src/libs/cplusplus/SimpleLexer.h +++ b/src/libs/cplusplus/SimpleLexer.h @@ -81,6 +81,6 @@ private: bool _endedJoined: 1; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_SIMPLELEXER_H diff --git a/src/libs/cplusplus/SnapshotSymbolVisitor.h b/src/libs/cplusplus/SnapshotSymbolVisitor.h index cc4240004b..76dcb4686b 100644 --- a/src/libs/cplusplus/SnapshotSymbolVisitor.h +++ b/src/libs/cplusplus/SnapshotSymbolVisitor.h @@ -56,6 +56,6 @@ private: Document::Ptr _document; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_SNAPSHOTSYMBOLVISITOR_H diff --git a/src/libs/cplusplus/SymbolNameVisitor.h b/src/libs/cplusplus/SymbolNameVisitor.h index dc6284974c..ccae215a90 100644 --- a/src/libs/cplusplus/SymbolNameVisitor.h +++ b/src/libs/cplusplus/SymbolNameVisitor.h @@ -51,6 +51,6 @@ private: Symbol *_symbol; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_SYMBOLNAMEVISITOR_H diff --git a/src/libs/cplusplus/TypePrettyPrinter.h b/src/libs/cplusplus/TypePrettyPrinter.h index 3ea1fde982..bc918670ea 100644 --- a/src/libs/cplusplus/TypePrettyPrinter.h +++ b/src/libs/cplusplus/TypePrettyPrinter.h @@ -89,6 +89,6 @@ private: bool _needsParens; }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus #endif // CPLUSPLUS_TYPEPRETTYPRINTER_H diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 87a32b05f2..eaec1a65b9 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -133,7 +133,7 @@ struct Value #undef PP_DEFINE_BIN_OP }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus using namespace CPlusPlus; diff --git a/src/libs/cplusplus/pp-macro-expander.cpp b/src/libs/cplusplus/pp-macro-expander.cpp index 956b647a58..2b729d51b5 100644 --- a/src/libs/cplusplus/pp-macro-expander.cpp +++ b/src/libs/cplusplus/pp-macro-expander.cpp @@ -53,7 +53,7 @@ struct pp_frame }; -} // end of namespace CPlusPlus +} // namespace CPlusPlus using namespace CPlusPlus; diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g index 6c13b33071..d26d145c0b 100644 --- a/src/libs/glsl/glsl.g +++ b/src/libs/glsl/glsl.g @@ -418,7 +418,7 @@ private: std::vector<Token> _tokens; }; -} // end of namespace GLSL +} // namespace GLSL :/ /. diff --git a/src/libs/glsl/glsllexer.h b/src/libs/glsl/glsllexer.h index 25e9cc3c1a..cbb88058b3 100644 --- a/src/libs/glsl/glsllexer.h +++ b/src/libs/glsl/glsllexer.h @@ -136,6 +136,6 @@ private: Value _yyval; }; -} // end of namespace GLSL +} // namespace GLSL #endif // GLSLLEXER_H diff --git a/src/libs/glsl/glslmemorypool.h b/src/libs/glsl/glslmemorypool.h index 8ed66b8e89..6b091aa291 100644 --- a/src/libs/glsl/glslmemorypool.h +++ b/src/libs/glsl/glslmemorypool.h @@ -108,7 +108,7 @@ public: void operator delete(void *, MemoryPool *); }; -} // end of namespace GLSL +} // namespace GLSL #endif // GLSLMEMORYPOOL_H diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h index fdfbc6b92e..c2dc93d6af 100644 --- a/src/libs/glsl/glslparser.h +++ b/src/libs/glsl/glslparser.h @@ -208,4 +208,4 @@ private: std::vector<Token> _tokens; }; -} // end of namespace GLSL +} // namespace GLSL diff --git a/src/libs/glsl/glslsymbol.h b/src/libs/glsl/glslsymbol.h index b3d6d57241..99c3d39891 100644 --- a/src/libs/glsl/glslsymbol.h +++ b/src/libs/glsl/glslsymbol.h @@ -84,6 +84,6 @@ public: virtual Scope *asScope() { return this; } }; -} // end of namespace GLSL +} // namespace GLSL #endif // GLSLSYMBOL_H diff --git a/src/libs/glsl/glslsymbols.h b/src/libs/glsl/glslsymbols.h index 83ebb5de89..05124f3042 100644 --- a/src/libs/glsl/glslsymbols.h +++ b/src/libs/glsl/glslsymbols.h @@ -109,6 +109,6 @@ private: QVector<OverloadSet *> _overloadSets; }; -} // end of namespace GLSL +} // namespace GLSL #endif // GLSLSYMBOLS_H diff --git a/src/libs/glsl/glsltype.h b/src/libs/glsl/glsltype.h index bc79e5ef69..ccc27171e5 100644 --- a/src/libs/glsl/glsltype.h +++ b/src/libs/glsl/glsltype.h @@ -66,6 +66,6 @@ public: virtual bool isLessThan(const Type *other) const = 0; }; -} // end of namespace GLSL +} // namespace GLSL #endif // GLSLTYPE_H diff --git a/src/libs/glsl/glsltypes.h b/src/libs/glsl/glsltypes.h index 862c0b5e8a..b83800f837 100644 --- a/src/libs/glsl/glsltypes.h +++ b/src/libs/glsl/glsltypes.h @@ -296,6 +296,6 @@ private: QVector<Function *> _functions; }; -} // end of namespace GLSL +} // namespace GLSL #endif // GLSLTYPES_H diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g index af1c046a90..89fabc36ac 100644 --- a/src/libs/qmljs/parser/qmljs.g +++ b/src/libs/qmljs/parser/qmljs.g @@ -367,7 +367,7 @@ protected: QList<DiagnosticMessage> diagnostic_messages; }; -} // end of namespace QmlJS +} // namespace QmlJS :/ diff --git a/src/libs/qmljs/parser/qmljsengine_p.cpp b/src/libs/qmljs/parser/qmljsengine_p.cpp index 4dd581cd0f..9f26bb32c9 100644 --- a/src/libs/qmljs/parser/qmljsengine_p.cpp +++ b/src/libs/qmljs/parser/qmljsengine_p.cpp @@ -207,6 +207,6 @@ void Engine::setNodePool(NodePool *nodePool) -} // end of namespace QmlJS +} // namespace QmlJS QT_QML_END_NAMESPACE diff --git a/src/libs/qmljs/parser/qmljsengine_p.h b/src/libs/qmljs/parser/qmljsengine_p.h index f0251e12f5..d7a9ae262c 100644 --- a/src/libs/qmljs/parser/qmljsengine_p.h +++ b/src/libs/qmljs/parser/qmljsengine_p.h @@ -86,7 +86,7 @@ public: uint qHash(const QmlJS::NameId &id); -} // end of namespace QmlJS +} // namespace QmlJS #if defined(Q_CC_MSVC) && _MSC_VER <= 1300 //this ensures that code outside QmlJS can use the hash function @@ -115,7 +115,7 @@ public: static QString flagsToString(int flags); }; -} // end of namespace Ecma +} // namespace Ecma class QML_PARSER_EXPORT DiagnosticMessage { @@ -166,7 +166,7 @@ public: void setNodePool(NodePool *nodePool); }; -} // end of namespace QmlJS +} // namespace QmlJS QT_QML_END_NAMESPACE diff --git a/src/libs/qmljs/parser/qmljsparser_p.h b/src/libs/qmljs/parser/qmljsparser_p.h index bd9db581e9..cf75e05dbc 100644 --- a/src/libs/qmljs/parser/qmljsparser_p.h +++ b/src/libs/qmljs/parser/qmljsparser_p.h @@ -231,7 +231,7 @@ protected: QList<DiagnosticMessage> diagnostic_messages; }; -} // end of namespace QmlJS +} // namespace QmlJS diff --git a/src/libs/qmljs/qmljsbind.h b/src/libs/qmljs/qmljsbind.h index a64e3ef329..155a71d52f 100644 --- a/src/libs/qmljs/qmljsbind.h +++ b/src/libs/qmljs/qmljsbind.h @@ -112,6 +112,6 @@ private: QList<DiagnosticMessage> *_diagnosticMessages; }; -} // end of namespace Qml +} // namespace Qml #endif // QMLBIND_H diff --git a/src/libs/qmljs/qmljsevaluate.h b/src/libs/qmljs/qmljsevaluate.h index ac0efbb33c..0b2411b0e2 100644 --- a/src/libs/qmljs/qmljsevaluate.h +++ b/src/libs/qmljs/qmljsevaluate.h @@ -45,7 +45,7 @@ namespace Interpreter { class Value; class ObjectValue; class FunctionValue; -} // end of namespace Interpreter +} // namespace Interpreter class QMLJS_EXPORT Evaluate: protected AST::Visitor { @@ -165,6 +165,6 @@ private: const Interpreter::Value *_result; }; -} // end of namespace Qml +} // namespace Qml #endif // QMLCheck_H diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index 654c481925..d80ecddd61 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -1018,6 +1018,6 @@ public: ImportInfo importInfo(const QString &name, const Context *context) const; }; -} } // end of namespace QmlJS::Interpreter +} } // namespace QmlJS::Interpreter #endif // QMLJS_INTERPRETER_H diff --git a/src/libs/qmljs/qmljslookupcontext.h b/src/libs/qmljs/qmljslookupcontext.h index 9052213e34..3b91d3c2cd 100644 --- a/src/libs/qmljs/qmljslookupcontext.h +++ b/src/libs/qmljs/qmljslookupcontext.h @@ -82,7 +82,7 @@ private: QScopedPointer<LookupContextData> d; }; -} // end of namespace QmlJS +} // namespace QmlJS #endif // QMLJSLOOKUPCONTEXT_H diff --git a/src/libs/utils/uncommentselection.h b/src/libs/utils/uncommentselection.h index 0fbaddd419..bce1c3658b 100644 --- a/src/libs/utils/uncommentselection.h +++ b/src/libs/utils/uncommentselection.h @@ -75,6 +75,6 @@ QTCREATOR_UTILS_EXPORT void unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &definiton = CommentDefinition()); -} // end of namespace Utils +} // namespace Utils #endif // UNCOMMENTSELECTION_H |