--- uml.orig/uml/classparser/tokenizer.l	Tue Oct  1 06:56:42 2002
+++ uml/uml/classparser/tokenizer.l	Mon Oct 21 23:31:03 2002
@@ -24,13 +24,6 @@
   #include "tokenizer.h"
   #include "FlexLexer.h"
 
-  /** This class is a stupid trick to make it possible 
-   * to access the gettext method. */
-  class MyLexer : public yyFlexLexer
-  {
-    public:
-    char *gettext() {return yytext;};
-  };
 
   /* Line where a comment starts. */
   int comment_start = -1;
@@ -42,9 +35,9 @@
   QString comment;
 
   /* Function prototypes */
-  bool beginComment(MyLexer *lex);
-  void inComment(MyLexer *lex);
-  bool endComment(MyLexer *lex);
+  bool beginComment(yyFlexLexer *lex);
+  void inComment(yyFlexLexer *lex);
+  bool endComment(yyFlexLexer *lex);
 %}
 
 WS           [[:blank:]\r]+
@@ -146,23 +139,23 @@ SCHAR [^"\\\n]|{ESCAPE_SEQUENCE}
     /*==============> Skip preprocessor directives <==============*/
 <INITIAL>"#"[acdeimpsuw ]	{BEGIN (PREPARSER);}
 <PREPARSER>[^\\]"\n"	{ BEGIN (0);}
-<PREPARSER>"/*"		{beginComment((MyLexer *) this);
+<PREPARSER>"/*"		{beginComment((yyFlexLexer *) this);
                                   BEGIN (PPCOMMENT);}
-<PPCOMMENT>"*/"        { endComment((MyLexer *) this);
+<PPCOMMENT>"*/"        { endComment((yyFlexLexer *) this);
                        BEGIN (PREPARSER); }
 
     /*==============> Strip // comments <==============*/
 <INITIAL>"//"(.)*[\n<<EOF>>] {}
 
     /*==============> Strip comments <==============*/
-<INITIAL>"/*"        {beginComment((MyLexer *) this);
+<INITIAL>"/*"        {beginComment((yyFlexLexer *) this);
                                   BEGIN (COMMENT);}
 
-<COMMENT>"*/"        { endComment((MyLexer *) this);
+<COMMENT>"*/"        { endComment((yyFlexLexer *) this);
                        BEGIN (0); }
 
-<COMMENT,PPCOMMENT>[\n\r]  {inComment((MyLexer *) this);}
-<COMMENT,PPCOMMENT>.  {inComment((MyLexer *) this);}
+<COMMENT,PPCOMMENT>[\n\r]  {inComment((yyFlexLexer *) this);}
+<COMMENT,PPCOMMENT>.  {inComment((yyFlexLexer *) this);}
 
     /*==============> All other characters are ignored <==============*/
 <INITIAL,PREPARSER>[\n]  	{}
@@ -170,20 +163,20 @@ SCHAR [^"\\\n]|{ESCAPE_SEQUENCE}
 
 %%
 
-bool beginComment(MyLexer *lex)
+bool beginComment(yyFlexLexer *lex)
 {
  comment_start = lex->lineno();
  comment="/*";
  return true;
 }
 
-void inComment(MyLexer *lex)
+void inComment(yyFlexLexer *lex)
 {
-  char *text=lex->gettext();
+  const char* text=lex->YYText();
   comment+=text;
 };
 
-bool endComment(MyLexer *lex)
+bool endComment(yyFlexLexer *lex)
 {
  comment_end = lex->lineno();
  comment+="*/";
