From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- dcop/dcopidl/scanner.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'dcop/dcopidl/scanner.cc') diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cc index 4926e0421..92c08583f 100644 --- a/dcop/dcopidl/scanner.cc +++ b/dcop/dcopidl/scanner.cc @@ -849,8 +849,8 @@ extern int idl_line_no; int comment_mode; int function_mode = 0; -#include -#include +#include +#include static long ascii_to_longlong( long base, const char *s ) { @@ -1225,10 +1225,10 @@ case 10: YY_RULE_SETUP #line 170 "scanner.ll" { - QString s( yytext ); - int i = s.find(QRegExp("[\"<]"))+1; - int j = s.find(QRegExp("[\">]"), i); - yylval._str = new QString( s.mid( i, j - i ) ); + TQString s( yytext ); + int i = s.find(TQRegExp("[\"<]"))+1; + int j = s.find(TQRegExp("[\">]"), i); + yylval._str = new TQString( s.mid( i, j - i ) ); idl_line_no++; return T_INCLUDE; } @@ -1539,7 +1539,7 @@ case 71: YY_RULE_SETUP #line 243 "scanner.ll" { - yylval._str = new QString( yytext ); + yylval._str = new TQString( yytext ); return T_IDENTIFIER; } YY_BREAK @@ -1587,7 +1587,7 @@ case 80: YY_RULE_SETUP #line 268 "scanner.ll" { - QCString s( yytext ); + TQCString s( yytext ); s = s.mid( 1, s.length() - 2 ); yylval._char = translate_char( s ); return T_CHARACTER_LITERAL; @@ -1597,8 +1597,8 @@ case 81: YY_RULE_SETUP #line 274 "scanner.ll" { - QString s( yytext ); - yylval._str = new QString( s.mid( 1, s.length() - 2 ) ); + TQString s( yytext ); + yylval._str = new TQString( s.mid( 1, s.length() - 2 ) ); return T_STRING_LITERAL; } YY_BREAK -- cgit v1.2.1