Commit 57eae319 authored by hjk's avatar hjk

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

We use the latter style everywhere else to signify the end of a namespace block.
parent d87ce088
......@@ -90,6 +90,6 @@ private:
int _startToken;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_BACKWARDSSCANNER_H
......@@ -397,6 +397,6 @@ private:
_Base _documents;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_CPPDOCUMENT_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
......@@ -62,6 +62,6 @@ private:
const Substitution _substitution;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H
......@@ -79,6 +79,6 @@ public:
virtual void stopSkippingBlocks(unsigned) {}
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_FASTPREPROCESSOR_H
......@@ -304,7 +304,7 @@ private:
Scope *_currentScope;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_FINDUSAGES_H
......@@ -252,6 +252,6 @@ private:
QSharedPointer<Control> _control;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_LOOKUPCONTEXT_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
......
......@@ -57,6 +57,6 @@ private:
bool shouldInsertNewline(const QTextCursor &tc) const;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // MATCHINGTEXT_H
......@@ -66,6 +66,6 @@ private:
QString _name;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_NAMEPRETTYPRINTER_H
......@@ -100,6 +100,6 @@ private:
bool _showTemplateParameters: 1;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_OVERVIEW_H
......@@ -79,6 +79,6 @@ private:
Icons _icons;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_OVERVIEWMODEL_H
......@@ -128,6 +128,6 @@ private:
bool _reference;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_RESOLVEEXPRESSION_H
......@@ -81,6 +81,6 @@ private:
bool _endedJoined: 1;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_SIMPLELEXER_H
......@@ -56,6 +56,6 @@ private:
Document::Ptr _document;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_SNAPSHOTSYMBOLVISITOR_H
......@@ -51,6 +51,6 @@ private:
Symbol *_symbol;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_SYMBOLNAMEVISITOR_H
......@@ -89,6 +89,6 @@ private:
bool _needsParens;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_TYPEPRETTYPRINTER_H
......@@ -133,7 +133,7 @@ struct Value
#undef PP_DEFINE_BIN_OP
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
using namespace CPlusPlus;
......
......@@ -53,7 +53,7 @@ struct pp_frame
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
using namespace CPlusPlus;
......
......@@ -418,7 +418,7 @@ private:
std::vector<Token> _tokens;
};
} // end of namespace GLSL
} // namespace GLSL
:/
/.
......
......@@ -136,6 +136,6 @@ private:
Value _yyval;
};
} // end of namespace GLSL
} // namespace GLSL
#endif // GLSLLEXER_H
......@@ -108,7 +108,7 @@ public:
void operator delete(void *, MemoryPool *);
};
} // end of namespace GLSL
} // namespace GLSL
#endif // GLSLMEMORYPOOL_H
......@@ -208,4 +208,4 @@ private:
std::vector<Token> _tokens;
};
} // end of namespace GLSL
} // namespace GLSL
......@@ -84,6 +84,6 @@ public:
virtual Scope *asScope() { return this; }
};
} // end of namespace GLSL
} // namespace GLSL
#endif // GLSLSYMBOL_H
......@@ -109,6 +109,6 @@ private:
QVector<OverloadSet *> _overloadSets;
};
} // end of namespace GLSL
} // namespace GLSL
#endif // GLSLSYMBOLS_H
......@@ -66,6 +66,6 @@ public:
virtual bool isLessThan(const Type *other) const = 0;
};
} // end of namespace GLSL
} // namespace GLSL
#endif // GLSLTYPE_H
......@@ -296,6 +296,6 @@ private:
QVector<Function *> _functions;
};
} // end of namespace GLSL
} // namespace GLSL
#endif // GLSLTYPES_H
......@@ -367,7 +367,7 @@ protected:
QList<DiagnosticMessage> diagnostic_messages;
};
} // end of namespace QmlJS
} // namespace QmlJS
:/
......
......@@ -207,6 +207,6 @@ void Engine::setNodePool(NodePool *nodePool)
} // end of namespace QmlJS
} // namespace QmlJS
QT_QML_END_NAMESPACE
......@@ -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
......
......@@ -231,7 +231,7 @@ protected:
QList<DiagnosticMessage> diagnostic_messages;
};
} // end of namespace QmlJS
} // namespace QmlJS
......
......@@ -112,6 +112,6 @@ private:
QList<DiagnosticMessage> *_diagnosticMessages;
};
} // end of namespace Qml
} // namespace Qml
#endif // QMLBIND_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
......@@ -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
......@@ -82,7 +82,7 @@ private:
QScopedPointer<LookupContextData> d;
};
} // end of namespace QmlJS
} // namespace QmlJS
#endif // QMLJSLOOKUPCONTEXT_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
......@@ -172,6 +172,6 @@ private:
unsigned _flushLine;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_CHECKSYMBOLS_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
{
......
......@@ -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
......@@ -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
......@@ -54,7 +54,7 @@ namespace CPlusPlus {
namespace TextEditor {
class ITextEditor;
class ITextMark;
} // end of namespace TextEditor
} // namespace TextEditor
namespace CppTools {
namespace Internal {
......
......@@ -128,7 +128,7 @@ private:
Manager *m_manager;
};
} // end of namespace Internal
} // end of namespace GenericProjectManager
} // namespace Internal
} // namespace GenericProjectManager
#endif // GENERICPROJECTFILESEDITOR_H
......@@ -95,7 +95,7 @@ protected:
QStringList *paths) const;
};
} // end of namespace Internal
} // end of namespace GenericProjectManager
} // namespace Internal
} // namespace GenericProjectManager
#endif // GENERICPROJECTWIZARD_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
......@@ -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),
......
......@@ -108,7 +108,7 @@ private:
};
} // end of namespace Internal
} // end of namespace QmlJSEditor
} // namespace Internal
} // namespace QmlJSEditor
#endif // QMLJSCODECOMPLETION_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
......@@ -99,6 +99,6 @@ private:
QTextCharFormat m_formats[NumFormats];
};
} // end of namespace QmlJSEditor
} // namespace QmlJSEditor
#endif // QSCRIPTSYNTAXHIGHLIGHTER_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
......@@ -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
......@@ -174,7 +174,7 @@ private:
bool m_networkEnabled;
};
} // end of namespace Internal
} // end of namespace Qt4ProjectManager
} // namespace Internal
} // namespace Qt4ProjectManager
#endif // ABSTRACTMOBILEAPP_H
......@@ -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
......@@ -106,7 +106,7 @@ private:
QString *errorMessage)=0;
};
} // end of namespace Internal
} // end of namespace Qt4ProjectManager
} // namespace Internal
} // namespace Qt4ProjectManager
#endif // ABSTRACTMOBILEAPPWIZARD_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
......@@ -62,7 +62,7 @@ private:
class MobileAppWizardPrivate *m_d;
};
} // end of namespace Internal
} // end of namespace Qt4ProjectManager
} // namespace Internal
} // namespace Qt4ProjectManager
#endif // MOBILEAPPWIZARD_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
......@@ -60,7 +60,7 @@ private:
class MobileLibraryWizardOptionPagePrivate *m_d;
};
} // end of namespace Internal
} // end of namespace Qt4ProjectManager
} // namespace Internal
} // namespace Qt4ProjectManager
#endif // MOBILELIBRARYWIZARDOPTIONPAGE_H
......@@ -149,7 +149,7 @@ private:
QList <QmlCppPlugin*> m_cppPlugins;
};
} // end of namespace Internal
} // end of namespace Qt4ProjectManager
} // namespace Internal
} // namespace Qt4ProjectManager
#endif // QMLSTANDALONEAPP_H
......@@ -62,7 +62,7 @@ private:
class QmlStandaloneAppWizardPrivate *m_d;
};
} // end of namespace Internal
} // end of namespace Qt4ProjectManager
} // namespace Internal
} // namespace Qt4ProjectManager
#endif // QMLSTANDALONEAPPWIZARD_H
......@@ -56,7 +56,7 @@ private:
class QmlStandaloneAppWizardSourcesPagePrivate *m_d;
};
} // end of namespace Internal
} // end of namespace Qt4ProjectManager
} // namespace Internal
} // namespace Qt4ProjectManager
#endif // QMLSTANDALONEAPPWIZARDPAGES_H
......@@ -177,6 +177,6 @@ private:
QList<QuickFixOperation::Ptr> _quickFixes;
};
} // end of namespace TextEditor
} // namespace TextEditor
#endif // TEXTEDITORQUICKFIX_H
......@@ -107,6 +107,6 @@ private:
QScopedPointer<SyntaxHighlighterPrivate> d_ptr;
};
} // end of namespace TextEditor
} // namespace TextEditor
#endif // TEXTEDITOR_SYNTAXHIGHLIGHTER_H
......@@ -4320,6 +4320,6 @@ protected:
virtual bool match0(AST *, ASTMatcher *);
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_AST_H
......@@ -183,6 +183,6 @@ public:
virtual bool match(BracedInitializerAST *node, BracedInitializerAST *pattern);
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // ASTMATCHER_H
......@@ -1299,6 +1299,6 @@ public:
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_AST_PATTERN_BUILDER_H
......@@ -396,7 +396,7 @@ private:
TranslationUnit *_translationUnit;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_ASTVISITOR_H
......@@ -239,7 +239,7 @@ typedef List<ObjCPropertyAttributeAST *> ObjCPropertyAttributeListAST;
typedef List<ObjCMessageArgumentDeclarationAST *> ObjCMessageArgumentDeclarationListAST;
typedef List<ObjCSynthesizedPropertyAST *> ObjCSynthesizedPropertyListAST;
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_ASTFWD_H
......@@ -308,6 +308,6 @@ private:
bool _skipFunctionBodies;
};
} // end of namespace CPlusPlus
} // namespace CPlusPlus
#endif // CPLUSPLUS_BIND_H
......@@ -145,6 +145,6 @@ class ObjCForwardProtocolDeclaration;
class ObjCMethod;
class ObjCPropertyDeclaration;