diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
| commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
| tree | 30834aa632d442019e14f88685001d94657d060b /dcop/dcopidl | |
| parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
| download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip | |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'dcop/dcopidl')
| -rw-r--r-- | dcop/dcopidl/main.cpp | 2 | ||||
| -rw-r--r-- | dcop/dcopidl/scanner.cc | 4 | ||||
| -rw-r--r-- | dcop/dcopidl/scanner.ll | 1 | ||||
| -rw-r--r-- | dcop/dcopidl/yacc.cc | 2 | ||||
| -rw-r--r-- | dcop/dcopidl/yacc.yy | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/dcop/dcopidl/main.cpp b/dcop/dcopidl/main.cpp index aa60e2c41..0cbb32a1e 100644 --- a/dcop/dcopidl/main.cpp +++ b/dcop/dcopidl/main.cpp @@ -47,7 +47,7 @@ int main( int argc, char** argv ) return -1; } - TQByteArray arr = file.readAll(); + TQByteArray arr = TQByteArray(file.readAll()); uint len = arr.size(); uint j = 1; for (uint i = 1; i<len; i++, j++) { diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cc index e91b21d68..f118a67e9 100644 --- a/dcop/dcopidl/scanner.cc +++ b/dcop/dcopidl/scanner.cc @@ -1226,8 +1226,8 @@ YY_RULE_SETUP #line 170 "scanner.ll" { TQString s( yytext ); - int i = s.find(TQRegExp("[\"<]"))+1; - int j = s.find(TQRegExp("[\">]"), i); + int i = s.tqfind(TQRegExp("[\"<]"))+1; + int j = s.tqfind(TQRegExp("[\">]"), i); yylval._str = new TQString( s.mid( i, j - i ) ); idl_line_no++; return T_INCLUDE; diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll index 63e8ca59c..d9f870512 100644 --- a/dcop/dcopidl/scanner.ll +++ b/dcop/dcopidl/scanner.ll @@ -236,6 +236,7 @@ FALSE return T_FALSE; typedef return T_TYPEDEF; K_DCOP return T_DCOP; Q_OBJECT ; +TQ_OBJECT ; ("0"|"0L") return T_NULL; "extern "[A-Za-z0-9_ \t*]+ return T_EXTERN; "extern \"C\"" return T_EXTERN_C; diff --git a/dcop/dcopidl/yacc.cc b/dcop/dcopidl/yacc.cc index d41fa6dbd..1fbc4c0bd 100644 --- a/dcop/dcopidl/yacc.cc +++ b/dcop/dcopidl/yacc.cc @@ -1643,7 +1643,7 @@ yyreduce: case 15: #line 221 "yacc.yy" { - int pos = in_namespace.findRev( "::", -3 ); + int pos = in_namespace.tqfindRev( "::", -3 ); if( pos >= 0 ) in_namespace = in_namespace.left( pos + 2 ); else diff --git a/dcop/dcopidl/yacc.yy b/dcop/dcopidl/yacc.yy index ca22c65e1..7870eb6e9 100644 --- a/dcop/dcopidl/yacc.yy +++ b/dcop/dcopidl/yacc.yy @@ -219,7 +219,7 @@ declaration } main T_RIGHT_CURLY_BRACKET opt_semicolon { - int pos = in_namespace.findRev( "::", -3 ); + int pos = in_namespace.tqfindRev( "::", -3 ); if( pos >= 0 ) in_namespace = in_namespace.left( pos + 2 ); else |