diff options
1972 files changed, 93386 insertions, 93386 deletions
diff --git a/dcopc/dcopc.c b/dcopc/dcopc.c index fcb51e2b..119371bf 100644 --- a/dcopc/dcopc.c +++ b/dcopc/dcopc.c @@ -609,7 +609,7 @@ const gchar *dcop_client_register_as( DcopClient *client, const gchar *app_id, g dcop_marshal_string( data, id ); - if ( dcop_client_call( client, "DCOPServer", "", "registerAs(QCString)", data, + if ( dcop_client_call( client, "DCOPServer", "", "registerAs(TQCString)", data, &reply_type, &reply_data ) ) { @@ -813,7 +813,7 @@ gboolean dcop_client_is_application_registered( DcopClient *client, const gchar dcop_marshal_string( data, app ); - if ( dcop_client_call( client, "DCOPServer", "", "isApplicationRegistered(QCString)", data, &reply_type, &reply_data ) ) + if ( dcop_client_call( client, "DCOPServer", "", "isApplicationRegistered(TQCString)", data, &reply_type, &reply_data ) ) { dcop_data_reset( reply_data ); dcop_demarshal_boolean( reply_data, &res ); @@ -1476,7 +1476,7 @@ gboolean dcop_client_connect_dcop_signal( DcopClient *client, dcop_marshal_string( data, normalized_slotname ); dcop_marshal_uint8( data, ivolatile ); - if ( dcop_client_call( client, "DCOPServer", "", "connectSignal(QCString,QCString,QCString,QCString,QCString,bool)", data, &reply_type, &reply_data ) == FALSE ) + if ( dcop_client_call( client, "DCOPServer", "", "connectSignal(TQCString,TQCString,TQCString,TQCString,TQCString,bool)", data, &reply_type, &reply_data ) == FALSE ) { g_free( normalized_signame ); g_free( normalized_slotname ); @@ -1527,7 +1527,7 @@ gboolean dcop_client_disconnect_dcop_signal( DcopClient *client, dcop_marshal_string( data, receiver_obj ); dcop_marshal_string( data, normalized_slotname ); - if ( dcop_client_call( client, "DCOPServer", "", "disconnectSignal(QCString,QCString,QCString,QCString,QCString)", data, &reply_type, &reply_data ) == FALSE ) + if ( dcop_client_call( client, "DCOPServer", "", "disconnectSignal(TQCString,TQCString,TQCString,TQCString,TQCString)", data, &reply_type, &reply_data ) == FALSE ) { g_free( normalized_signame ); g_free( normalized_slotname ); diff --git a/dcopjava/binding/client.cpp b/dcopjava/binding/client.cpp index 5bdb9469..e60fe2ac 100644 --- a/dcopjava/binding/client.cpp +++ b/dcopjava/binding/client.cpp @@ -44,11 +44,11 @@ JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_attach(JNIEnv *, jobject) JNIEXPORT jstring JNICALL Java_org_kde_DCOP_Client_registerAs(JNIEnv *env, jobject, jstring appName) { - QString name(env->GetStringUTFChars(appName, 0)); + TQString name(env->GetStringUTFChars(appName, 0)); kdDebug() << "javadcop::registerAs(\"" << name << "\") called" << endl; - QString rname = client::instance()->registerAs(name.local8Bit(), false); + TQString rname = client::instance()->registerAs(name.local8Bit(), false); return env->NewStringUTF(rname.local8Bit().data()); } @@ -72,10 +72,10 @@ JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_detach(JNIEnv *, jobject) JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_send__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv *env, jobject, jstring remApp, jstring remObj, jstring remFun, jstring data) { - QString _remApp(env->GetStringUTFChars(remApp, 0)); - QString _remObj(env->GetStringUTFChars(remObj, 0)); - QString _remFun(env->GetStringUTFChars(remFun, 0)); - QString _data(env->GetStringUTFChars(data, 0)); + TQString _remApp(env->GetStringUTFChars(remApp, 0)); + TQString _remObj(env->GetStringUTFChars(remObj, 0)); + TQString _remFun(env->GetStringUTFChars(remFun, 0)); + TQString _data(env->GetStringUTFChars(data, 0)); kdDebug() << "javadcop::send(" << _remApp << "," << _remObj << "," << _remFun << "," << _data << "," <<") called" << endl; @@ -83,10 +83,10 @@ JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_send__Ljava_lang_String_2Lja } -QByteArray byteArray(JNIEnv *env, jbyteArray a) +TQByteArray byteArray(JNIEnv *env, jbyteArray a) { jsize len = env->GetArrayLength(a); - QByteArray _data(len); + TQByteArray _data(len); jboolean isCopy; _data.duplicate((const char *)env->GetByteArrayElements(a, &isCopy), len); @@ -96,10 +96,10 @@ QByteArray byteArray(JNIEnv *env, jbyteArray a) JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_send__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2_3B(JNIEnv *env, jobject, jstring remApp, jstring remObj, jstring remFun, jbyteArray data) { - QString _remApp(env->GetStringUTFChars(remApp, 0)); - QString _remObj(env->GetStringUTFChars(remObj, 0)); - QString _remFun(env->GetStringUTFChars(remFun, 0)); - QByteArray _data = byteArray(env, data); + TQString _remApp(env->GetStringUTFChars(remApp, 0)); + TQString _remObj(env->GetStringUTFChars(remObj, 0)); + TQString _remFun(env->GetStringUTFChars(remFun, 0)); + TQByteArray _data = byteArray(env, data); kdDebug() << "javadcop::send(" << _remApp << "," << _remObj << "," << _remFun << ", data[" << _data.size() << "], " <<") called" << endl; for (uint i=0; i<_data.size(); ++i) @@ -143,17 +143,17 @@ JNIEXPORT void JNICALL Java_org_kde_DCOP_Client_resume(JNIEnv *, jobject) JNIEXPORT jobject JNICALL Java_org_kde_DCOP_Client_call(JNIEnv *env, jobject, jstring remApp, jstring remObj, jstring remFun, jbyteArray data, jboolean eventLoop) { - QString _remApp(env->GetStringUTFChars(remApp, 0)); - QString _remObj(env->GetStringUTFChars(remObj, 0)); - QString _remFun(env->GetStringUTFChars(remFun, 0)); - QByteArray _data = byteArray(env, data); + TQString _remApp(env->GetStringUTFChars(remApp, 0)); + TQString _remObj(env->GetStringUTFChars(remObj, 0)); + TQString _remFun(env->GetStringUTFChars(remFun, 0)); + TQByteArray _data = byteArray(env, data); kdDebug() << "javadcop::call(" << _remApp << "," << _remObj << "," << _remFun << ", data[" << _data.size() << "], " << eventLoop <<") called" << endl; for (uint i=0; i<_data.size(); ++i) kdDebug() << " data[" << i << "] = " << _data[i] << endl; - QCString _retType; - QByteArray _retData; + TQCString _retType; + TQByteArray _retData; bool retval = client::instance()->call(_remApp.local8Bit(), _remObj.local8Bit(), _remFun.local8Bit(), _data, _retType, _retData, eventLoop); kdDebug() << "Return type " << _retType << endl; @@ -203,7 +203,7 @@ JNIEXPORT jobject JNICALL Java_org_kde_DCOP_Client_call(JNIEnv *env, jobject, js JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_isApplicationRegistered(JNIEnv *env, jobject, jstring remApp) { - const QCString _remApp(env->GetStringUTFChars(remApp, 0)); + const TQCString _remApp(env->GetStringUTFChars(remApp, 0)); kdDebug() << "javadcop::isApplicationRegistered() called" << endl; diff --git a/dcopjava/dcopidl2java/main.cpp b/dcopjava/dcopidl2java/main.cpp index 1df03b98..913b7e7a 100644 --- a/dcopjava/dcopidl2java/main.cpp +++ b/dcopjava/dcopidl2java/main.cpp @@ -20,10 +20,10 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdom.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qstring.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqstring.h> #include <string.h> #include <stdlib.h> @@ -48,7 +48,7 @@ int main( int argc, char** argv ) int argpos = 1; bool generate_skel = TRUE; bool generate_stub = TRUE; - QString package; + TQString package; while (argc > 2) { @@ -67,7 +67,7 @@ int main( int argc, char** argv ) else if ( strcmp( argv[argpos], "--package" ) == 0 ) { if (argpos + 1 < argc) - package = QString(argv[argpos+1]); + package = TQString(argv[argpos+1]); for (int i = argpos; i < argc - 2; i++) argv[i] = argv[i+2]; argc -= 2; @@ -78,18 +78,18 @@ int main( int argc, char** argv ) } } - QFile in( argv[argpos] ); + TQFile in( argv[argpos] ); if ( !in.open( IO_ReadOnly ) ) qFatal("Could not read %s", argv[argpos] ); - QDomDocument doc; + TQDomDocument doc; doc.setContent( &in ); - QDomElement de = doc.documentElement(); + TQDomElement de = doc.documentElement(); ASSERT( de.tagName() == "DCOP-IDL" ); - QString base( argv[argpos] ); - QString idl = base; + TQString base( argv[argpos] ); + TQString idl = base; int pos = base.findRev( '.' ); if ( pos != -1 ) diff --git a/dcopjava/dcopidl2java/main.h b/dcopjava/dcopidl2java/main.h index bc395af4..d3f19c0c 100644 --- a/dcopjava/dcopidl2java/main.h +++ b/dcopjava/dcopidl2java/main.h @@ -20,16 +20,16 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdom.h> -#include <qstring.h> +#include <tqdom.h> +#include <tqstring.h> /** * Writes the skeleton */ -void generateSkel( const QString& idl, const QString& filename, QDomElement de ); +void generateSkel( const TQString& idl, const TQString& filename, TQDomElement de ); /** * Writes the stub implementation */ -void generateStubImpl( const QString& idl, const QString& package, const QString& filename, QDomElement de ); +void generateStubImpl( const TQString& idl, const TQString& package, const TQString& filename, TQDomElement de ); diff --git a/dcopjava/dcopidl2java/skel.cpp b/dcopjava/dcopidl2java/skel.cpp index 55065dad..68f1b46b 100644 --- a/dcopjava/dcopidl2java/skel.cpp +++ b/dcopjava/dcopidl2java/skel.cpp @@ -20,12 +20,12 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdom.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qstring.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include <string.h> #include <stdlib.h> @@ -52,23 +52,23 @@ static int const primes[] = struct Function { Function(){}; - Function( const QString& t, const QString& n, const QString&fn ) : type( t ), name( n ), fullName( fn ){} - QString type; - QString name; - QString fullName; + Function( const TQString& t, const TQString& n, const TQString&fn ) : type( t ), name( n ), fullName( fn ){} + TQString type; + TQString name; + TQString fullName; }; /** * Writes the skeleton */ -void generateSkel( const QString& idl, const QString& filename, QDomElement de ) +void generateSkel( const TQString& idl, const TQString& filename, TQDomElement de ) { - QFile skel( filename ); + TQFile skel( filename ); if ( !skel.open( IO_WriteOnly ) ) qFatal("Could not write to %s", filename.latin1() ); - QTextStream str( &skel ); + TQTextStream str( &skel ); str << "/****************************************************************************" << endl; str << "**" << endl; @@ -79,41 +79,41 @@ void generateSkel( const QString& idl, const QString& filename, QDomElement de ) str << "*****************************************************************************/" << endl; str << endl; - QDomElement e = de.firstChild().toElement(); + TQDomElement e = de.firstChild().toElement(); if ( e.tagName() == "SOURCE" ) { str << "#include \"" << e.firstChild().toText().data() << "\"" << endl << endl; } for( ; !e.isNull(); e = e.nextSibling().toElement() ) { if ( e.tagName() == "CLASS" ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); ASSERT( n.tagName() == "NAME" ); - QString className = n.firstChild().toText().data(); + TQString className = n.firstChild().toText().data(); // find dcop parent ( rightmost super class ) - QString DCOPParent; - QDomElement s = n.nextSibling().toElement(); + TQString DCOPParent; + TQDomElement s = n.nextSibling().toElement(); for( ; !s.isNull(); s = s.nextSibling().toElement() ) { if ( s.tagName() == "SUPER" ) DCOPParent = s.firstChild().toText().data(); } // get function table - QValueList<Function> functions; + TQValueList<Function> functions; s = n.nextSibling().toElement(); for( ; !s.isNull(); s = s.nextSibling().toElement() ) { if ( s.tagName() == "FUNC" ) { - QDomElement r = s.firstChild().toElement(); + TQDomElement r = s.firstChild().toElement(); ASSERT( r.tagName() == "TYPE" ); - QString funcType = r.firstChild().toText().data(); + TQString funcType = r.firstChild().toText().data(); r = r.nextSibling().toElement(); ASSERT ( r.tagName() == "NAME" ); - QString funcName = r.firstChild().toText().data(); - QStringList argtypes; - QStringList argnames; + TQString funcName = r.firstChild().toText().data(); + TQStringList argtypes; + TQStringList argnames; r = r.nextSibling().toElement(); for( ; !r.isNull(); r = r.nextSibling().toElement() ) { ASSERT( r.tagName() == "ARG" ); - QDomElement a = r.firstChild().toElement(); + TQDomElement a = r.firstChild().toElement(); ASSERT( a.tagName() == "TYPE" ); argtypes.append( a.firstChild().toText().data() ); a = a.nextSibling().toElement(); @@ -121,14 +121,14 @@ void generateSkel( const QString& idl, const QString& filename, QDomElement de ) ASSERT( a.tagName() == "NAME" ); argnames.append( a.firstChild().toText().data() ); } else { - argnames.append( QString::null ); + argnames.append( TQString::null ); } } funcName += '('; - QString fullFuncName = funcName; + TQString fullFuncName = funcName; bool first = TRUE; - QStringList::Iterator ittype = argtypes.begin(); - QStringList::Iterator itname = argnames.begin(); + TQStringList::Iterator ittype = argtypes.begin(); + TQStringList::Iterator itname = argnames.begin(); while ( ittype != argtypes.end() && itname != argnames.end() ) { if ( !first ) { funcName += ','; @@ -164,11 +164,11 @@ void generateSkel( const QString& idl, const QString& filename, QDomElement de ) bool useHashing = functions.count() > 7; if ( useHashing ) { - str << "#include <qasciidict.h>" << endl; + str << "#include <tqasciidict.h>" << endl; str << "static const int " << className << "_fhash = " << fhash << ";" << endl; } str << "static const char* const " << className << "_ftable[" << functions.count() + 1 << "][3] = {" << endl; - for( QValueList<Function>::Iterator it = functions.begin(); it != functions.end(); ++it ){ + for( TQValueList<Function>::Iterator it = functions.begin(); it != functions.end(); ++it ){ str << " { \"" << (*it).type << "\", \"" << (*it).name << "\", \"" << (*it).fullName << "\" }," << endl; } str << " { 0, 0, 0 }" << endl; @@ -179,13 +179,13 @@ void generateSkel( const QString& idl, const QString& filename, QDomElement de ) // Write dispatcher str << "bool " << className; - str << "::process(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &replyData)" << endl; + str << "::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData)" << endl; str << "{" << endl; if ( useHashing ) { - str << " static QAsciiDict<int>* fdict = 0;" << endl; + str << " static TQAsciiDict<int>* fdict = 0;" << endl; str << " if ( !fdict ) {" << endl; - str << "\tfdict = new QAsciiDict<int>( " << className << "_fhash, TRUE, FALSE );" << endl; + str << "\tfdict = new TQAsciiDict<int>( " << className << "_fhash, TRUE, FALSE );" << endl; str << "\tfor ( int i = 0; " << className << "_ftable[i][1]; i++ )" << endl; str << "\t fdict->insert( " << className << "_ftable[i][1], new int( i ) );" << endl; str << " }" << endl; @@ -198,28 +198,28 @@ void generateSkel( const QString& idl, const QString& filename, QDomElement de ) bool firstFunc = TRUE; for( ; !s.isNull(); s = s.nextSibling().toElement() ) { if ( s.tagName() == "FUNC" ) { - QDomElement r = s.firstChild().toElement(); + TQDomElement r = s.firstChild().toElement(); ASSERT( r.tagName() == "TYPE" ); - QString funcType = r.firstChild().toText().data(); + TQString funcType = r.firstChild().toText().data(); if ( funcType == "ASYNC" ) funcType = "void"; r = r.nextSibling().toElement(); ASSERT ( r.tagName() == "NAME" ); - QString funcName = r.firstChild().toText().data(); - QStringList args; - QStringList argtypes; + TQString funcName = r.firstChild().toText().data(); + TQStringList args; + TQStringList argtypes; r = r.nextSibling().toElement(); for( ; !r.isNull(); r = r.nextSibling().toElement() ) { ASSERT( r.tagName() == "ARG" ); - QDomElement a = r.firstChild().toElement(); + TQDomElement a = r.firstChild().toElement(); ASSERT( a.tagName() == "TYPE" ); argtypes.append( a.firstChild().toText().data() ); - args.append( QString("arg" ) + QString::number( args.count() ) ); + args.append( TQString("arg" ) + TQString::number( args.count() ) ); } - QString plainFuncName = funcName; + TQString plainFuncName = funcName; funcName += '('; bool first = TRUE; - for( QStringList::Iterator argtypes_count = argtypes.begin(); argtypes_count != argtypes.end(); ++argtypes_count ){ + for( TQStringList::Iterator argtypes_count = argtypes.begin(); argtypes_count != argtypes.end(); ++argtypes_count ){ if ( !first ) funcName += ','; first = FALSE; @@ -237,8 +237,8 @@ void generateSkel( const QString& idl, const QString& filename, QDomElement de ) firstFunc = FALSE; } if ( !args.isEmpty() ) { - QStringList::Iterator ittypes = argtypes.begin(); - QStringList::Iterator args_count; + TQStringList::Iterator ittypes = argtypes.begin(); + TQStringList::Iterator args_count; for( args_count = args.begin(); args_count != args.end(); ++args_count ){ str << '\t'<< *ittypes << " " << *args_count << ";" << endl; ++ittypes; @@ -258,7 +258,7 @@ void generateSkel( const QString& idl, const QString& filename, QDomElement de ) } first = TRUE; - for ( QStringList::Iterator args_count = args.begin(); args_count != args.end(); ++args_count ){ + for ( TQStringList::Iterator args_count = args.begin(); args_count != args.end(); ++args_count ){ if ( !first ) str << ", "; first = FALSE; diff --git a/dcopjava/dcopidl2java/stubimpl.cpp b/dcopjava/dcopidl2java/stubimpl.cpp index 8d15fe7a..55e474c9 100644 --- a/dcopjava/dcopidl2java/stubimpl.cpp +++ b/dcopjava/dcopidl2java/stubimpl.cpp @@ -20,11 +20,11 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdom.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qstring.h> -#include <qregexp.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqstring.h> +#include <tqregexp.h> #include <string.h> #include <stdlib.h> @@ -33,15 +33,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main.h" -QString javaType(QString type) +TQString javaType(TQString type) { if (type == "bool") return "boolean"; - if (type == "QString") + if (type == "TQString") return "String"; - if (type == "QCString") + if (type == "TQCString") return "String"; - if (type == "QStringList") + if (type == "TQStringList") return "String[]"; if (type == "short int") return "short"; @@ -52,50 +52,50 @@ QString javaType(QString type) } -QString javaRightAttribute(QString attr) +TQString javaRightAttribute(TQString attr) { if (attr == "&") - return QString::null; + return TQString::null; return "!!!NOT IMPLEMENTED: " + attr; } -QString javaLeftAttribute(QString attr) +TQString javaLeftAttribute(TQString attr) { if (attr == "const") - return QString::null; + return TQString::null; return "!!!NOT IMPLEMENTED: " + attr; } -QString javaQualifier(QString qual) +TQString javaQualifier(TQString qual) { if (qual == "const") - return QString::null; + return TQString::null; return "!!!NOT IMPLEMENTED: " + qual; } -QString underscore(QString in) +TQString underscore(TQString in) { - return in.replace(QRegExp(" "), "_"); + return in.replace(TQRegExp(" "), "_"); } -QString defValue(QString type) +TQString defValue(TQString type) { if (type == "bool") return "false"; - if (type == "QString") + if (type == "TQString") return "null"; - if (type == "QStringList") + if (type == "TQStringList") return "null"; if (type == "DCOPRef") return "null"; - if (type == "QCString") + if (type == "TQCString") return "null"; return "0"; @@ -105,13 +105,13 @@ QString defValue(QString type) /** * Writes the stub implementation */ -void generateStubImpl( const QString& idl, const QString& package, const QString& filename, QDomElement de ) +void generateStubImpl( const TQString& idl, const TQString& package, const TQString& filename, TQDomElement de ) { - QFile impl( filename ); + TQFile impl( filename ); if ( !impl.open( IO_WriteOnly ) ) qFatal("Could not write to %s", filename.latin1() ); - QTextStream str( &impl ); + TQTextStream str( &impl ); str << "/****************************************************************************" << endl; str << "**" << endl; @@ -129,16 +129,16 @@ void generateStubImpl( const QString& idl, const QString& package, const QString str << "import org.kde.DCOP.*;" << endl; str << endl << endl; - QDomElement e = de.firstChild().toElement(); + TQDomElement e = de.firstChild().toElement(); for( ; !e.isNull(); e = e.nextSibling().toElement() ) { if ( e.tagName() == "CLASS" ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); ASSERT( n.tagName() == "NAME" ); - QString className = n.firstChild().toText().data() + "_stub"; + TQString className = n.firstChild().toText().data() + "_stub"; // find dcop parent ( rightmost super class ) - QString DCOPParent; - QDomElement s = n.nextSibling().toElement(); + TQString DCOPParent; + TQDomElement s = n.nextSibling().toElement(); for( ; !s.isNull(); s = s.nextSibling().toElement() ) { if ( s.tagName() == "SUPER" ) DCOPParent = s.firstChild().toText().data(); @@ -163,9 +163,9 @@ void generateStubImpl( const QString& idl, const QString& package, const QString s = e.firstChild().toElement(); for( ; !s.isNull(); s = s.nextSibling().toElement() ) { if ( s.tagName() == "FUNC" ) { - QDomElement r = s.firstChild().toElement(); + TQDomElement r = s.firstChild().toElement(); ASSERT( r.tagName() == "TYPE" ); - QString result = r.firstChild().toText().data(); + TQString result = r.firstChild().toText().data(); str << " public "; bool async = result == "ASYNC"; if ( async) @@ -180,11 +180,11 @@ void generateStubImpl( const QString& idl, const QString& package, const QString r = r.nextSibling().toElement(); ASSERT ( r.tagName() == "NAME" ); - QString funcName = r.firstChild().toText().data(); + TQString funcName = r.firstChild().toText().data(); str << funcName << "("; - QStringList args; - QStringList argtypes; + TQStringList args; + TQStringList argtypes; bool first = TRUE; r = r.nextSibling().toElement(); for( ; !r.isNull(); r = r.nextSibling().toElement() ) { @@ -192,7 +192,7 @@ void generateStubImpl( const QString& idl, const QString& package, const QString str << ", "; first = FALSE; ASSERT( r.tagName() == "ARG" ); - QDomElement a = r.firstChild().toElement(); + TQDomElement a = r.firstChild().toElement(); ASSERT( a.tagName() == "TYPE" ); if ( a.hasAttribute( "qleft" ) ) str << javaLeftAttribute(a.attribute("qleft")) << " "; @@ -202,7 +202,7 @@ void generateStubImpl( const QString& idl, const QString& package, const QString str << javaRightAttribute(a.attribute("qright")) << " "; else str << " "; - args.append(QString("arg") + QString::number(args.count())) ; + args.append(TQString("arg") + TQString::number(args.count())) ; str << args.last(); } str << ")"; @@ -215,7 +215,7 @@ void generateStubImpl( const QString& idl, const QString& package, const QString funcName += "("; first = TRUE; - for( QStringList::Iterator it = argtypes.begin(); it != argtypes.end(); ++it ){ + for( TQStringList::Iterator it = argtypes.begin(); it != argtypes.end(); ++it ){ if ( !first ) funcName += ","; first = FALSE; @@ -230,7 +230,7 @@ void generateStubImpl( const QString& idl, const QString& package, const QString str << " try" << endl; str << " {" << endl; - QStringList::Iterator itt, ita; + TQStringList::Iterator itt, ita; for (itt = argtypes.begin(), ita = args.begin(); itt != argtypes.end(); ++itt, ++ita) str << " write_" << *itt << "(os, " << *ita << ");" << endl; } @@ -256,7 +256,7 @@ void generateStubImpl( const QString& idl, const QString& package, const QString str << " try" << endl; str << " {" << endl; - QStringList::Iterator itt, ita; + TQStringList::Iterator itt, ita; for (itt = argtypes.begin(), ita = args.begin(); itt != argtypes.end(); ++itt, ++ita) str << " write_" << underscore(*itt) << "(os, " << *ita << ");" << endl; diff --git a/dcopjava/tests/test.h b/dcopjava/tests/test.h index 5f215ce7..6eda69d3 100644 --- a/dcopjava/tests/test.h +++ b/dcopjava/tests/test.h @@ -2,8 +2,8 @@ #define _TEST_H_ -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <dcopobject.h> @@ -32,10 +32,10 @@ k_dcop: virtual float floatArg(float in) = 0; virtual double doubleArg(double in) = 0; - virtual QString stringArg(QString in) = 0; - virtual QStringList stringListArg(QStringList in) = 0; + virtual TQString stringArg(TQString in) = 0; + virtual TQStringList stringListArg(TQStringList in) = 0; - virtual QCString cstringArg(QCString in) = 0; + virtual TQCString cstringArg(TQCString in) = 0; virtual DCOPRef DCOPRefArg(DCOPRef in) = 0; diff --git a/dcopjava/tests/test_impl.cpp b/dcopjava/tests/test_impl.cpp index c220b3f8..2b031bcc 100644 --- a/dcopjava/tests/test_impl.cpp +++ b/dcopjava/tests/test_impl.cpp @@ -74,27 +74,27 @@ double test_impl::doubleArg(double in) } -QString test_impl::stringArg(QString in) +TQString test_impl::stringArg(TQString in) { - cout << "SERVER: QString in: " << in << endl; + cout << "SERVER: TQString in: " << in << endl; return "Hello Java"; } -QCString test_impl::cstringArg(QCString in) +TQCString test_impl::cstringArg(TQCString in) { - cout << "SERVER: QCString in: " << in << endl; + cout << "SERVER: TQCString in: " << in << endl; return "Hello Java"; } -QStringList test_impl::stringListArg(QStringList in) +TQStringList test_impl::stringListArg(TQStringList in) { - cout << "SERVER: QStringList in: "; + cout << "SERVER: TQStringList in: "; for (uint i=0; i<in.count(); ++i) cout << in[i] << ", "; cout << endl; - QStringList result; + TQStringList result; result << "one" << "two" << "three"; return result; } diff --git a/dcopjava/tests/test_impl.h b/dcopjava/tests/test_impl.h index 61986819..0c72536b 100644 --- a/dcopjava/tests/test_impl.h +++ b/dcopjava/tests/test_impl.h @@ -27,11 +27,11 @@ public: double doubleArg(double in); - QString stringArg(QString in); + TQString stringArg(TQString in); - QCString cstringArg(QCString in); + TQCString cstringArg(TQCString in); - QStringList stringListArg(QStringList in); + TQStringList stringListArg(TQStringList in); DCOPRef DCOPRefArg(DCOPRef in); diff --git a/dcoppython/shell/marshaller.cpp b/dcoppython/shell/marshaller.cpp index f2dd4d03..1aaebc38 100644 --- a/dcoppython/shell/marshaller.cpp +++ b/dcoppython/shell/marshaller.cpp @@ -13,13 +13,13 @@ #include "pcop.h" #include "importedmodules.h" -#include <qdatastream.h> +#include <tqdatastream.h> -#include <qrect.h> -#include <qfont.h> -#include <qcolor.h> -#include <qpointarray.h> -#include <qdatetime.h> +#include <tqrect.h> +#include <tqfont.h> +#include <tqcolor.h> +#include <tqpointarray.h> +#include <tqdatetime.h> #include <dcopref.h> #include <kurl.h> @@ -43,18 +43,18 @@ namespace PythonDCOP { bool Marshaller::marsh_private(const PCOPType &type, PyObject *obj, - QDataStream *str) const + TQDataStream *str) const { - QString ty = type.type(); + TQString ty = type.type(); - if (ty=="QStringList") - return marshalList(PCOPType("QString"), obj, str); + if (ty=="TQStringList") + return marshalList(PCOPType("TQString"), obj, str); if (ty=="QCStringList") - return marshalList(PCOPType("QCString"), obj, str); - if (ty=="QValueList" && type.leftType()) + return marshalList(PCOPType("TQCString"), obj, str); + if (ty=="TQValueList" && type.leftType()) return marshalList(*type.leftType(), obj, str); - if (ty=="QMap" && type.leftType() && type.rightType()) + if (ty=="TQMap" && type.leftType() && type.rightType()) return marshalDict(*type.leftType(), *type.rightType(), obj, str); if (!m_marsh_funcs.contains(ty)) return false; @@ -62,17 +62,17 @@ namespace PythonDCOP { } PyObject *Marshaller::demarsh_private(const PCOPType &type, - QDataStream *str) const + TQDataStream *str) const { - QString ty = type.type(); + TQString ty = type.type(); - if (ty=="QStringList") - return demarshalList(PCOPType("QString"), str); + if (ty=="TQStringList") + return demarshalList(PCOPType("TQString"), str); if (ty=="QCStringList") - return demarshalList(PCOPType("QCString"), str); - if (ty=="QValueList" && type.leftType()) + return demarshalList(PCOPType("TQCString"), str); + if (ty=="TQValueList" && type.leftType()) return demarshalList(*type.leftType(), str); - if (ty=="QMap" && type.leftType() && type.rightType()) + if (ty=="TQMap" && type.leftType() && type.rightType()) return demarshalDict(*type.leftType(), *type.rightType(), str); if (!m_demarsh_funcs.contains(ty)) { @@ -91,7 +91,7 @@ namespace PythonDCOP { bool Marshaller::marshalList(const PCOPType &list_type, PyObject *obj, - QDataStream *str) const { + TQDataStream *str) const { if (!PyList_Check(obj)) return false; int count = PyList_Size(obj); @@ -110,7 +110,7 @@ namespace PythonDCOP { } PyObject *Marshaller::demarshalList(const PCOPType &list_type, - QDataStream *str) const { + TQDataStream *str) const { Q_UINT32 count; (*str) >> count; @@ -124,7 +124,7 @@ namespace PythonDCOP { bool Marshaller::marshalDict(const PCOPType &key_type, const PCOPType &value_type, PyObject *obj, - QDataStream *str) const { + TQDataStream *str) const { if (!PyDict_Check(obj)) return false; @@ -149,7 +149,7 @@ namespace PythonDCOP { PyObject *Marshaller::demarshalDict(const PCOPType &key_type, const PCOPType &value_type, - QDataStream *str) const { + TQDataStream *str) const { PyObject *obj = PyDict_New(); Q_INT32 count; (*str) >> count; diff --git a/dcoppython/shell/marshaller.h b/dcoppython/shell/marshaller.h index 920afb05..0e678f7f 100644 --- a/dcoppython/shell/marshaller.h +++ b/dcoppython/shell/marshaller.h @@ -11,9 +11,9 @@ #ifndef __marshaller_h__ #define __marshaller_h__ -#include <qmap.h> +#include <tqmap.h> #include <Python.h> -#include <qstring.h> +#include <tqstring.h> class QDataStream; @@ -25,23 +25,23 @@ namespace PythonDCOP { public: Marshaller(); ~Marshaller(); - bool marshal(const PCOPType &type, PyObject *obj, QDataStream &str) const + bool marshal(const PCOPType &type, PyObject *obj, TQDataStream &str) const { return marsh_private(type,obj,&str); } bool canMarshal(const PCOPType &type, PyObject *obj) const { return marsh_private(type,obj,NULL); } - bool marshalList(const PCOPType &list_type, PyObject *obj, QDataStream *str) const; - PyObject *demarshal(const PCOPType &type, QDataStream &str) const + bool marshalList(const PCOPType &list_type, PyObject *obj, TQDataStream *str) const; + PyObject *demarshal(const PCOPType &type, TQDataStream &str) const { return demarsh_private(type, &str); } - PyObject *demarshalList(const PCOPType &list_type, QDataStream *str) const; + PyObject *demarshalList(const PCOPType &list_type, TQDataStream *str) const; bool marshalDict(const PCOPType &key_type, const PCOPType &value_type, - PyObject *obj, QDataStream *str) const; + PyObject *obj, TQDataStream *str) const; PyObject *demarshalDict(const PCOPType &key_type, const PCOPType &value_type, - QDataStream *str) const; + TQDataStream *str) const; static Marshaller *instance() { return m_instance; } protected: - QMap<QString,bool(*)(PyObject*,QDataStream*)> m_marsh_funcs; - QMap<QString,PyObject*(*)(QDataStream*)> m_demarsh_funcs; + TQMap<TQString,bool(*)(PyObject*,TQDataStream*)> m_marsh_funcs; + TQMap<TQString,PyObject*(*)(TQDataStream*)> m_demarsh_funcs; static Marshaller *m_instance; @@ -49,21 +49,21 @@ namespace PythonDCOP { private: bool marsh_private(const PCOPType &type, PyObject *obj, - QDataStream *str) const; + TQDataStream *str) const; PyObject *demarsh_private(const PCOPType &type, - QDataStream *str) const; + TQDataStream *str) const; }; -// bool marshall_bool(PyObject *obj, QDataStream *str); -// bool marshall_int(PyObject *obj, QDataStream *str); -// bool marshall_uint(PyObject *obj, QDataStream *str); -// bool marshall_double(PyObject *obj, QDataStream *str); -// bool marshall_QByteArray(PyObject *obj, QDataStream *str); -// bool marshall_QString(PyObject *obj, QDataStream *str); -// bool marshall_QCString(PyObject *obj, QDataStream *str); +// bool marshall_bool(PyObject *obj, TQDataStream *str); +// bool marshall_int(PyObject *obj, TQDataStream *str); +// bool marshall_uint(PyObject *obj, TQDataStream *str); +// bool marshall_double(PyObject *obj, TQDataStream *str); +// bool marshall_QByteArray(PyObject *obj, TQDataStream *str); +// bool marshall_QString(PyObject *obj, TQDataStream *str); +// bool marshall_QCString(PyObject *obj, TQDataStream *str); } diff --git a/dcoppython/shell/pcop.cpp b/dcoppython/shell/pcop.cpp index d7c4adc6..4989d863 100644 --- a/dcoppython/shell/pcop.cpp +++ b/dcoppython/shell/pcop.cpp @@ -13,12 +13,12 @@ #include <kdebug.h> -#include <qapplication.h> -#include <qcstring.h> -#include <qdatastream.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qstring.h> +#include <tqapplication.h> +#include <tqcstring.h> +#include <tqdatastream.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqstring.h> #include <dcopclient.h> @@ -36,7 +36,7 @@ namespace PythonDCOP { } PCOPObject::PCOPObject(PyObject *py_obj, const char *objid) : - DCOPObject(QCString(objid)), m_py_obj(py_obj) + DCOPObject(TQCString(objid)), m_py_obj(py_obj) { m_methods.setAutoDelete(true); } @@ -45,8 +45,8 @@ namespace PythonDCOP { { } - bool PCOPObject::process(const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData) + bool PCOPObject::process(const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData) { bool result = py_process(fun,data,replyType,replyData); if (PyErr_Occurred()) { @@ -59,8 +59,8 @@ namespace PythonDCOP { return result; } - bool PCOPObject::py_process(const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData) + bool PCOPObject::py_process(const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData) { kdDebug(70001) << "PCOPObject::process - fun=" << fun << " replyType=" << replyType << endl; @@ -79,7 +79,7 @@ namespace PythonDCOP { // return false; // } - QDataStream str_arg(data, IO_ReadOnly); + TQDataStream str_arg(data, IO_ReadOnly); PyObject *args = PyTuple_New( meth->paramCount() ); for(int c=0;c<meth->paramCount();c++) { kdDebug(70001) << "Demarshalling type: " << meth->param(c)->signature() << endl; @@ -118,7 +118,7 @@ namespace PythonDCOP { replyType = meth->type()->signature(); PCOPType repl(replyType); if (repl.isMarshallable(result)) { - QDataStream str_repl(replyData, IO_WriteOnly); + TQDataStream str_repl(replyData, IO_WriteOnly); repl.marshal(result,str_repl); Py_DECREF(result); return true; @@ -139,15 +139,15 @@ namespace PythonDCOP { } - bool PCOPObject::setMethodList(QAsciiDict<PyObject> meth_list) { + bool PCOPObject::setMethodList(TQAsciiDict<PyObject> meth_list) { bool ok = true; - for(QAsciiDictIterator<PyObject> it(meth_list); + for(TQAsciiDictIterator<PyObject> it(meth_list); it.current(); ++it) { PCOPMethod *meth = NULL; if (ok) { - meth = new PCOPMethod(QCString(it.currentKey())); + meth = new PCOPMethod(TQCString(it.currentKey())); if (!meth || !meth->setPythonMethod(it.current())) { if (meth) delete meth; @@ -167,10 +167,10 @@ namespace PythonDCOP { QCStringList PCOPObject::functions() { QCStringList funcs = DCOPObject::functions(); - for(QAsciiDictIterator<PCOPMethod> it(m_methods); + for(TQAsciiDictIterator<PCOPMethod> it(m_methods); it.current(); ++it) { PCOPMethod *meth = it.current(); - QCString func = meth->type()->signature(); + TQCString func = meth->type()->signature(); func += ' '; func += meth->signature(); funcs << func; @@ -184,7 +184,7 @@ namespace PythonDCOP { PyObject *PCOPObject::methodList() { PyObject *result = PyList_New(m_methods.count()); int c=0; - for(QAsciiDictIterator<PCOPMethod> it(m_methods); + for(TQAsciiDictIterator<PCOPMethod> it(m_methods); it.current(); ++it, ++c) { PyObject *tuple = PyTuple_New(2); PyList_SetItem(result, c, tuple); @@ -194,12 +194,12 @@ namespace PythonDCOP { return result; } - PCOPMethod *PCOPObject::matchMethod(const QCString &fun) { + PCOPMethod *PCOPObject::matchMethod(const TQCString &fun) { return m_methods.find(fun); } - PCOPType::PCOPType( const QCString& type ) + PCOPType::PCOPType( const TQCString& type ) { m_leftType = NULL; m_rightType = NULL; @@ -236,9 +236,9 @@ namespace PythonDCOP { if (m_rightType) delete m_rightType; } - QCString PCOPType::signature() const + TQCString PCOPType::signature() const { - QCString str = m_type; + TQCString str = m_type; if ( m_leftType ) { str += "<"; @@ -256,7 +256,7 @@ namespace PythonDCOP { return str; } - bool PCOPType::marshal( PyObject* obj, QDataStream& str ) const + bool PCOPType::marshal( PyObject* obj, TQDataStream& str ) const { return Marshaller::instance()->marshal(*this, obj, str); } @@ -266,12 +266,12 @@ namespace PythonDCOP { return Marshaller::instance()->canMarshal(*this, obj); } - PyObject* PCOPType::demarshal( QDataStream& str ) const + PyObject* PCOPType::demarshal( TQDataStream& str ) const { return Marshaller::instance()->demarshal(*this, str); } - PCOPMethod::PCOPMethod( const QCString& signature ) : + PCOPMethod::PCOPMethod( const TQCString& signature ) : m_py_method(NULL) { @@ -298,7 +298,7 @@ namespace PythonDCOP { m_name = signature.mid( k + 1, i - k - 1 ); // Strip the parameters - QCString p = signature.mid( i + 1, j - i - 1 ).stripWhiteSpace(); + TQCString p = signature.mid( i + 1, j - i - 1 ).stripWhiteSpace(); if ( !p.isEmpty() ) { // Make the algorithm terminate @@ -401,12 +401,12 @@ namespace PythonDCOP { { } - const PCOPMethod* PCOPClass::method( const QCString &name, PyObject *argTuple ) + const PCOPMethod* PCOPClass::method( const TQCString &name, PyObject *argTuple ) { if ( !argTuple ) return m_methods[ name ]; - QAsciiDictIterator<PCOPMethod> it( m_methods ); + TQAsciiDictIterator<PCOPMethod> it( m_methods ); for (; it.current(); ++it ) if ( it.currentKey() == name && it.current()->paramCount() == PyTuple_Size( argTuple ) ) @@ -440,7 +440,7 @@ namespace PythonDCOP { ImportedModules::setInstance( new ImportedModules ); int argc = 0; char **argv = NULL; - m_qapp = new QApplication(argc,argv,false); + m_qapp = new TQApplication(argc,argv,false); } Client::~Client() @@ -488,14 +488,14 @@ namespace PythonDCOP { if ( !PyTuple_Check( tuple ) ) return NULL; - QByteArray replyData; - QCString replyType; - QByteArray data; - QDataStream params( data, IO_WriteOnly ); + TQByteArray replyData; + TQCString replyType; + TQByteArray data; + TQDataStream params( data, IO_WriteOnly ); - QCString appname( arg1 ); - QCString objname( arg2 ); - QCString funcname( arg3 ); + TQCString appname( arg1 ); + TQCString objname( arg2 ); + TQCString funcname( arg3 ); // // Remove escape characters @@ -538,7 +538,7 @@ namespace PythonDCOP { return NULL; } - QCString signature = m->signature(); + TQCString signature = m->signature(); kdDebug(70001) << "The signature is " << signature.data() << endl; kdDebug(70001) << "The method takes " << m->paramCount() << " parameters" << endl; @@ -578,7 +578,7 @@ namespace PythonDCOP { // // ### Check wether that was sane PCOPType type( replyType ); - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); return type.demarshal( reply ); } @@ -601,7 +601,7 @@ namespace PythonDCOP { PyObject *object_list( PyObject */*self*/, PyObject *args) { const char *app; if (PyArg_ParseTuple(args, (char*)"s", &app)) { - QCStringList objects = Client::instance()->dcop()->remoteObjects(QCString(app)); + QCStringList objects = Client::instance()->dcop()->remoteObjects(TQCString(app)); return make_py_list(objects); } return NULL; @@ -610,7 +610,7 @@ namespace PythonDCOP { PyObject *method_list( PyObject */*self*/, PyObject *args) { const char *app, *obj; if (PyArg_ParseTuple(args, (char*)"ss", &app, &obj)) { - QCStringList methods = Client::instance()->dcop()->remoteFunctions(QCString(app), QCString(obj) ); + QCStringList methods = Client::instance()->dcop()->remoteFunctions(TQCString(app), TQCString(obj) ); return make_py_list(methods); } return NULL; @@ -620,7 +620,7 @@ namespace PythonDCOP { const char *appid; int add_pid = 1; if (PyArg_ParseTuple(args, (char*)"s|i", &appid, &add_pid)) { - QCString actual_appid = Client::instance()->dcop()->registerAs(QCString(appid), add_pid!=0); + TQCString actual_appid = Client::instance()->dcop()->registerAs(TQCString(appid), add_pid!=0); return PyString_FromString(actual_appid.data()); } return NULL; @@ -650,7 +650,7 @@ namespace PythonDCOP { PyList_Check(method_list)) { // extract each tuple from the list, aborting if any is invalid - QAsciiDict<PyObject> meth_list; + TQAsciiDict<PyObject> meth_list; int size = PyList_Size(method_list); for(int c=0;c<size;c++) { PyObject *tuple = PyList_GetItem(method_list,c); @@ -692,7 +692,7 @@ namespace PythonDCOP { int volint = 0; if (PyArg_ParseTuple(args, (char*)"sssss|i", &sender, &senderObj, &signal, &receiverObj, &slot, &volint)) { - bool success = Client::instance()->dcop()->connectDCOPSignal(QCString(sender), QCString(senderObj), QCString(signal), QCString(receiverObj), QCString(slot), (volint == 1)?true:false); + bool success = Client::instance()->dcop()->connectDCOPSignal(TQCString(sender), TQCString(senderObj), TQCString(signal), TQCString(receiverObj), TQCString(slot), (volint == 1)?true:false); return Py_BuildValue("i", success?1:0); } return NULL; @@ -706,7 +706,7 @@ namespace PythonDCOP { const char *slot; if (PyArg_ParseTuple(args, (char*)"sssss", &sender, &senderObj, &signal, &receiverObj, &slot)) { - bool success = Client::instance()->dcop()->disconnectDCOPSignal(QCString(sender), QCString(senderObj), QCString(signal), QCString(receiverObj), QCString(slot)); + bool success = Client::instance()->dcop()->disconnectDCOPSignal(TQCString(sender), TQCString(senderObj), TQCString(signal), TQCString(receiverObj), TQCString(slot)); return Py_BuildValue("i", success?1:0); } return NULL; diff --git a/dcoppython/shell/pcop.h b/dcoppython/shell/pcop.h index ecfe0f65..c9728e37 100644 --- a/dcoppython/shell/pcop.h +++ b/dcoppython/shell/pcop.h @@ -13,9 +13,9 @@ #include <Python.h> -#include <qcstring.h> -#include <qlist.h> -#include <qasciidict.h> +#include <tqcstring.h> +#include <tqlist.h> +#include <tqasciidict.h> #include <dcopclient.h> #include <dcopobject.h> @@ -58,7 +58,7 @@ namespace PythonDCOP { DCOPClient *m_dcop; // ImportedModules *m_module; static Client *s_instance; - QApplication *m_qapp; + TQApplication *m_qapp; }; /** @@ -85,7 +85,7 @@ namespace PythonDCOP { * Process method fun, whose arguments are marshalled in data. * Set replyType to be the reply type and marshall the reply data into replyData. */ - virtual bool process(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &replyData); + virtual bool process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData); /** * Return list of supported functions (methods). @@ -97,7 +97,7 @@ namespace PythonDCOP { * The key of the QT dictionary is the method signature; the data in * the dictionary is a pointer to the python method to which it corresponds. */ - virtual bool setMethodList(QAsciiDict<PyObject> meth_list); + virtual bool setMethodList(TQAsciiDict<PyObject> meth_list); /** * Returns the current list of methods, as set by setMethodList. @@ -108,10 +108,10 @@ namespace PythonDCOP { * Matches an 'incoming' method signature (fun) and returns a PCOPMethod pointer, * or NULL if none match. */ - PCOPMethod *matchMethod(const QCString &fun); + PCOPMethod *matchMethod(const TQCString &fun); private: - virtual bool py_process(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &replyData); + virtual bool py_process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData); /** * The Python object holding this CObject. @@ -121,7 +121,7 @@ namespace PythonDCOP { /** * The list of methods this object supports. */ - QAsciiDict<PCOPMethod> m_methods; + TQAsciiDict<PCOPMethod> m_methods; }; @@ -131,23 +131,23 @@ namespace PythonDCOP { class PCOPType { public: - PCOPType( const QCString& dcop_representation); + PCOPType( const TQCString& dcop_representation); ~PCOPType(); - QCString signature() const; + TQCString signature() const; - PyObject* demarshal( QDataStream& str ) const; - bool marshal( PyObject* obj, QDataStream& str ) const; + PyObject* demarshal( TQDataStream& str ) const; + bool marshal( PyObject* obj, TQDataStream& str ) const; // checks if the given PyObject can be marshalled as this PCOPType bool isMarshallable( PyObject *obj ) const; - const QCString &type() const { return m_type; } + const TQCString &type() const { return m_type; } const PCOPType *leftType() const { return m_leftType; } const PCOPType *rightType() const { return m_rightType; } // TODO: make these private - QCString m_type; + TQCString m_type; PCOPType* m_leftType; PCOPType* m_rightType; @@ -159,23 +159,23 @@ namespace PythonDCOP { class PCOPMethod { public: - PCOPMethod( const QCString& dcop_signature ); + PCOPMethod( const TQCString& dcop_signature ); ~PCOPMethod(); int paramCount() const; -// QCString signature() const; -// QCString name() const; +// TQCString signature() const; +// TQCString name() const; PCOPType* param( int ); const PCOPType* param( int ) const; bool setPythonMethod(PyObject *py_method); PyObject *pythonMethod() const { return m_py_method; } - const QCString &signature() const { return m_signature; } - const QCString &name() const { return m_name; } + const TQCString &signature() const { return m_signature; } + const TQCString &name() const { return m_name; } const PCOPType *type() const { return m_type; } - QCString m_signature; - QCString m_name; + TQCString m_signature; + TQCString m_name; PCOPType* m_type; QList<PCOPType> m_params; private: @@ -191,10 +191,10 @@ namespace PythonDCOP { PCOPClass( const QCStringList& dcop_style_methods); ~PCOPClass(); - const PCOPMethod* method( const QCString &name, PyObject *argTuple = 0 ); + const PCOPMethod* method( const TQCString &name, PyObject *argTuple = 0 ); QCStringList m_ifaces; - QAsciiDict<PCOPMethod> m_methods; + TQAsciiDict<PCOPMethod> m_methods; }; } diff --git a/dcoppython/test/dcopserver/kdedcoptest.cpp b/dcoppython/test/dcopserver/kdedcoptest.cpp index 3046eaac..e7c8b49a 100644 --- a/dcoppython/test/dcopserver/kdedcoptest.cpp +++ b/dcoppython/test/dcopserver/kdedcoptest.cpp @@ -4,7 +4,7 @@ #include "kdedcoptest.h" -#include <qlabel.h> +#include <tqlabel.h> #include <kmainwindow.h> #include <klocale.h> @@ -15,7 +15,7 @@ KDEDcopTest::KDEDcopTest() // set the shell's ui resource file //setXMLFile("kdedcoptestui.rc"); - //new QLabel( "Hello World", this, "hello label" ); + //new TQLabel( "Hello World", this, "hello label" ); m_mainClass = new MainClass(); } diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index c81668ca..146bdb9d 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -362,7 +362,7 @@ sub parseFiles || croak "Can't preprocess $currentfile"; } else { - open( INPUT, "$currentfile" ) + open( INPUT, "tqt-replace-stream $currentfile |" ) || croak "Can't read from $currentfile"; } diff --git a/kdejava/koala/kdejava/BrowserExtension.cpp b/kdejava/koala/kdejava/BrowserExtension.cpp index 1b0e08f4..0a744c1e 100644 --- a/kdejava/koala/kdejava/BrowserExtension.cpp +++ b/kdejava/koala/kdejava/BrowserExtension.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include <kparts/browserextension.h> -#include <qdatastream.h> -#include <qstring.h> -#include <qpoint.h> +#include <tqdatastream.h> +#include <tqstring.h> +#include <tqpoint.h> #include <kurl.h> #include <qtjava/QtSupport.h> @@ -20,51 +20,51 @@ public: } return; } - void removeChild(QObject* arg1) { - if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.QObject")) { - QObject::removeChild(arg1); + void removeChild(TQObject* arg1) { + if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.TQObject")) { + TQObject::removeChild(arg1); } return; } - void restoreState(QDataStream& arg1) { - if (!QtSupport::eventDelegate(this,"restoreState",(void*)&arg1,"org.kde.qt.QDataStream")) { + void restoreState(TQDataStream& arg1) { + if (!QtSupport::eventDelegate(this,"restoreState",(void*)&arg1,"org.kde.qt.TQDataStream")) { BrowserExtension::restoreState(arg1); } return; } - void customEvent(QCustomEvent* arg1) { - if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.kde.qt.QCustomEvent")) { - QObject::customEvent(arg1); + void customEvent(TQCustomEvent* arg1) { + if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.kde.qt.TQCustomEvent")) { + TQObject::customEvent(arg1); } return; } - void timerEvent(QTimerEvent* arg1) { - if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.kde.qt.QTimerEvent")) { - QObject::timerEvent(arg1); + void timerEvent(TQTimerEvent* arg1) { + if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.kde.qt.TQTimerEvent")) { + TQObject::timerEvent(arg1); } return; } - void childEvent(QChildEvent* arg1) { - if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.kde.qt.QChildEvent")) { - QObject::childEvent(arg1); + void childEvent(TQChildEvent* arg1) { + if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.kde.qt.TQChildEvent")) { + TQObject::childEvent(arg1); } return; } - void saveState(QDataStream& arg1) { - if (!QtSupport::eventDelegate(this,"saveState",(void*)&arg1,"org.kde.qt.QDataStream")) { + void saveState(TQDataStream& arg1) { + if (!QtSupport::eventDelegate(this,"saveState",(void*)&arg1,"org.kde.qt.TQDataStream")) { BrowserExtension::saveState(arg1); } return; } - void insertChild(QObject* arg1) { - if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.kde.qt.QObject")) { - QObject::insertChild(arg1); + void insertChild(TQObject* arg1) { + if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.kde.qt.TQObject")) { + TQObject::insertChild(arg1); } return; } - bool eventFilter(QObject* object,QEvent* event) { + bool eventFilter(TQObject* object,TQEvent* event) { if (!QtSupport::eventFilterDelegate(this,"org.kde.koala.BrowserExtension",object,event)) { - return QObject::eventFilter(object,event); + return TQObject::eventFilter(object,event); } else { return TRUE; } @@ -74,8 +74,8 @@ public: JNIEXPORT jstring JNICALL Java_org_kde_koala_BrowserExtension_actionText(JNIEnv* env, jobject obj, jstring name) { - QString _qstring; -static QCString* _qstring_name = 0; + TQString _qstring; +static TQCString* _qstring_name = 0; _qstring = ((KParts::BrowserExtension*) QtSupport::getQt(env, obj))->actionText((const char*) QtSupport::toCharString(env, name, &_qstring_name)); return QtSupport::fromQString(env, &_qstring); } @@ -91,7 +91,7 @@ JNIEXPORT jobject JNICALL Java_org_kde_koala_BrowserExtension_childObject(JNIEnv* env, jclass cls, jobject arg1) { (void) cls; - jobject xret = QtSupport::objectForQtKey(env, (void*)BrowserExtensionJBridge::childObject((QObject*) QtSupport::getQt(env, arg1)), "org.kde.koala.BrowserExtension"); + jobject xret = QtSupport::objectForQtKey(env, (void*)BrowserExtensionJBridge::childObject((TQObject*) QtSupport::getQt(env, arg1)), "org.kde.koala.BrowserExtension"); return xret; } @@ -106,7 +106,7 @@ Java_org_kde_koala_BrowserExtension_className(JNIEnv* env, jobject obj) JNIEXPORT jboolean JNICALL Java_org_kde_koala_BrowserExtension_isActionEnabled(JNIEnv* env, jobject obj, jstring name) { -static QCString* _qstring_name = 0; +static TQCString* _qstring_name = 0; jboolean xret = (jboolean) ((KParts::BrowserExtension*) QtSupport::getQt(env, obj))->isActionEnabled((const char*) QtSupport::toCharString(env, name, &_qstring_name)); return xret; } @@ -121,7 +121,7 @@ Java_org_kde_koala_BrowserExtension_isURLDropHandlingEnabled(JNIEnv* env, jobjec JNIEXPORT jobject JNICALL Java_org_kde_koala_BrowserExtension_metaObject(JNIEnv* env, jobject obj) { - jobject xret = QtSupport::objectForQtKey(env, (void*)((KParts::BrowserExtension*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.QMetaObject"); + jobject xret = QtSupport::objectForQtKey(env, (void*)((KParts::BrowserExtension*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.TQMetaObject"); return xret; } @@ -138,7 +138,7 @@ Java_org_kde_koala_BrowserExtension_newBrowserExtension__Lorg_kde_koala_ReadOnly JNIEXPORT void JNICALL Java_org_kde_koala_BrowserExtension_newBrowserExtension__Lorg_kde_koala_ReadOnlyPart_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject parent, jstring name) { -static QCString* _qstring_name = 0; +static TQCString* _qstring_name = 0; if (QtSupport::getQt(env, obj) == 0) { QtSupport::setQt(env, obj, new BrowserExtensionJBridge((KParts::ReadOnlyPart*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name))); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); @@ -156,14 +156,14 @@ Java_org_kde_koala_BrowserExtension_pasteRequest(JNIEnv* env, jobject obj) JNIEXPORT void JNICALL Java_org_kde_koala_BrowserExtension_restoreState(JNIEnv* env, jobject obj, jobject stream) { - ((KParts::BrowserExtension*) QtSupport::getQt(env, obj))->restoreState((QDataStream&)*(QDataStream*) QtSupport::getQt(env, stream)); + ((KParts::BrowserExtension*) QtSupport::getQt(env, obj))->restoreState((TQDataStream&)*(TQDataStream*) QtSupport::getQt(env, stream)); return; } JNIEXPORT void JNICALL Java_org_kde_koala_BrowserExtension_saveState(JNIEnv* env, jobject obj, jobject stream) { - ((KParts::BrowserExtension*) QtSupport::getQt(env, obj))->saveState((QDataStream&)*(QDataStream*) QtSupport::getQt(env, stream)); + ((KParts::BrowserExtension*) QtSupport::getQt(env, obj))->saveState((TQDataStream&)*(TQDataStream*) QtSupport::getQt(env, stream)); return; } diff --git a/kdejava/koala/kdejava/BrowserHostExtension.cpp b/kdejava/koala/kdejava/BrowserHostExtension.cpp index 610f5a5f..1af30806 100644 --- a/kdejava/koala/kdejava/BrowserHostExtension.cpp +++ b/kdejava/koala/kdejava/BrowserHostExtension.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include <kparts/browserextension.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kurl.h> #include <qtjava/QtSupport.h> @@ -13,39 +13,39 @@ class BrowserHostExtensionJBridge : public KParts::BrowserHostExtension public: BrowserHostExtensionJBridge(KParts::ReadOnlyPart* arg1,const char* arg2) : KParts::BrowserHostExtension(arg1,arg2) {}; BrowserHostExtensionJBridge(KParts::ReadOnlyPart* arg1) : KParts::BrowserHostExtension(arg1) {}; - void removeChild(QObject* arg1) { - if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.QObject")) { - QObject::removeChild(arg1); + void removeChild(TQObject* arg1) { + if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.TQObject")) { + TQObject::removeChild(arg1); } return; } - void customEvent(QCustomEvent* arg1) { - if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.kde.qt.QCustomEvent")) { - QObject::customEvent(arg1); + void customEvent(TQCustomEvent* arg1) { + if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.kde.qt.TQCustomEvent")) { + TQObject::customEvent(arg1); } return; } - void timerEvent(QTimerEvent* arg1) { - if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.kde.qt.QTimerEvent")) { - QObject::timerEvent(arg1); + void timerEvent(TQTimerEvent* arg1) { + if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.kde.qt.TQTimerEvent")) { + TQObject::timerEvent(arg1); } return; } - void childEvent(QChildEvent* arg1) { - if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.kde.qt.QChildEvent")) { - QObject::childEvent(arg1); + void childEvent(TQChildEvent* arg1) { + if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.kde.qt.TQChildEvent")) { + TQObject::childEvent(arg1); } return; } - void insertChild(QObject* arg1) { - if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.kde.qt.QObject")) { - QObject::insertChild(arg1); + void insertChild(TQObject* arg1) { + if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.kde.qt.TQObject")) { + TQObject::insertChild(arg1); } return; } - bool eventFilter(QObject* object,QEvent* event) { + bool eventFilter(TQObject* object,TQEvent* event) { if (!QtSupport::eventFilterDelegate(this,"org.kde.koala.BrowserHostExtension",object,event)) { - return QObject::eventFilter(object,event); + return TQObject::eventFilter(object,event); } else { return TRUE; } @@ -56,7 +56,7 @@ JNIEXPORT jobject JNICALL Java_org_kde_koala_BrowserHostExtension_childObject(JNIEnv* env, jclass cls, jobject arg1) { (void) cls; - jobject xret = QtSupport::objectForQtKey(env, (void*)BrowserHostExtensionJBridge::childObject((QObject*) QtSupport::getQt(env, arg1)), "org.kde.koala.BrowserHostExtension"); + jobject xret = QtSupport::objectForQtKey(env, (void*)BrowserHostExtensionJBridge::childObject((TQObject*) QtSupport::getQt(env, arg1)), "org.kde.koala.BrowserHostExtension"); return xret; } @@ -71,23 +71,23 @@ Java_org_kde_koala_BrowserHostExtension_className(JNIEnv* env, jobject obj) JNIEXPORT jobject JNICALL Java_org_kde_koala_BrowserHostExtension_findFrameParent(JNIEnv* env, jobject obj, jobject callingPart, jstring frame) { -static QString* _qstring_frame = 0; - jobject xret = QtSupport::objectForQtKey(env, (void*)((KParts::BrowserHostExtension*) QtSupport::getQt(env, obj))->findFrameParent((KParts::ReadOnlyPart*) QtSupport::getQt(env, callingPart), (const QString&)*(QString*) QtSupport::toQString(env, frame, &_qstring_frame)), "org.kde.koala.BrowserHostExtension"); +static TQString* _qstring_frame = 0; + jobject xret = QtSupport::objectForQtKey(env, (void*)((KParts::BrowserHostExtension*) QtSupport::getQt(env, obj))->findFrameParent((KParts::ReadOnlyPart*) QtSupport::getQt(env, callingPart), (const TQString&)*(TQString*) QtSupport::toQString(env, frame, &_qstring_frame)), "org.kde.koala.BrowserHostExtension"); return xret; } JNIEXPORT jobject JNICALL Java_org_kde_koala_BrowserHostExtension_frameNames(JNIEnv* env, jobject obj) { - QStringList _qlist; + TQStringList _qlist; _qlist = ((KParts::BrowserHostExtension*) QtSupport::getQt(env, obj))->frameNames(); - return (jobject) QtSupport::arrayWithQStringList(env, (QStringList*) &_qlist); + return (jobject) QtSupport::arrayWithQStringList(env, (TQStringList*) &_qlist); } JNIEXPORT jobject JNICALL Java_org_kde_koala_BrowserHostExtension_metaObject(JNIEnv* env, jobject obj) { - jobject xret = QtSupport::objectForQtKey(env, (void*)((KParts::BrowserHostExtension*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.QMetaObject"); + jobject xret = QtSupport::objectForQtKey(env, (void*)((KParts::BrowserHostExtension*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.TQMetaObject"); return xret; } @@ -104,7 +104,7 @@ Java_org_kde_koala_BrowserHostExtension_newBrowserHostExtension__Lorg_kde_koala_ JNIEXPORT void JNICALL Java_org_kde_koala_BrowserHostExtension_newBrowserHostExtension__Lorg_kde_koala_ReadOnlyPart_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject parent, jstring name) { -static QCString* _qstring_name = 0; +static TQCString* _qstring_name = 0; if (QtSupport::getQt(env, obj) == 0) { QtSupport::setQt(env, obj, new BrowserHostExtensionJBridge((KParts::ReadOnlyPart*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name))); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); diff --git a/kdejava/koala/kdejava/BrowserRun.cpp b/kdejava/koala/kdejava/BrowserRun.cpp index 33841427..f27c8fd7 100644 --- a/kdejava/koala/kdejava/BrowserRun.cpp +++ b/kdejava/koala/kdejava/BrowserRun.cpp @@ -2,7 +2,7 @@ #include <kservice.h> #include <kparts/browserrun.h> #include <kparts/browserextension.h> -#include <qstring.h> +#include <tqstring.h> #include <kurl.h> #include <qtjava/QtSupport.h> @@ -12,8 +12,8 @@ class BrowserRunJBridge : public KParts::BrowserRun { public: - BrowserRunJBridge(const KURL& arg1,const KParts::URLArgs& arg2,KParts::ReadOnlyPart* arg3,QWidget* arg4,bool arg5,bool arg6) : KParts::BrowserRun(arg1,arg2,arg3,arg4,arg5,arg6) {}; - BrowserRunJBridge(const KURL& arg1,const KParts::URLArgs& arg2,KParts::ReadOnlyPart* arg3,QWidget* arg4,bool arg5,bool arg6,bool arg7) : KParts::BrowserRun(arg1,arg2,arg3,arg4,arg5,arg6,arg7) {}; + BrowserRunJBridge(const KURL& arg1,const KParts::URLArgs& arg2,KParts::ReadOnlyPart* arg3,TQWidget* arg4,bool arg5,bool arg6) : KParts::BrowserRun(arg1,arg2,arg3,arg4,arg5,arg6) {}; + BrowserRunJBridge(const KURL& arg1,const KParts::URLArgs& arg2,KParts::ReadOnlyPart* arg3,TQWidget* arg4,bool arg5,bool arg6,bool arg7) : KParts::BrowserRun(arg1,arg2,arg3,arg4,arg5,arg6,arg7) {}; void protected_scanFile() { KParts::BrowserRun::scanFile(); return; @@ -30,7 +30,7 @@ public: KParts::BrowserRun::slotBrowserScanFinished(arg1); return; } - void protected_slotBrowserMimetype(KIO::Job* arg1,const QString& arg2) { + void protected_slotBrowserMimetype(KIO::Job* arg1,const TQString& arg2) { KParts::BrowserRun::slotBrowserMimetype(arg1,arg2); return; } @@ -54,27 +54,27 @@ public: } return; } - void removeChild(QObject* arg1) { - if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.QObject")) { - QObject::removeChild(arg1); + void removeChild(TQObject* arg1) { + if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.TQObject")) { + TQObject::removeChild(arg1); } return; } - void customEvent(QCustomEvent* arg1) { - if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.kde.qt.QCustomEvent")) { - QObject::customEvent(arg1); + void customEvent(TQCustomEvent* arg1) { + if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.kde.qt.TQCustomEvent")) { + TQObject::customEvent(arg1); } return; } - void timerEvent(QTimerEvent* arg1) { - if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.kde.qt.QTimerEvent")) { - QObject::timerEvent(arg1); + void timerEvent(TQTimerEvent* arg1) { + if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.kde.qt.TQTimerEvent")) { + TQObject::timerEvent(arg1); } return; } - void childEvent(QChildEvent* arg1) { - if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.kde.qt.QChildEvent")) { - QObject::childEvent(arg1); + void childEvent(TQChildEvent* arg1) { + if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.kde.qt.TQChildEvent")) { + TQObject::childEvent(arg1); } return; } @@ -90,9 +90,9 @@ public: } return; } - void insertChild(QObject* arg1) { - if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.kde.qt.QObject")) { - QObject::insertChild(arg1); + void insertChild(TQObject* arg1) { + if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.kde.qt.TQObject")) { + TQObject::insertChild(arg1); } return; } @@ -102,9 +102,9 @@ public: } return; } - bool eventFilter(QObject* object,QEvent* event) { + bool eventFilter(TQObject* object,TQEvent* event) { if (!QtSupport::eventFilterDelegate(this,"org.kde.koala.BrowserRun",object,event)) { - return QObject::eventFilter(object,event); + return TQObject::eventFilter(object,event); } else { return TRUE; } @@ -115,8 +115,8 @@ JNIEXPORT jboolean JNICALL Java_org_kde_koala_BrowserRun_allowExecution(JNIEnv* env, jclass cls, jstring serviceType, jobject url) { (void) cls; -static QString* _qstring_serviceType = 0; - jboolean xret = (jboolean) BrowserRunJBridge::allowExecution((const QString&)*(QString*) QtSupport::toQString(env, serviceType, &_qstring_serviceType), (const KURL&)*(const KURL*) QtSupport::getQt(env, url)); +static TQString* _qstring_serviceType = 0; + jboolean xret = (jboolean) BrowserRunJBridge::allowExecution((const TQString&)*(TQString*) QtSupport::toQString(env, serviceType, &_qstring_serviceType), (const KURL&)*(const KURL*) QtSupport::getQt(env, url)); return xret; } @@ -153,8 +153,8 @@ JNIEXPORT jboolean JNICALL Java_org_kde_koala_BrowserRun_isExecutable(JNIEnv* env, jclass cls, jstring serviceType) { (void) cls; -static QString* _qstring_serviceType = 0; - jboolean xret = (jboolean) BrowserRunJBridge::isExecutable((const QString&)*(QString*) QtSupport::toQString(env, serviceType, &_qstring_serviceType)); +static TQString* _qstring_serviceType = 0; + jboolean xret = (jboolean) BrowserRunJBridge::isExecutable((const TQString&)*(TQString*) QtSupport::toQString(env, serviceType, &_qstring_serviceType)); return xret; } @@ -162,15 +162,15 @@ JNIEXPORT jboolean JNICALL Java_org_kde_koala_BrowserRun_isTextExecutable(JNIEnv* env, jclass cls, jstring serviceType) { (void) cls; -static QString* _qstring_serviceType = 0; - jboolean xret = (jboolean) BrowserRunJBridge::isTextExecutable((const QString&)*(QString*) QtSupport::toQString(env, serviceType, &_qstring_serviceType)); +static TQString* _qstring_serviceType = 0; + jboolean xret = (jboolean) BrowserRunJBridge::isTextExecutable((const TQString&)*(TQString*) QtSupport::toQString(env, serviceType, &_qstring_serviceType)); return xret; } JNIEXPORT jobject JNICALL Java_org_kde_koala_BrowserRun_metaObject(JNIEnv* env, jobject obj) { - jobject xret = QtSupport::objectForQtKey(env, (void*)((KParts::BrowserRun*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.QMetaObject"); + jobject xret = QtSupport::objectForQtKey(env, (void*)((KParts::BrowserRun*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.TQMetaObject"); return xret; } @@ -178,7 +178,7 @@ JNIEXPORT void JNICALL Java_org_kde_koala_BrowserRun_newBrowserRun__Lorg_kde_koala_KURL_2Lorg_kde_koala_URLArgs_2Lorg_kde_koala_ReadOnlyPart_2Lorg_kde_qt_QWidget_2ZZ(JNIEnv* env, jobject obj, jobject url, jobject args, jobject part, jobject window, jboolean removeReferrer, jboolean trustedSource) { if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new BrowserRunJBridge((const KURL&)*(const KURL*) QtSupport::getQt(env, url), (const KParts::URLArgs&)*(const KParts::URLArgs*) QtSupport::getQt(env, args), (KParts::ReadOnlyPart*) QtSupport::getQt(env, part), (QWidget*) QtSupport::getQt(env, window), (bool) removeReferrer, (bool) trustedSource)); + QtSupport::setQt(env, obj, new BrowserRunJBridge((const KURL&)*(const KURL*) QtSupport::getQt(env, url), (const KParts::URLArgs&)*(const KParts::URLArgs*) QtSupport::getQt(env, args), (KParts::ReadOnlyPart*) QtSupport::getQt(env, part), (TQWidget*) QtSupport::getQt(env, window), (bool) removeReferrer, (bool) trustedSource)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -188,7 +188,7 @@ JNIEXPORT void JNICALL Java_org_kde_koala_BrowserRun_newBrowserRun__Lorg_kde_koala_KURL_2Lorg_kde_koala_URLArgs_2Lorg_kde_koala_ReadOnlyPart_2Lorg_kde_qt_QWidget_2ZZZ(JNIEnv* env, jobject obj, jobject url, jobject args, jobject part, jobject window, jboolean removeReferrer, jboolean trustedSource, jboolean hideErrorDialog) { if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new BrowserRunJBridge((const KURL&)*(const KURL*) QtSupport::getQt(env, url), (const KParts::URLArgs&)*(const KParts::URLArgs*) QtSupport::getQt(env, args), (KParts::ReadOnlyPart*) QtSupport::getQt(env, part), (QWidget*) QtSupport::getQt(env, window), (bool) removeReferrer, (bool) trustedSource, (bool) hideErrorDialog)); + QtSupport::setQt(env, obj, new BrowserRunJBridge((const KURL&)*(const KURL*) QtSupport::getQt(env, url), (const KParts::URLArgs&)*(const KParts::URLArgs*) QtSupport::getQt(env, args), (KParts::ReadOnlyPart*) QtSupport::getQt(env, part), (TQWidget*) QtSupport::getQt(env, window), (bool) removeReferrer, (bool) trustedSource, (bool) hideErrorDialog)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -197,8 +197,8 @@ Java_org_kde_koala_BrowserRun_newBrowserRun__Lorg_kde_koala_KURL_2Lorg_kde_koala JNIEXPORT void JNICALL Java_org_kde_koala_BrowserRun_save(JNIEnv* env, jobject obj, jobject url, jstring suggestedFilename) { -static QString* _qstring_suggestedFilename = 0; - ((KParts::BrowserRun*) QtSupport::getQt(env, obj))->save((const KURL&)*(const KURL*) QtSupport::getQt(env, url), (const QString&)*(QString*) QtSupport::toQString(env, suggestedFilename, &_qstring_suggestedFilename)); +static TQString* _qstring_suggestedFilename = 0; + ((KParts::BrowserRun*) QtSupport::getQt(env, obj))->save((const KURL&)*(const KURL*) QtSupport::getQt(env, url), (const TQString&)*(TQString*) QtSupport::toQString(env, suggestedFilename, &_qstring_suggestedFilename)); return; } @@ -213,8 +213,8 @@ JNIEXPORT void JNICALL Java_org_kde_koala_BrowserRun_simpleSave__Lorg_kde_koala_KURL_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobject url, jstring suggestedFilename) { (void) cls; -static QString* _qstring_suggestedFilename = 0; - BrowserRunJBridge::simpleSave((const KURL&)*(const KURL*) QtSupport::getQt(env, url), (const QString&)*(QString*) QtSupport::toQString(env, suggestedFilename, &_qstring_suggestedFilename)); +static TQString* _qstring_suggestedFilename = 0; + BrowserRunJBridge::simpleSave((const KURL&)*(const KURL*) QtSupport::getQt(env, url), (const TQString&)*(TQString*) QtSupport::toQString(env, suggestedFilename, &_qstring_suggestedFilename)); return; } @@ -222,16 +222,16 @@ JNIEXPORT void JNICALL Java_org_kde_koala_BrowserRun_simpleSave__Lorg_kde_koala_KURL_2Ljava_lang_String_2Lorg_kde_qt_QWidget_2(JNIEnv* env, jclass cls, jobject url, jstring suggestedFilename, jobject window) { (void) cls; -static QString* _qstring_suggestedFilename = 0; - BrowserRunJBridge::simpleSave((const KURL&)*(const KURL*) QtSupport::getQt(env, url), (const QString&)*(QString*) QtSupport::toQString(env, suggestedFilename, &_qstring_suggestedFilename), (QWidget*) QtSupport::getQt(env, window)); +static TQString* _qstring_suggestedFilename = 0; + BrowserRunJBridge::simpleSave((const KURL&)*(const KURL*) QtSupport::getQt(env, url), (const TQString&)*(TQString*) QtSupport::toQString(env, suggestedFilename, &_qstring_suggestedFilename), (TQWidget*) QtSupport::getQt(env, window)); return; } JNIEXPORT void JNICALL Java_org_kde_koala_BrowserRun_slotBrowserMimetype(JNIEnv* env, jobject obj, jobject job, jstring type) { -static QString* _qstring_type = 0; - ((BrowserRunJBridge*) QtSupport::getQt(env, obj))->protected_slotBrowserMimetype((KIO::Job*) QtSupport::getQt(env, job), (const QString&)*(QString*) QtSupport::toQString(env, type, &_qstring_type)); +static TQString* _qstring_type = 0; + ((BrowserRunJBridge*) QtSupport::getQt(env, obj))->protected_slotBrowserMimetype((KIO::Job*) QtSupport::getQt(env, job), (const TQString&)*(TQString*) QtSupport::toQString(env, type, &_qstring_type)); return; } @@ -259,7 +259,7 @@ Java_org_kde_koala_BrowserRun_slotStatResult(JNIEnv* env, jobject obj, jobject j JNIEXPORT jstring JNICALL Java_org_kde_koala_BrowserRun_suggestedFilename(JNIEnv* env, jobject obj) { - QString _qstring; + TQString _qstring; _qstring = ((KParts::BrowserRun*) QtSupport::getQt(env, obj))->suggestedFilename(); return QtSupport::fromQString(env, &_qstring); } diff --git a/kdejava/koala/kdejava/Connection.cpp b/kdejava/koala/kdejava/Connection.cpp index 8b7b92d2..67e1c047 100644 --- a/kdejava/koala/kdejava/Connection.cpp +++ b/kdejava/koala/kdejava/Connection.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include <kio/connection.h> -#include <qcstring.h> +#include <tqcstring.h> #include <qtjava/QtSupport.h> #include <kdejava/KDESupport.h> @@ -14,39 +14,39 @@ public: KIO::Connection::dequeue(); return; } - void removeChild(QObject* arg1) { - if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.QObject")) { - QObject::removeChild(arg1); + void removeChild(TQObject* arg1) { + if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.TQObject")) { + TQObject::removeChild(arg1); } return; } - void customEvent(QCustomEvent* arg1) { - if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.kde.qt.QCustomEvent")) { - QObject::customEvent(arg1); + void customEvent(TQCustomEvent* arg1) { + if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.kde.qt.TQCustomEvent")) { + TQObject::customEvent(arg1); } return; } - void timerEvent(QTimerEvent* arg1) { - if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.kde.qt.QTimerEvent")) { - QObject::timerEvent(arg1); + void timerEvent(TQTimerEvent* arg1) { + if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.kde.qt.TQTimerEvent")) { + TQObject::timerEvent(arg1); } return; } - void childEvent(QChildEvent* arg1) { - if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.kde.qt.QChildEvent")) { - QObject::childEvent(arg1); + void childEvent(TQChildEvent* arg1) { + if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.kde.qt.TQChildEvent")) { + TQObject::childEvent(arg1); } return; } - void insertChild(QObject* arg1) { - if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.kde.qt.QObject")) { - QObject::insertChild(arg1); + void insertChild(TQObject* arg1) { + if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.kde.qt.TQObject")) { + TQObject::insertChild(arg1); } return; } - bool eventFilter(QObject* object,QEvent* event) { + bool eventFilter(TQObject* object,TQEvent* event) { if (!QtSupport::eventFilterDelegate(this,"org.kde.koala.Connection",object,event)) { - return QObject::eventFilter(object,event); + return TQObject::eventFilter(object,event); } else { return TRUE; } @@ -78,14 +78,14 @@ Java_org_kde_koala_Connection_connect__(JNIEnv* env, jobject obj) JNIEXPORT void JNICALL Java_org_kde_koala_Connection_connect__Lorg_kde_qt_QObject_2(JNIEnv* env, jobject obj, jobject receiver) { - ((KIO::Connection*) QtSupport::getQt(env, obj))->connect((QObject*) QtSupport::getQt(env, receiver)); + ((KIO::Connection*) QtSupport::getQt(env, obj))->connect((TQObject*) QtSupport::getQt(env, receiver)); return; } JNIEXPORT void JNICALL Java_org_kde_koala_Connection_connect__Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject receiver, jstring member) { - ((KIO::Connection*) QtSupport::getQt(env, obj))->connect((QObject*) QtSupport::slotForReceiver(env, receiver, member), "1invoke()"); + ((KIO::Connection*) QtSupport::getQt(env, obj))->connect((TQObject*) QtSupport::slotForReceiver(env, receiver, member), "1invoke()"); return; } @@ -127,7 +127,7 @@ Java_org_kde_koala_Connection_inited(JNIEnv* env, jobject obj) JNIEXPORT jobject JNICALL Java_org_kde_koala_Connection_metaObject(JNIEnv* env, jobject obj) { - jobject xret = QtSupport::objectForQtKey(env, (void*)((KIO::Connection*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.QMetaObject"); + jobject xret = QtSupport::objectForQtKey(env, (void*)((KIO::Connection*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.TQMetaObject"); return xret; } @@ -145,8 +145,8 @@ JNIEXPORT jint JNICALL Java_org_kde_koala_Connection_read(JNIEnv* env, jobject obj, jintArray _cmd, jbyteArray data) { int* _int__cmd = QtSupport::toIntPtr(env, _cmd); -static QByteArray* _qbyteArray_data = 0; - jint xret = (jint) ((KIO::Connection*) QtSupport::getQt(env, obj))->read( (int*) _int__cmd, (QByteArray&)*(QByteArray*) QtSupport::toQByteArray(env, data, &_qbyteArray_data)); +static TQByteArray* _qbyteArray_data = 0; + jint xret = (jint) ((KIO::Connection*) QtSupport::getQt(env, obj))->read( (int*) _int__cmd, (TQByteArray&)*(TQByteArray*) QtSupport::toQByteArray(env, data, &_qbyteArray_data)); env->SetIntArrayRegion(_cmd, 0, 1, (jint *) _int__cmd); return xret; } @@ -168,16 +168,16 @@ Java_org_kde_koala_Connection_send__I(JNIEnv* env, jobject obj, jint cmd) JNIEXPORT void JNICALL Java_org_kde_koala_Connection_send__I_3B(JNIEnv* env, jobject obj, jint cmd, jbyteArray arr) { -static QByteArray* _qbyteArray_arr = 0; - ((KIO::Connection*) QtSupport::getQt(env, obj))->send((int) cmd, (const QByteArray&)*(QByteArray*) QtSupport::toQByteArray(env, arr, &_qbyteArray_arr)); +static TQByteArray* _qbyteArray_arr = 0; + ((KIO::Connection*) QtSupport::getQt(env, obj))->send((int) cmd, (const TQByteArray&)*(TQByteArray*) QtSupport::toQByteArray(env, arr, &_qbyteArray_arr)); return; } JNIEXPORT jboolean JNICALL Java_org_kde_koala_Connection_sendnow(JNIEnv* env, jobject obj, jint _cmd, jbyteArray data) { -static QByteArray* _qbyteArray_data = 0; - jboolean xret = (jboolean) ((KIO::Connection*) QtSupport::getQt(env, obj))->sendnow((int) _cmd, (const QByteArray&)*(QByteArray*) QtSupport::toQByteArray(env, data, &_qbyteArray_data)); +static TQByteArray* _qbyteArray_data = 0; + jboolean xret = (jboolean) ((KIO::Connection*) QtSupport::getQt(env, obj))->sendnow((int) _cmd, (const TQByteArray&)*(TQByteArray*) QtSupport::toQByteArray(env, data, &_qbyteArray_data)); return xret; } diff --git a/kdejava/koala/kdejava/CopyJob.cpp b/kdejava/koala/kdejava/CopyJob.cpp index 3ef9c41e..6f20d2df 100644 --- a/kdejava/koala/kdejava/CopyJob.cpp +++ b/kdejava/koala/kdejava/CopyJob.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include <kio/jobclasses.h> -#include <qstring.h> +#include <tqstring.h> #include <kurl.h> #include <qtjava/QtSupport.h> @@ -25,7 +25,7 @@ Java_org_kde_koala_CopyJob_destURL(JNIEnv* env, jobject obj) JNIEXPORT jobject JNICALL Java_org_kde_koala_CopyJob_metaObject(JNIEnv* env, jobject obj) { - jobject xret = QtSupport::objectForQtKey(env, (void*)((KIO::CopyJob*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.QMetaObject"); + jobject xret = QtSupport::objectForQtKey(env, (void*)((KIO::CopyJob*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.TQMetaObject"); return xret; } diff --git a/kdejava/koala/kdejava/DCOPClient.cpp b/kdejava/koala/kdejava/DCOPClient.cpp index f0caa25a..d6ab1281 100644 --- a/kdejava/koala/kdejava/DCOPClient.cpp +++ b/kdejava/koala/kdejava/DCOPClient.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include <dcopclient.h> -#include <qglobal.h> -#include <qstring.h> -#include <qcstring.h> +#include <tqglobal.h> +#include <tqstring.h> +#include <tqcstring.h> #include <qtjava/QtSupport.h> #include <kdejava/KDESupport.h> @@ -17,40 +17,40 @@ public: return; } ~DCOPClientJBridge() {QtSupport::qtKeyDeleted(this);} - void timerEvent(QTimerEvent* arg1) { - if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.kde.qt.QTimerEvent")) { - QObject::timerEvent(arg1); + void timerEvent(TQTimerEvent* arg1) { + if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.kde.qt.TQTimerEvent")) { + TQObject::timerEvent(arg1); } return; } - void childEvent(QChildEvent* arg1) { - if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.kde.qt.QChildEvent")) { - QObject::childEvent(arg1); + void childEvent(TQChildEvent* arg1) { + if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.kde.qt.TQChildEvent")) { + TQObject::childEvent(arg1); } return; } - bool eventFilter(QObject* object,QEvent* event) { + bool eventFilter(TQObject* object,TQEvent* event) { if (!QtSupport::eventFilterDelegate(this,"org.kde.koala.DCOPClient",object,event)) { - return QObject::eventFilter(object,event); + return TQObject::eventFilter(object,event); } else { return TRUE; } } - void removeChild(QObject* arg1) { - if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.QObject")) { - QObject::removeChild(arg1); + void removeChild(TQObject* arg1) { + if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.TQObject")) { + TQObject::removeChild(arg1); } return; } - void insertChild(QObject* arg1) { - if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.kde.qt.QObject")) { - QObject::insertChild(arg1); + void insertChild(TQObject* arg1) { + if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.kde.qt.TQObject")) { + TQObject::insertChild(arg1); } return; } - void customEvent(QCustomEvent* arg1) { - if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.kde.qt.QCustomEvent")) { - QObject::customEvent(arg1); + void customEvent(TQCustomEvent* arg1) { + if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.kde.qt.TQCustomEvent")) { + TQObject::customEvent(arg1); } return; } @@ -66,7 +66,7 @@ Java_org_kde_koala_DCOPClient_acceptCalls(JNIEnv* env, jobject obj) JNIEXPORT jstring JNICALL Java_org_kde_koala_DCOPClient_appId(JNIEnv* env, jobject obj) { - QCString _qstring; + TQCString _qstring; _qstring = ((DCOPClient*) QtSupport::getQt(env, obj))->appId(); return QtSupport::fromQCString(env, &_qstring); } @@ -88,28 +88,28 @@ Java_org_kde_koala_DCOPClient_bindToApp(JNIEnv* env, jobject obj) JNIEXPORT jint JNICALL Java_org_kde_koala_DCOPClient_callAsync(JNIEnv* env, jobject obj, jstring remApp, jstring remObj, jstring remFun, jbyteArray data, jobject callBackObj, jstring callBackSlot) { -static QCString* _qcstring_remApp = 0; -static QCString* _qcstring_remObj = 0; -static QCString* _qcstring_remFun = 0; -static QByteArray* _qbyteArray_data = 0; -static QCString* _qstring_callBackSlot = 0; - jint xret = (jint) ((DCOPClient*) QtSupport::getQt(env, obj))->callAsync((const QCString&)*(QCString*) QtSupport::toQCString(env, remApp, &_qcstring_remApp), (const QCString&)*(QCString*) QtSupport::toQCString(env, remObj, &_qcstring_remObj), (const QCString&)*(QCString*) QtSupport::toQCString(env, remFun, &_qcstring_remFun), (const QByteArray&)*(QByteArray*) QtSupport::toQByteArray(env, data, &_qbyteArray_data), (QObject*) QtSupport::getQt(env, callBackObj), (const char*) QtSupport::toCharString(env, callBackSlot, &_qstring_callBackSlot)); +static TQCString* _qcstring_remApp = 0; +static TQCString* _qcstring_remObj = 0; +static TQCString* _qcstring_remFun = 0; +static TQByteArray* _qbyteArray_data = 0; +static TQCString* _qstring_callBackSlot = 0; + jint xret = (jint) ((DCOPClient*) QtSupport::getQt(env, obj))->callAsync((const TQCString&)*(TQCString*) QtSupport::toQCString(env, remApp, &_qcstring_remApp), (const TQCString&)*(TQCString*) QtSupport::toQCString(env, remObj, &_qcstring_remObj), (const TQCString&)*(TQCString*) QtSupport::toQCString(env, remFun, &_qcstring_remFun), (const TQByteArray&)*(TQByteArray*) QtSupport::toQByteArray(env, data, &_qbyteArray_data), (TQObject*) QtSupport::getQt(env, callBackObj), (const char*) QtSupport::toCharString(env, callBackSlot, &_qstring_callBackSlot)); return xret; } JNIEXPORT jboolean JNICALL Java_org_kde_koala_DCOPClient_call(JNIEnv* env, jobject obj, jstring remApp, jstring remObj, jstring remFun, jbyteArray data, jobject replyType, jbyteArray replyData, jboolean useEventLoop, jint timeout) { -static QCString* _qcstring_remApp = 0; -static QCString* _qcstring_remObj = 0; -static QCString* _qcstring_remFun = 0; -static QByteArray* _qbyteArray_data = 0; -static QCString* _qcstring_replyType = 0; +static TQCString* _qcstring_remApp = 0; +static TQCString* _qcstring_remObj = 0; +static TQCString* _qcstring_remFun = 0; +static TQByteArray* _qbyteArray_data = 0; +static TQCString* _qcstring_replyType = 0; if (_qcstring_replyType == 0) { - _qcstring_replyType = new QCString(); + _qcstring_replyType = new TQCString(); } -static QByteArray* _qbyteArray_replyData = 0; - jboolean xret = (jboolean) ((DCOPClient*) QtSupport::getQt(env, obj))->call((const QCString&)*(QCString*) QtSupport::toQCString(env, remApp, &_qcstring_remApp), (const QCString&)*(QCString*) QtSupport::toQCString(env, remObj, &_qcstring_remObj), (const QCString&)*(QCString*) QtSupport::toQCString(env, remFun, &_qcstring_remFun), (const QByteArray&)*(QByteArray*) QtSupport::toQByteArray(env, data, &_qbyteArray_data), (QCString&)*(QCString*) _qcstring_replyType, (QByteArray&)*(QByteArray*) QtSupport::toQByteArray(env, replyData, &_qbyteArray_replyData), (bool) useEventLoop, (int) timeout); +static TQByteArray* _qbyteArray_replyData = 0; + jboolean xret = (jboolean) ((DCOPClient*) QtSupport::getQt(env, obj))->call((const TQCString&)*(TQCString*) QtSupport::toQCString(env, remApp, &_qcstring_remApp), (const TQCString&)*(TQCString*) QtSupport::toQCString(env, remObj, &_qcstring_remObj), (const TQCString&)*(TQCString*) QtSupport::toQCString(env, remFun, &_qcstring_remFun), (const TQByteArray&)*(TQByteArray*) QtSupport::toQByteArray(env, data, &_qbyteArray_data), (TQCString&)*(TQCString*) _qcstring_replyType, (TQByteArray&)*(TQByteArray*) QtSupport::toQByteArray(env, replyData, &_qbyteArray_replyData), (bool) useEventLoop, (int) timeout); QtSupport::fromQCStringToStringBuffer(env, _qcstring_replyType, replyType); return xret; } @@ -125,19 +125,19 @@ Java_org_kde_koala_DCOPClient_className(JNIEnv* env, jobject obj) JNIEXPORT jboolean JNICALL Java_org_kde_koala_DCOPClient_connectDCOPSignal(JNIEnv* env, jobject obj, jstring sender, jstring senderObj, jstring signal, jstring receiverObj, jstring slot, jboolean Volatile) { -static QCString* _qcstring_sender = 0; -static QCString* _qcstring_senderObj = 0; -static QCString* _qcstring_signal = 0; -static QCString* _qcstring_receiverObj = 0; -static QCString* _qcstring_slot = 0; - jboolean xret = (jboolean) ((DCOPClient*) QtSupport::getQt(env, obj))->connectDCOPSignal((const QCString&)*(QCString*) QtSupport::toQCString(env, sender, &_qcstring_sender), (const QCString&)*(QCString*) QtSupport::toQCString(env, senderObj, &_qcstring_senderObj), (const QCString&)*(QCString*) QtSupport::toQCString(env, signal, &_qcstring_signal), (const QCString&)*(QCString*) QtSupport::toQCString(env, receiverObj, &_qcstring_receiverObj), (const QCString&)*(QCString*) QtSupport::toQCString(env, slot, &_qcstring_slot), (bool) Volatile); +static TQCString* _qcstring_sender = 0; +static TQCString* _qcstring_senderObj = 0; +static TQCString* _qcstring_signal = 0; +static TQCString* _qcstring_receiverObj = 0; +static TQCString* _qcstring_slot = 0; + jboolean xret = (jboolean) ((DCOPClient*) QtSupport::getQt(env, obj))->connectDCOPSignal((const TQCString&)*(TQCString*) QtSupport::toQCString(env, sender, &_qcstring_sender), (const TQCString&)*(TQCString*) QtSupport::toQCString(env, senderObj, &_qcstring_senderObj), (const TQCString&)*(TQCString*) QtSupport::toQCString(env, signal, &_qcstring_signal), (const TQCString&)*(TQCString*) QtSupport::toQCString(env, receiverObj, &_qcstring_receiverObj), (const TQCString&)*(TQCString*) QtSupport::toQCString(env, slot, &_qcstring_slot), (bool) Volatile); return xret; } JNIEXPORT jstring JNICALL Java_org_kde_koala_DCOPClient_dcopServerFile__(JNIEnv* env, jclass cls) { - QCString _qstring; + TQCString _qstring; (void) cls; _qstring = DCOPClientJBridge::dcopServerFile(); return QtSupport::fromQCString(env, &_qstring); @@ -146,17 +146,17 @@ Java_org_kde_koala_DCOPClient_dcopServerFile__(JNIEnv* env, jclass cls) JNIEXPORT jstring JNICALL Java_org_kde_koala_DCOPClient_dcopServerFile__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring hostname) { - QCString _qstring; + TQCString _qstring; (void) cls; -static QCString* _qcstring_hostname = 0; - _qstring = DCOPClientJBridge::dcopServerFile((const QCString&)*(QCString*) QtSupport::toQCString(env, hostname, &_qcstring_hostname)); +static TQCString* _qcstring_hostname = 0; + _qstring = DCOPClientJBridge::dcopServerFile((const TQCString&)*(TQCString*) QtSupport::toQCString(env, hostname, &_qcstring_hostname)); return QtSupport::fromQCString(env, &_qstring); } JNIEXPORT jstring JNICALL Java_org_kde_koala_DCOPClient_defaultObject(JNIEnv* env, jobject obj) { - QCString _qstring; + TQCString _qstring; _qstring = ((DCOPClient*) QtSupport::getQt(env, obj))->defaultObject(); return QtSupport::fromQCString(env, &_qstring); } @@ -171,12 +171,12 @@ Java_org_kde_koala_DCOPClient_detach(JNIEnv* env, jobject obj) JNIEXPORT jboolean JNICALL Java_org_kde_koala_DCOPClient_disconnectDCOPSignal(JNIEnv* env, jobject obj, jstring sender, jstring senderObj, jstring signal, jstring receiverObj, jstring slot) { -static QCString* _qcstring_sender = 0; -static QCString* _qcstring_senderObj = 0; -static QCString* _qcstring_signal = 0; -static QCString* _qcstring_receiverObj = 0; -static QCString* _qcstring_slot = 0; - jboolean xret = (jboolean) ((DCOPClient*) QtSupport::getQt(env, obj))->disconnectDCOPSignal((const QCString&)*(QCString*) QtSupport::toQCString(env, sender, &_qcstring_sender), (const QCString&)*(QCString*) QtSupport::toQCString(env, senderObj, &_qcstring_senderObj), (const QCString&)*(QCString*) QtSupport::toQCString(env, signal, &_qcstring_signal), (cons |