s:// end of namespace :// namespace :g for consistency

We use the latter style everywhere else to signify the end of a namespace block.

src/libs/cplusplus/BackwardsScanner.h

@@ -90,6 +90,6 @@ private:
     int _startToken;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_BACKWARDSSCANNER_H

src/libs/cplusplus/CppDocument.h

@@ -397,6 +397,6 @@ private:
     _Base _documents;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_CPPDOCUMENT_H

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

src/libs/cplusplus/DeprecatedGenTemplateInstance.h

@@ -62,6 +62,6 @@ private:
     const Substitution _substitution;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H

src/libs/cplusplus/FastPreprocessor.h

@@ -79,6 +79,6 @@ public:
     virtual void stopSkippingBlocks(unsigned) {}
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_FASTPREPROCESSOR_H

src/libs/cplusplus/FindUsages.h

@@ -304,7 +304,7 @@ private:
     Scope *_currentScope;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_FINDUSAGES_H
 

src/libs/cplusplus/LookupContext.h

@@ -252,6 +252,6 @@ private:
     QSharedPointer<Control> _control;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_LOOKUPCONTEXT_H

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

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

src/libs/cplusplus/NamePrettyPrinter.h

@@ -66,6 +66,6 @@ private:
     QString _name;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_NAMEPRETTYPRINTER_H

src/libs/cplusplus/Overview.h

@@ -100,6 +100,6 @@ private:
     bool _showTemplateParameters: 1;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_OVERVIEW_H

src/libs/cplusplus/OverviewModel.h

@@ -79,6 +79,6 @@ private:
     Icons _icons;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_OVERVIEWMODEL_H

src/libs/cplusplus/ResolveExpression.h

@@ -128,6 +128,6 @@ private:
     bool _reference;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_RESOLVEEXPRESSION_H

src/libs/cplusplus/SimpleLexer.h

@@ -81,6 +81,6 @@ private:
     bool _endedJoined: 1;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_SIMPLELEXER_H

src/libs/cplusplus/SnapshotSymbolVisitor.h

@@ -56,6 +56,6 @@ private:
     Document::Ptr _document;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_SNAPSHOTSYMBOLVISITOR_H

src/libs/cplusplus/SymbolNameVisitor.h

@@ -51,6 +51,6 @@ private:
     Symbol *_symbol;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_SYMBOLNAMEVISITOR_H

src/libs/cplusplus/TypePrettyPrinter.h

@@ -89,6 +89,6 @@ private:
     bool _needsParens;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_TYPEPRETTYPRINTER_H

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;

src/libs/cplusplus/pp-macro-expander.cpp

@@ -53,7 +53,7 @@ struct pp_frame
 };
 
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 using namespace CPlusPlus;
 

src/libs/glsl/glsl.g

@@ -418,7 +418,7 @@ private:
     std::vector<Token> _tokens;
 };
 
-} // end of namespace GLSL
+} // namespace GLSL
 :/
 
 /.

src/libs/glsl/glsllexer.h

@@ -136,6 +136,6 @@ private:
     Value _yyval;
 };
 
-} // end of namespace GLSL
+} // namespace GLSL
 
 #endif // GLSLLEXER_H

src/libs/glsl/glslmemorypool.h

@@ -108,7 +108,7 @@ public:
     void operator delete(void *, MemoryPool *);
 };
 
-} // end of namespace GLSL
+} // namespace GLSL
 
 
 #endif // GLSLMEMORYPOOL_H

src/libs/glsl/glslparser.h

@@ -208,4 +208,4 @@ private:
     std::vector<Token> _tokens;
 };
 
-} // end of namespace GLSL
+} // namespace GLSL

src/libs/glsl/glslsymbol.h

@@ -84,6 +84,6 @@ public:
     virtual Scope *asScope() { return this; }
 };
 
-} // end of namespace GLSL
+} // namespace GLSL
 
 #endif // GLSLSYMBOL_H

src/libs/glsl/glslsymbols.h

@@ -109,6 +109,6 @@ private:
     QVector<OverloadSet *> _overloadSets;
 };
 
-} // end of namespace GLSL
+} // namespace GLSL
 
 #endif // GLSLSYMBOLS_H

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

src/libs/glsl/glsltypes.h

@@ -296,6 +296,6 @@ private:
     QVector<Function *> _functions;
 };
 
-} // end of namespace GLSL
+} // namespace GLSL
 
 #endif // GLSLTYPES_H

