diff options
Diffstat (limited to 'dcopjava')
| -rw-r--r-- | dcopjava/binding/client.cpp | 38 | ||||
| -rw-r--r-- | dcopjava/dcopidl2java/main.cpp | 22 | ||||
| -rw-r--r-- | dcopjava/dcopidl2java/main.h | 8 | ||||
| -rw-r--r-- | dcopjava/dcopidl2java/skel.cpp | 92 | ||||
| -rw-r--r-- | dcopjava/dcopidl2java/stubimpl.cpp | 78 | ||||
| -rw-r--r-- | dcopjava/tests/test.h | 10 | ||||
| -rw-r--r-- | dcopjava/tests/test_impl.cpp | 14 | ||||
| -rw-r--r-- | dcopjava/tests/test_impl.h | 6 |
8 files changed, 134 insertions, 134 deletions
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); |