From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- dcop/dcopidl2cpp/main.cpp | 6 +++--- dcop/dcopidl2cpp/skel.cpp | 6 +++--- dcop/dcopidl2cpp/stub.cpp | 12 ++++++------ dcop/dcopidl2cpp/stubimpl.cpp | 2 +- dcop/dcopidl2cpp/type.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'dcop/dcopidl2cpp') diff --git a/dcop/dcopidl2cpp/main.cpp b/dcop/dcopidl2cpp/main.cpp index 5e0f27525..c0fb786c8 100644 --- a/dcop/dcopidl2cpp/main.cpp +++ b/dcop/dcopidl2cpp/main.cpp @@ -104,11 +104,11 @@ int main( int argc, char** argv ) TQString base( argv[argpos] ); TQString idl = base; - int pos = base.findRev( '.' ); + int pos = base.tqfindRev( '.' ); if ( pos != -1 ) base = base.left( pos ); - pos = idl.findRev('/'); + pos = idl.tqfindRev('/'); if ( pos != -1 ) idl = idl.mid( pos+1 ); @@ -118,7 +118,7 @@ int main( int argc, char** argv ) if ( generate_stub ) { TQString header = base; generateStub( idl, header + "_stub.h", de ); - pos = header.findRev('/'); + pos = header.tqfindRev('/'); if ( pos != -1 ) header = header.mid( pos+1 ); generateStubImpl( idl, header + "_stub.h", base+".h", base + "_stub." + suffix, de); diff --git a/dcop/dcopidl2cpp/skel.cpp b/dcop/dcopidl2cpp/skel.cpp index 5cc30de3e..b3d14fb13 100644 --- a/dcop/dcopidl2cpp/skel.cpp +++ b/dcop/dcopidl2cpp/skel.cpp @@ -92,7 +92,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d TQDomElement n = e.firstChild().toElement(); Q_ASSERT( n.tagName() == "NAME" ); TQString className = n.firstChild().toText().data(); - // find dcop parent ( rightmost super class ) + // tqfind dcop parent ( rightmost super class ) TQString DCOPParent; TQDomElement s = n.nextSibling().toElement(); for( ; !s.isNull(); s = s.nextSibling().toElement() ) { @@ -177,7 +177,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d TQString namespace_tmp = className; str << endl; for(;;) { - int pos = namespace_tmp.find( "::" ); + int pos = namespace_tmp.tqfind( "::" ); if( pos < 0 ) { className = namespace_tmp; break; @@ -223,7 +223,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d str << "\t fdict->insert( " << className << "_ftable[i][1], new int( i ) );" << endl; str << " }" << endl; - str << " int* fp = fdict->find( fun );" << endl; + str << " int* fp = fdict->tqfind( fun );" << endl; str << " switch ( fp?*fp:-1) {" << endl; } s = n.nextSibling().toElement(); diff --git a/dcop/dcopidl2cpp/stub.cpp b/dcop/dcopidl2cpp/stub.cpp index 887945262..ab9165d4e 100644 --- a/dcop/dcopidl2cpp/stub.cpp +++ b/dcop/dcopidl2cpp/stub.cpp @@ -54,7 +54,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d str << endl; TQString ifdefstring = idl.upper(); - int pos = idl.findRev( '.' ); + int pos = idl.tqfindRev( '.' ); if ( pos != -1 ) ifdefstring = ifdefstring.left( pos ); @@ -99,7 +99,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d n = n.nextSibling().toElement(); } - // find dcop parent ( rightmost super class ) + // tqfind dcop parent ( rightmost super class ) TQString DCOPParent; for( ; !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "SUPER" ) @@ -107,13 +107,13 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d } if( DCOPParent != "DCOPObject" ) { // we need to include the .h file for the base stub - if( all_includes.contains( DCOPParent + ".h" )) + if( all_includes.tqcontains( DCOPParent + ".h" )) str << "#include <" << DCOPParent << "_stub.h>" << endl; - else if( all_includes.contains( DCOPParent.lower() + ".h" )) + else if( all_includes.tqcontains( DCOPParent.lower() + ".h" )) str << "#include <" << DCOPParent.lower() << "_stub.h>" << endl; else {// damn ... let's assume it's the last include TQString stub_h = all_includes.last(); - unsigned int pos = stub_h.find( ".h" ); + unsigned int pos = stub_h.tqfind( ".h" ); if( pos > 0 ) { stub_h = stub_h.remove( pos, 100000 ); str << "#include <" << stub_h << "_stub.h>" << endl; @@ -128,7 +128,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d int namespace_count = 0; TQString namespace_tmp = className; for(;;) { - int pos = namespace_tmp.find( "::" ); + int pos = namespace_tmp.tqfind( "::" ); if( pos < 0 ) { className = namespace_tmp; break; diff --git a/dcop/dcopidl2cpp/stubimpl.cpp b/dcop/dcopidl2cpp/stubimpl.cpp index 5cdd2a00d..7e9990e61 100644 --- a/dcop/dcopidl2cpp/stubimpl.cpp +++ b/dcop/dcopidl2cpp/stubimpl.cpp @@ -98,7 +98,7 @@ void generateStubImpl( const TQString& idl, const TQString& header, const TQStri TQString namespace_tmp = className_stub; str << endl; for(;;) { - int pos = namespace_tmp.find( "::" ); + int pos = namespace_tmp.tqfind( "::" ); if( pos < 0 ) { className_stub = namespace_tmp; break; diff --git a/dcop/dcopidl2cpp/type.h b/dcop/dcopidl2cpp/type.h index 2a99c83a9..005a97696 100644 --- a/dcop/dcopidl2cpp/type.h +++ b/dcop/dcopidl2cpp/type.h @@ -10,7 +10,7 @@ static TQString writeType( TQTextStream& str, const TQDomElement& r ) if ( r.hasAttribute( "qleft" ) ) str << r.attribute("qleft") << " "; TQString t = r.firstChild().toText().data(); - t = t.replace( ">>", "> >" ); + t = t.tqreplace( ">>", "> >" ); str << t; if ( r.hasAttribute( "qright" ) ) str << r.attribute("qright") << " "; -- cgit v1.2.1