src/libs/qmljs/parser/qmljs.g

@@ -367,7 +367,7 @@ protected:
     QList<DiagnosticMessage> diagnostic_messages;
 };
 
-} // end of namespace QmlJS
+} // namespace QmlJS
 
 
 :/

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

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
 

src/libs/qmljs/parser/qmljsparser_p.h

@@ -231,7 +231,7 @@ protected:
     QList<DiagnosticMessage> diagnostic_messages;
 };
 
-} // end of namespace QmlJS
+} // namespace QmlJS
 
 
 

src/libs/qmljs/qmljsbind.h

@@ -112,6 +112,6 @@ private:
     QList<DiagnosticMessage> *_diagnosticMessages;
 };
 
-} // end of namespace Qml
+} // namespace Qml
 
 #endif // QMLBIND_H

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

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

src/libs/qmljs/qmljslookupcontext.h

@@ -82,7 +82,7 @@ private:
     QScopedPointer<LookupContextData> d;
 };
 
-} // end of namespace QmlJS
+} // namespace QmlJS
 
 #endif // QMLJSLOOKUPCONTEXT_H
 

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

src/plugins/cppeditor/cppchecksymbols.h

@@ -172,6 +172,6 @@ private:
     unsigned _flushLine;
 };
 
-} // end of namespace CPlusPlus
+} // namespace CPlusPlus
 
 #endif // CPLUSPLUS_CHECKSYMBOLS_H

src/plugins/cppeditor/cppquickfix.h

@@ -45,7 +45,7 @@ namespace CppTools {
     class CppModelManagerInterface;
     class CppRefactoringFile;
     class CppRefactoringChanges;
-} // end of namespace CppTools
+} // namespace CppTools
 
 namespace ExtensionSystem {
 class IPlugin;
@@ -55,7 +55,7 @@ namespace CppEditor {
 
 namespace Internal {
 class CppQuickFixCollector;
-} // end of namespace Internal
+} // namespace Internal
 
 class CPPEDITOR_EXPORT CppQuickFixState: public TextEditor::QuickFixState
 {

src/plugins/cppeditor/cppsemanticinfo.h

@@ -80,7 +80,7 @@ public:
     QList<CPlusPlus::Document::DiagnosticMessage> diagnosticMessages;
 };
 
-} // end of namespace Internal
-} // end of namespace CppEditor;
+} // namespace Internal
+} // namespace CppEditor;
 
 #endif // CPPSEMANTICINFO_H

src/plugins/cpptools/cppfindreferences.h

@@ -49,7 +49,7 @@ QT_FORWARD_DECLARE_CLASS(QTimer)
 namespace Find {
     class SearchResultWindow;
     struct SearchResultItem;
-} // end of namespace Find
+} // namespace Find
 
 namespace CPlusPlus {
 class CppModelManagerInterface;
@@ -100,7 +100,7 @@ private:
     CPlusPlus::DependencyTable m_deps;
 };
 
-} // end of namespace Internal
-} // end of namespace CppTools
+} // namespace Internal
+} // namespace CppTools
 
 #endif // CPPFINDREFERENCES_H

src/plugins/cpptools/cpptoolseditorsupport.h

@@ -54,7 +54,7 @@ namespace CPlusPlus {
 namespace TextEditor {
     class ITextEditor;
     class ITextMark;
-} // end of namespace TextEditor
+} // namespace TextEditor
 
 namespace CppTools {
 namespace Internal {

src/plugins/genericprojectmanager/genericprojectfileseditor.h

@@ -128,7 +128,7 @@ private:
     Manager *m_manager;
 };
 
-} // end of namespace Internal
-} // end of namespace GenericProjectManager
+} // namespace Internal
+} // namespace GenericProjectManager
 
 #endif // GENERICPROJECTFILESEDITOR_H

src/plugins/genericprojectmanager/genericprojectwizard.h

@@ -95,7 +95,7 @@ protected:
                      QStringList *paths) const;
 };
 
-} // end of namespace Internal
-} // end of namespace GenericProjectManager
+} // namespace Internal
+} // namespace GenericProjectManager
 
 #endif // GENERICPROJECTWIZARD_H

src/plugins/genericprojectmanager/pkgconfigtool.h

@@ -66,7 +66,7 @@ private:
     mutable QList<Package> m_packages;
 };
 
-} // end of namespace Internal
-} // end of namespace GenericProjectManager
+} // namespace Internal
+} // namespace GenericProjectManager
 
 #endif // PKGCONFIGTOOL_H

