summaryrefslogtreecommitdiffstats
path: root/dcop
diff options
context:
space:
mode:
Diffstat (limited to 'dcop')
-rw-r--r--dcop/dcopidl/scanner.ll18
-rw-r--r--dcop/dcopidl2cpp/skel.cpp6
2 files changed, 12 insertions, 12 deletions
diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll
index 767594ac6..63e8ca59c 100644
--- a/dcop/dcopidl/scanner.ll
+++ b/dcop/dcopidl/scanner.ll
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdlib.h>
#include <ctype.h>
-class QString;
+class TQString;
#ifndef KDE_USE_FINAL
#include "yacc.cc.h"
@@ -168,10 +168,10 @@ Kidl_Identifier [_a-zA-Z][a-zA-Z0-9_]*
exit( 1 );
}
"#include"[ \t]*[<\"][^>"]*[>\"]\s*\n {
- 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;
}
@@ -241,7 +241,7 @@ Q_OBJECT ;
"extern \"C\"" return T_EXTERN_C;
{Kidl_Identifier} {
- yylval._str = new QString( yytext );
+ yylval._str = new TQString( yytext );
return T_IDENTIFIER;
}
@@ -266,14 +266,14 @@ Q_OBJECT ;
return T_INTEGER_LITERAL;
}
{Char_Literal} {
- QCString s( yytext );
+ TQCString s( yytext );
s = s.mid( 1, s.length() - 2 );
yylval._char = translate_char( s );
return T_CHARACTER_LITERAL;
}
{String_Literal} {
- 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;
}
. {
diff --git a/dcop/dcopidl2cpp/skel.cpp b/dcop/dcopidl2cpp/skel.cpp
index 9ab0c763d..5cc30de3e 100644
--- a/dcop/dcopidl2cpp/skel.cpp
+++ b/dcop/dcopidl2cpp/skel.cpp
@@ -277,7 +277,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
str << '\t'<< *ittypes << " " << *args_count << ";" << endl;
++ittypes;
}
- str << "\tQDataStream arg( data, IO_ReadOnly );" << endl;
+ str << "\tTQDataStream arg( data, IO_ReadOnly );" << endl;
for( args_count = args.begin(); args_count != args.end(); ++args_count ){
str << "\tif (arg.atEnd()) return false;" << endl; // Basic error checking
str << "\targ >> " << *args_count << ";" << endl;
@@ -288,7 +288,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
if ( funcType == "void" ) {
str << '\t' << plainFuncName << '(';
} else {
- str << "\tQDataStream _replyStream( replyData, IO_WriteOnly );" << endl;
+ str << "\tTQDataStream _replyStream( replyData, IO_WriteOnly );" << endl;
str << "\t_replyStream << " << plainFuncName << '(';
}
@@ -360,7 +360,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
str << "\tif (" << className << "_ftable_hiddens[i])" << endl;
str << "\t continue;" << endl;
}
- str << "\tQCString func = " << className << "_ftable[i][0];" << endl;
+ str << "\tTQCString func = " << className << "_ftable[i][0];" << endl;
str << "\tfunc += ' ';" << endl;
str << "\tfunc += " << className << "_ftable[i][2];" << endl;
str << "\tfuncs << func;" << endl;