1 files changed, 89 insertions, 29 deletions

diff --git a/src/qdoc/tokenizer.h b/src/qdoc/tokenizer.h
index 2f0c1937c..4f35090fe 100644
--- a/src/qdoc/tokenizer.h
+++ b/src/qdoc/tokenizer.h
@@ -49,30 +49,93 @@ QT_BEGIN_NAMESPACE
   tokenizer.cpp as well, and possibly adjust Tok_FirstKeyword and
   Tok_LastKeyword.
 */
-enum { Tok_Eoi, Tok_Ampersand, Tok_Aster, Tok_Caret, Tok_LeftParen,
-       Tok_RightParen, Tok_LeftParenAster, Tok_Equal, Tok_LeftBrace,
-       Tok_RightBrace, Tok_Semicolon, Tok_Colon, Tok_LeftAngle,
-       Tok_RightAngle, Tok_Comma, Tok_Ellipsis, Tok_Gulbrandsen,
-       Tok_LeftBracket, Tok_RightBracket, Tok_Tilde, Tok_SomeOperator,
-       Tok_Number, Tok_String, Tok_Doc, Tok_Comment, Tok_Ident, Tok_At,
-       Tok_char, Tok_class, Tok_const, Tok_double, Tok_enum,
-       Tok_explicit, Tok_friend, Tok_inline, Tok_int, Tok_long,
-       Tok_namespace, Tok_operator, Tok_private, Tok_protected,
-       Tok_public, Tok_short, Tok_signals, Tok_signed, Tok_slots,
-       Tok_static, Tok_struct, Tok_template, Tok_typedef,
-       Tok_typename, Tok_union, Tok_unsigned, Tok_using, Tok_virtual,
-       Tok_void, Tok_volatile, Tok_int64, Tok_default, Tok_delete, Tok_final,
-       Tok_override,
-       Tok_Q_OBJECT, Tok_Q_OVERRIDE,
-       Tok_Q_PROPERTY, Tok_Q_PRIVATE_PROPERTY, Tok_Q_DECLARE_SEQUENTIAL_ITERATOR,
-       Tok_Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR,
-       Tok_Q_DECLARE_ASSOCIATIVE_ITERATOR,
-       Tok_Q_DECLARE_MUTABLE_ASSOCIATIVE_ITERATOR,
-       Tok_Q_DECLARE_FLAGS, Tok_Q_SIGNALS, Tok_Q_SLOTS, Tok_QT_COMPAT,
-       Tok_QT_COMPAT_CONSTRUCTOR, Tok_QT_DEPRECATED, Tok_QT_MOC_COMPAT,
-       Tok_QT_MODULE, Tok_QT3_SUPPORT, Tok_QT3_SUPPORT_CONSTRUCTOR,
-       Tok_QT3_MOC_SUPPORT, Tok_QDOC_PROPERTY, Tok_QPrivateSignal,
-       Tok_FirstKeyword = Tok_char, Tok_LastKeyword = Tok_QPrivateSignal };
+enum {
+    Tok_Eoi,
+    Tok_Ampersand,
+    Tok_Aster,
+    Tok_Caret,
+    Tok_LeftParen,
+    Tok_RightParen,
+    Tok_LeftParenAster,
+    Tok_Equal,
+    Tok_LeftBrace,
+    Tok_RightBrace,
+    Tok_Semicolon,
+    Tok_Colon,
+    Tok_LeftAngle,
+    Tok_RightAngle,
+    Tok_Comma,
+    Tok_Ellipsis,
+    Tok_Gulbrandsen,
+    Tok_LeftBracket,
+    Tok_RightBracket,
+    Tok_Tilde,
+    Tok_SomeOperator,
+    Tok_Number,
+    Tok_String,
+    Tok_Doc,
+    Tok_Comment,
+    Tok_Ident,
+    Tok_At,
+    Tok_char,
+    Tok_class,
+    Tok_const,
+    Tok_double,
+    Tok_enum,
+    Tok_explicit,
+    Tok_friend,
+    Tok_inline,
+    Tok_int,
+    Tok_long,
+    Tok_namespace,
+    Tok_operator,
+    Tok_private,
+    Tok_protected,
+    Tok_public,
+    Tok_short,
+    Tok_signals,
+    Tok_signed,
+    Tok_slots,
+    Tok_static,
+    Tok_struct,
+    Tok_template,
+    Tok_typedef,
+    Tok_typename,
+    Tok_union,
+    Tok_unsigned,
+    Tok_using,
+    Tok_virtual,
+    Tok_void,
+    Tok_volatile,
+    Tok_int64,
+    Tok_default,
+    Tok_delete,
+    Tok_final,
+    Tok_override,
+    Tok_Q_OBJECT,
+    Tok_Q_OVERRIDE,
+    Tok_Q_PROPERTY,
+    Tok_Q_PRIVATE_PROPERTY,
+    Tok_Q_DECLARE_SEQUENTIAL_ITERATOR,
+    Tok_Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR,
+    Tok_Q_DECLARE_ASSOCIATIVE_ITERATOR,
+    Tok_Q_DECLARE_MUTABLE_ASSOCIATIVE_ITERATOR,
+    Tok_Q_DECLARE_FLAGS,
+    Tok_Q_SIGNALS,
+    Tok_Q_SLOTS,
+    Tok_QT_COMPAT,
+    Tok_QT_COMPAT_CONSTRUCTOR,
+    Tok_QT_DEPRECATED,
+    Tok_QT_MOC_COMPAT,
+    Tok_QT_MODULE,
+    Tok_QT3_SUPPORT,
+    Tok_QT3_SUPPORT_CONSTRUCTOR,
+    Tok_QT3_MOC_SUPPORT,
+    Tok_QDOC_PROPERTY,
+    Tok_QPrivateSignal,
+    Tok_FirstKeyword = Tok_char,
+    Tok_LastKeyword = Tok_QPrivateSignal
+};
 
 /*
   The Tokenizer class implements lexical analysis of C++ source
@@ -120,17 +183,14 @@ private:
     */
     enum { yyLexBufSize = 524288 };
 
-    int getch()
-    {
-        return yyPos == yyIn.size() ? EOF : yyIn[yyPos++];
-    }
+    int getch() { return yyPos == yyIn.size() ? EOF : yyIn[yyPos++]; }
 
     inline int getChar()
     {
         if (yyCh == EOF)
             return EOF;
         if (yyLexLen < yyLexBufSize - 1) {
-            yyLex[yyLexLen++] = (char) yyCh;
+            yyLex[yyLexLen++] = (char)yyCh;
             yyLex[yyLexLen] = '\0';
         }
         yyCurLoc.advance(yyCh);