src/plugins/qmljseditor/qmljscodecompletion.cpp

@@ -485,7 +485,7 @@ void FunctionArgumentWidget::updateHintText()
     m_popupFrame->move(pos);
 }
 
-} } // end of namespace QmlJSEditor::Internal
+} } // namespace QmlJSEditor::Internal
 
 CodeCompletion::CodeCompletion(ModelManagerInterface *modelManager, QObject *parent)
     : TextEditor::ICompletionCollector(parent),

src/plugins/qmljseditor/qmljscodecompletion.h

@@ -108,7 +108,7 @@ private:
 };
 
 
-} // end of namespace Internal
-} // end of namespace QmlJSEditor
+} // namespace Internal
+} // namespace QmlJSEditor
 
 #endif // QMLJSCODECOMPLETION_H

src/plugins/qmljseditor/qmljsfindreferences.h

@@ -48,7 +48,7 @@ QT_FORWARD_DECLARE_CLASS(QTimer)
 namespace Find {
     class SearchResultWindow;
     struct SearchResultItem;
-} // end of namespace Find
+} // namespace Find
 
 namespace QmlJSEditor {
 
@@ -96,6 +96,6 @@ private:
     QFutureWatcher<Usage> m_watcher;
 };
 
-} // end of namespace QmlJSEditor
+} // namespace QmlJSEditor
 
 #endif // QMLJSFINDREFERENCES_H

src/plugins/qmljseditor/qmljshighlighter.h

@@ -99,6 +99,6 @@ private:
     QTextCharFormat m_formats[NumFormats];
 };
 
-} // end of namespace QmlJSEditor
+} // namespace QmlJSEditor
 
 #endif // QSCRIPTSYNTAXHIGHLIGHTER_H

src/plugins/qmljseditor/qmljsquickfix.h

@@ -53,7 +53,7 @@ namespace QmlJSEditor {
 
 namespace Internal {
 class QmlJSQuickFixCollector;
-} // end of namespace Internal
+} // namespace Internal
 
 /*!
     Specialized QuickFixState for QML/JavaScript quick-fixes.
@@ -161,7 +161,7 @@ public:
     static void registerQuickFixes(ExtensionSystem::IPlugin *plugIn);
 };
 
-} // end of namespace Internal
-} // end of namespace QmlJSEditor
+} // namespace Internal
+} // namespace QmlJSEditor
 
 #endif // QMLJSQUICKFIX_H

src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.h

@@ -76,7 +76,7 @@ protected:
     virtual bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
 };
 
-} // end of namespace Internal
-} // end of namespace QmlProjectManager
+} // namespace Internal
+} // namespace QmlProjectManager
 
 #endif // QMLPROJECTAPPLICATIONWIZARD_H

src/plugins/qt4projectmanager/wizards/abstractmobileapp.h

@@ -174,7 +174,7 @@ private:
     bool m_networkEnabled;
 };
 
-} // end of namespace Internal
-} // end of namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // ABSTRACTMOBILEAPP_H

src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp

@@ -222,5 +222,5 @@ void AbstractMobileAppWizard::useProjectPath(const QString &projectName,
     projectPathChanged(app()->path(AbstractMobileApp::AppPro));
 }
 
-} // end of namespace Internal
-} // end of namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager

src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

@@ -106,7 +106,7 @@ private:
         QString *errorMessage)=0;
 };
 
-} // end of namespace Internal
-} // end of namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // ABSTRACTMOBILEAPPWIZARD_H

src/plugins/qt4projectmanager/wizards/mobileapp.h

@@ -83,7 +83,7 @@ private:
     QList<AbstractGeneratedFileInfo> updateableFiles(const QString &mainProFile) const;
 };
 
-} // end of namespace Internal
-} // end of namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // MOBILEAPP_H

src/plugins/qt4projectmanager/wizards/mobileappwizard.h

@@ -62,7 +62,7 @@ private:
     class MobileAppWizardPrivate *m_d;
 };
 
-} // end of namespace Internal
-} // end of namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // MOBILEAPPWIZARD_H

src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h

@@ -99,7 +99,7 @@ private:
     class MobileAppWizardMaemoOptionsPagePrivate *m_d;
 };
 
-} // end of namespace Internal
-} // end of namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // MOBILEAPPWIZARDPAGES_H

src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h

@@ -60,7 +60,7 @@ private:
     class MobileLibraryWizardOptionPagePrivate *m_d;