diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:44:01 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:44:01 +0000 |
commit | 479f5f799523bffbcc83dff581a2299c047c6fff (patch) | |
tree | 186aae707ed02aac6c7cab2fb14e97f72aca5e36 /korundum | |
parent | f1dbff6145c98324ff82e34448b7483727e8ace4 (diff) | |
download | tdebindings-479f5f799523bffbcc83dff581a2299c047c6fff.tar.gz tdebindings-479f5f799523bffbcc83dff581a2299c047c6fff.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1157645 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korundum')
-rw-r--r-- | korundum/rubylib/korundum/Korundum.cpp | 190 | ||||
-rw-r--r-- | korundum/rubylib/korundum/kdehandlers.cpp | 100 | ||||
-rw-r--r-- | korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp | 440 |
3 files changed, 365 insertions, 365 deletions
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp index 6cd3045a..c1254f81 100644 --- a/korundum/rubylib/korundum/Korundum.cpp +++ b/korundum/rubylib/korundum/Korundum.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include <qobject.h> -#include <qstringlist.h> -#include <qmap.h> -#include <qdatastream.h> +#include <tqobject.h> +#include <tqstringlist.h> +#include <tqmap.h> +#include <tqdatastream.h> #include <kdeversion.h> #include <dcopclient.h> @@ -65,7 +65,7 @@ Marshall::HandlerFn getMarshallFn(const SmokeType &type); DCOP signals, and converting the return value of a DCOP slot to a stream. */ static void -smokeStackToStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int items, MocArgument* args) +smokeStackToStream(Marshall *m, Smoke::Stack stack, TQDataStream* stream, int items, MocArgument* args) { for(int i = 0; i < items; i++) { switch(args[i].argType) { @@ -83,7 +83,7 @@ smokeStackToStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int ite break; case xmoc_QString: { - QString temp((const QString&) *((QString *) stack[i].s_voidp)); + TQString temp((const TQString&) *((TQString *) stack[i].s_voidp)); *stream << temp; } break; @@ -131,30 +131,30 @@ smokeStackToStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int ite case Smoke::t_voidp: { // Special case any types which are in the Smoke runtime, but - // don't have QDataStream '<<' methods - if (strcmp(t.name(), "QCString") == 0) { - QCString temp((const QCString&) *((QCString *) stack[i].s_voidp)); + // don't have TQDataStream '<<' methods + if (strcmp(t.name(), "TQCString") == 0) { + TQCString temp((const TQCString&) *((TQCString *) stack[i].s_voidp)); *stream << temp; break; } else if (strcmp(t.name(), "QCStringList") == 0) { QCStringList temp((const QCStringList&) *((QCStringList *) stack[i].s_voidp)); *stream << temp; break; - } else if (strcmp(t.name(), "QStringList") == 0) { - QStringList temp((const QStringList&) *((QStringList *) stack[i].s_voidp)); + } else if (strcmp(t.name(), "TQStringList") == 0) { + TQStringList temp((const TQStringList&) *((TQStringList *) stack[i].s_voidp)); *stream << temp; break; } else if (strcmp(t.name(), "KURL::List") == 0) { KURL::List temp((const KURL::List&) *((KURL::List *) stack[i].s_voidp)); *stream << temp; break; - } else if (strcmp(t.name(), "QMap<QCString,DCOPRef>") == 0) { - QMap<QCString,DCOPRef> temp((const QMap<QCString,DCOPRef>&) *((QMap<QCString,DCOPRef>*) stack[i].s_voidp)); + } else if (strcmp(t.name(), "TQMap<TQCString,DCOPRef>") == 0) { + TQMap<TQCString,DCOPRef> temp((const TQMap<TQCString,DCOPRef>&) *((TQMap<TQCString,DCOPRef>*) stack[i].s_voidp)); *stream << temp; break; } - // Look for methods of the form: QDataStream & operator<<(QDataStream&, const MyClass&) + // Look for methods of the form: TQDataStream & operator<<(TQDataStream&, const MyClass&) Smoke::Index meth = t.smoke()->findMethod("QGlobalSpace", "operator<<##"); Smoke::Index ix; if (meth > 0) { @@ -165,7 +165,7 @@ smokeStackToStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int ite QString refType("const "); refType += t.name(); refType += "&"; - if ( strcmp( "QDataStream&", + if ( strcmp( "TQDataStream&", t.smoke()->types[t.smoke()->argumentList[method.args+0]].name ) == 0 && strcmp( refType.latin1(), t.smoke()->types[t.smoke()->argumentList[method.args+1]].name ) == 0 ) @@ -174,7 +174,7 @@ smokeStackToStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int ite Smoke::StackItem local_stack[3]; local_stack[1].s_voidp = stream; local_stack[2].s_voidp = stack[i].s_voidp; - // Call the QDataStream marshaller write method + // Call the TQDataStream marshaller write method // with the instance to be marshalled (*fn)(method.method, 0, local_stack); break; @@ -199,7 +199,7 @@ smokeStackToStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int ite and for converting a dcop reply to a ruby value. */ static void -smokeStackFromStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int items, MocArgument* args) +smokeStackFromStream(Marshall *m, Smoke::Stack stack, TQDataStream* stream, int items, MocArgument* args) { for(int i = 0; i < items; i++) { switch(args[i].argType) { @@ -221,9 +221,9 @@ smokeStackFromStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int i break; case xmoc_QString: { - QString temp; + TQString temp; *stream >> temp; - stack[i].s_voidp = new QString(temp); + stack[i].s_voidp = new TQString(temp); } break; default: // case xmoc_ptr: @@ -288,35 +288,35 @@ smokeStackFromStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int i case Smoke::t_voidp: { // Special case any types which are in the Smoke runtime, but - // don't have QDataStream '>>' methods - if (strcmp(t.name(), "QCString") == 0) { - QCString temp; + // don't have TQDataStream '>>' methods + if (strcmp(t.name(), "TQCString") == 0) { + TQCString temp; *stream >> temp; - stack[i].s_voidp = new QCString(temp); + stack[i].s_voidp = new TQCString(temp); break; } else if (strcmp(t.name(), "QCStringList") == 0) { QCStringList temp; *stream >> temp; stack[i].s_voidp = new QCStringList(temp); break; - } else if (strcmp(t.name(), "QStringList") == 0) { - QStringList temp; + } else if (strcmp(t.name(), "TQStringList") == 0) { + TQStringList temp; *stream >> temp; - stack[i].s_voidp = new QStringList(temp); + stack[i].s_voidp = new TQStringList(temp); break; } else if (strcmp(t.name(), "KURL::List") == 0) { KURL::List temp; *stream >> temp; stack[i].s_voidp = new KURL::List(temp); break; - } else if (strcmp(t.name(), "QMap<QCString,DCOPRef>") == 0) { - QMap<QCString,DCOPRef> temp; + } else if (strcmp(t.name(), "TQMap<TQCString,DCOPRef>") == 0) { + TQMap<TQCString,DCOPRef> temp; *stream >> temp; - stack[i].s_voidp = new QMap<QCString,DCOPRef>(temp); + stack[i].s_voidp = new TQMap<TQCString,DCOPRef>(temp); break; } - // First construct an instance to read the QDataStream into, + // First construct an instance to read the TQDataStream into, // so look for a no args constructor Smoke::Index ctorId = t.smoke()->idMethodName(t.name()); Smoke::Index ctorMeth = t.smoke()->findMethod(t.classId(), ctorId); @@ -333,7 +333,7 @@ smokeStackFromStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int i (*classfn)(t.smoke()->methods[ctor].method, 0, ctor_stack); stack[i].s_voidp = ctor_stack[0].s_voidp; - // Look for methods of the form: QDataStream & operator>>(QDataStream&, MyClass&) + // Look for methods of the form: TQDataStream & operator>>(TQDataStream&, MyClass&) Smoke::Index meth = t.smoke()->findMethod("QGlobalSpace", "operator>>##"); Smoke::Index ix; if (meth > 0) { @@ -343,7 +343,7 @@ smokeStackFromStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int i Smoke::Method &method = t.smoke()->methods[t.smoke()->ambiguousMethodList[ix]]; QString refType(t.name()); refType += "&"; - if ( strcmp( "QDataStream&", + if ( strcmp( "TQDataStream&", t.smoke()->types[t.smoke()->argumentList[method.args+0]].name ) == 0 && strcmp( refType.latin1(), t.smoke()->types[t.smoke()->argumentList[method.args+1]].name ) == 0 ) @@ -352,7 +352,7 @@ smokeStackFromStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int i Smoke::StackItem local_stack[3]; local_stack[1].s_voidp = stream; local_stack[2].s_voidp = stack[i].s_voidp; - // Call the QDataStream marshaller read method + // Call the TQDataStream marshaller read method // on the instance to be marshalled (*fn)(method.method, 0, local_stack); break; @@ -369,14 +369,14 @@ smokeStackFromStream(Marshall *m, Smoke::Stack stack, QDataStream* stream, int i } /* - Converts a QByteArray returned from a DCOP call to a ruby value. + Converts a TQByteArray returned from a DCOP call to a ruby value. */ class DCOPReturn : public Marshall { MocArgument * _replyType; Smoke::Stack _stack; VALUE * _result; public: - DCOPReturn(QDataStream & retval, VALUE * result, VALUE replyType) + DCOPReturn(TQDataStream & retval, VALUE * result, VALUE replyType) { _result = result; VALUE temp = rb_funcall(qt_internal_module, rb_intern("getMocArguments"), 1, replyType); @@ -414,11 +414,11 @@ public: class DCOPCall : public Marshall { VALUE _obj; - QCString & _remFun; + TQCString & _remFun; int _items; VALUE *_sp; - QByteArray *_data; - QDataStream *_stream; + TQByteArray *_data; + TQDataStream *_stream; int _id; MocArgument *_args; bool _useEventLoop; @@ -428,12 +428,12 @@ class DCOPCall : public Marshall { VALUE _result; bool _called; public: - DCOPCall(VALUE obj, QCString & remFun, int items, VALUE *sp, VALUE args, bool useEventLoop, int timeout) : + DCOPCall(VALUE obj, TQCString & remFun, int items, VALUE *sp, VALUE args, bool useEventLoop, int timeout) : _obj(obj), _remFun(remFun), _items(items), _sp(sp), _useEventLoop(useEventLoop), _timeout(timeout), _cur(-1), _called(false) { - _data = new QByteArray(); - _stream = new QDataStream(*_data, IO_WriteOnly); + _data = new TQByteArray(); + _stream = new TQDataStream(*_data, IO_WriteOnly); Data_Get_Struct(rb_ary_entry(args, 1), MocArgument, _args); _stack = new Smoke::StackItem[_items]; _result = Qnil; @@ -470,8 +470,8 @@ public: smokeruby_object *o = value_obj_info(_obj); DCOPRef * dcopRef = (DCOPRef *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("DCOPRef")); DCOPClient* dc = dcopRef->dcopClient(); - QCString replyType; - QByteArray dataReceived; + TQCString replyType; + TQByteArray dataReceived; #if KDE_VERSION >= 0x030200 bool ok = dc->call(dcopRef->app(), dcopRef->obj(), _remFun, *_data, replyType, dataReceived, _useEventLoop, _timeout); #else @@ -487,15 +487,15 @@ public: return; } - QDataStream ds(dataReceived, IO_ReadOnly); + TQDataStream ds(dataReceived, IO_ReadOnly); - if (replyType == "QValueList<DCOPRef>") { - // Special case QValueList<DCOPRef> as a QDataStream marshaller + if (replyType == "TQValueList<DCOPRef>") { + // Special case TQValueList<DCOPRef> as a TQDataStream marshaller // isn't in the Smoke runtime - QValueList<DCOPRef> valuelist; + TQValueList<DCOPRef> valuelist; ds >> valuelist; _result = rb_ary_new(); - for (QValueListIterator<DCOPRef> it = valuelist.begin(); it != valuelist.end(); ++it) { + for (TQValueListIterator<DCOPRef> it = valuelist.begin(); it != valuelist.end(); ++it) { void *p = new DCOPRef(*it); VALUE obj = getPointerObject(p); @@ -510,29 +510,29 @@ public: rb_ary_push(_result, obj); } - } else if (replyType == "QValueList<QCString>") { + } else if (replyType == "TQValueList<TQCString>") { // And special case this type too - QValueList<QCString> propertyList; + TQValueList<TQCString> propertyList; ds >> propertyList; _result = rb_ary_new(); - for (QValueListIterator<QCString> it = propertyList.begin(); it != propertyList.end(); ++it) { + for (TQValueListIterator<TQCString> it = propertyList.begin(); it != propertyList.end(); ++it) { rb_ary_push(_result, rb_str_new2((const char *) *it)); } - } else if (replyType == "QValueList<int>") { + } else if (replyType == "TQValueList<int>") { // And special case this type too - QValueList<int> propertyList; + TQValueList<int> propertyList; ds >> propertyList; _result = rb_ary_new(); - for (QValueListIterator<int> it = propertyList.begin(); it != propertyList.end(); ++it) { + for (TQValueListIterator<int> it = propertyList.begin(); it != propertyList.end(); ++it) { rb_ary_push(_result, INT2NUM(*it)); } - } else if (replyType == "QMap<QString,DCOPRef>") { + } else if (replyType == "TQMap<TQString,DCOPRef>") { // And another.. - QMap<QString,DCOPRef> actionMap; + TQMap<TQString,DCOPRef> actionMap; ds >> actionMap; _result = rb_hash_new(); - QMap<QString,DCOPRef>::Iterator it; + TQMap<TQString,DCOPRef>::Iterator it; for (it = actionMap.begin(); it != actionMap.end(); ++it) { void *p = new DCOPRef(it.data()); VALUE obj = getPointerObject(p); @@ -573,9 +573,9 @@ public: class DCOPSend : public Marshall { VALUE _obj; - QCString & _remFun; - QByteArray *_data; - QDataStream *_stream; + TQCString & _remFun; + TQByteArray *_data; + TQDataStream *_stream; int _id; MocArgument *_args; int _items; @@ -585,11 +585,11 @@ class DCOPSend : public Marshall { Smoke::Stack _stack; bool _called; public: - DCOPSend(VALUE obj, QCString & remFun, int items, VALUE *sp, VALUE args, VALUE * result) : + DCOPSend(VALUE obj, TQCString & remFun, int items, VALUE *sp, VALUE args, VALUE * result) : _obj(obj), _remFun(remFun), _items(items), _sp(sp), _cur(-1), _result(result), _called(false) { - _data = new QByteArray(); - _stream = new QDataStream(*_data, IO_WriteOnly); + _data = new TQByteArray(); + _stream = new TQDataStream(*_data, IO_WriteOnly); Data_Get_Struct(rb_ary_entry(args, 1), MocArgument, _args); _stack = new Smoke::StackItem[_items]; } @@ -647,8 +647,8 @@ public: class EmitDCOPSignal : public Marshall { VALUE _obj; const char * _signalName; - QByteArray *_data; - QDataStream *_stream; + TQByteArray *_data; + TQDataStream *_stream; int _id; MocArgument *_args; VALUE *_sp; @@ -660,8 +660,8 @@ public: EmitDCOPSignal(VALUE obj, const char * signalName, int items, VALUE *sp, VALUE args) : _obj(obj), _signalName(signalName), _sp(sp), _items(items), _cur(-1), _called(false) { - _data = new QByteArray(); - _stream = new QDataStream(*_data, IO_WriteOnly); + _data = new TQByteArray(); + _stream = new TQDataStream(*_data, IO_WriteOnly); Data_Get_Struct(rb_ary_entry(args, 1), MocArgument, _args); _stack = new Smoke::StackItem[_items]; } @@ -722,9 +722,9 @@ class DCOPReplyValue : public Marshall { Smoke::Stack _stack; VALUE * _result; public: - DCOPReplyValue(QByteArray & retval, VALUE * result, VALUE replyType) + DCOPReplyValue(TQByteArray & retval, VALUE * result, VALUE replyType) { - QDataStream _retval(retval, IO_WriteOnly); + TQDataStream _retval(retval, IO_WriteOnly); _result = result; Data_Get_Struct(rb_ary_entry(replyType, 1), MocArgument, _replyType); _stack = new Smoke::StackItem[1]; @@ -762,10 +762,10 @@ class InvokeDCOPSlot : public Marshall { ID _slotname; int _items; MocArgument * _args; - QDataStream * _stream; + TQDataStream * _stream; const char * _replyTypeName; VALUE _replyType; - QByteArray * _retval; + TQByteArray * _retval; int _cur; bool _called; VALUE * _sp; @@ -798,12 +798,12 @@ public: _called = true; VALUE result = rb_funcall2(_obj, _slotname, _items, _sp); - if ( strcmp(_replyTypeName, "QValueList<DCOPRef>") == 0 + if ( strcmp(_replyTypeName, "TQValueList<DCOPRef>") == 0 && TYPE(result) == T_ARRAY ) { - // Special case QValueList<DCOPRef> as a QDataStream marshaller + // Special case TQValueList<DCOPRef> as a TQDataStream marshaller // isn't in the Smoke runtime - QValueList<DCOPRef> windowList; + TQValueList<DCOPRef> windowList; for (long i = 0; i < RARRAY(result)->len; i++) { VALUE item = rb_ary_entry(result, i); @@ -814,25 +814,25 @@ public: ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("DCOPRef")); windowList.append((DCOPRef)*(DCOPRef*)ptr); } - QDataStream retval(*_retval, IO_WriteOnly); + TQDataStream retval(*_retval, IO_WriteOnly); retval << windowList; - } else if ( strcmp(_replyTypeName, "QValueList<QCString>") == 0 + } else if ( strcmp(_replyTypeName, "TQValueList<TQCString>") == 0 && TYPE(result) == T_ARRAY ) { // And special case this type too - QValueList<QCString> propertyList; + TQValueList<TQCString> propertyList; for (long i = 0; i < RARRAY(result)->len; i++) { VALUE item = rb_ary_entry(result, i); - propertyList.append(QCString(StringValuePtr(item))); + propertyList.append(TQCString(StringValuePtr(item))); } - QDataStream retval(*_retval, IO_WriteOnly); + TQDataStream retval(*_retval, IO_WriteOnly); retval << propertyList; - } else if ( strcmp(_replyTypeName, "QMap<QString,DCOPRef>") == 0 + } else if ( strcmp(_replyTypeName, "TQMap<TQString,DCOPRef>") == 0 && TYPE(result) == T_HASH ) { // And another.. - QMap<QString,DCOPRef> actionMap; + TQMap<TQString,DCOPRef> actionMap; // Convert the ruby hash to an array of key/value arrays VALUE temp = rb_funcall(result, rb_intern("to_a"), 0); @@ -846,9 +846,9 @@ public: void * ptr = o->ptr; ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("DCOPRef")); - actionMap[QString(StringValuePtr(action))] = (DCOPRef)*(DCOPRef*)ptr; + actionMap[TQString(StringValuePtr(action))] = (DCOPRef)*(DCOPRef*)ptr; } - QDataStream retval(*_retval, IO_WriteOnly); + TQDataStream retval(*_retval, IO_WriteOnly); retval << actionMap; } else if (_replyType != Qnil) { DCOPReplyValue dcopReply(*_retval, &result, _replyType); @@ -870,12 +870,12 @@ public: _cur = oldcur; } - InvokeDCOPSlot(VALUE obj, ID slotname, VALUE args, QByteArray& data, VALUE replyTypeName, VALUE replyType, QByteArray& returnValue) : + InvokeDCOPSlot(VALUE obj, ID slotname, VALUE args, TQByteArray& data, VALUE replyTypeName, VALUE replyType, TQByteArray& returnValue) : _obj(obj), _slotname(slotname), _replyType(replyType), _cur(-1), _called(false) { _replyTypeName = StringValuePtr(replyTypeName); _items = NUM2INT(rb_ary_entry(args, 0)); - _stream = new QDataStream(data, IO_ReadOnly); + _stream = new TQDataStream(data, IO_ReadOnly); _retval = &returnValue; Data_Get_Struct(rb_ary_entry(args, 1), MocArgument, _args); @@ -910,7 +910,7 @@ extern VALUE kparts_module; extern VALUE khtml_module; VALUE -getdcopinfo(VALUE self, QString & signalname) +getdcopinfo(VALUE self, TQString & signalname) { VALUE member = rb_funcall( kde_internal_module, rb_intern("fullSignalName"), @@ -926,7 +926,7 @@ k_dcop_signal(int argc, VALUE * argv, VALUE self) { VALUE dcopObject = rb_funcall(kde_module, rb_intern("createDCOPObject"), 1, self); - QString signalname(rb_id2name(rb_frame_last_func())); + TQString signalname(rb_id2name(rb_frame_last_func())); VALUE args = getdcopinfo(self, signalname); if(args == Qnil) return Qfalse; @@ -972,13 +972,13 @@ dcop_process(VALUE /*self*/, VALUE target, VALUE slotname, VALUE args, VALUE dat if (o == 0 || o->ptr == 0) { return Qfalse; } - QByteArray * dataArray = (QByteArray*) o->ptr; + TQByteArray * dataArray = (TQByteArray*) o->ptr; o = value_obj_info(replyData); if (o == 0 || o->ptr == 0) { return Qfalse; } - QByteArray * replyArray = (QByteArray*) o->ptr; + TQByteArray * replyArray = (TQByteArray*) o->ptr; InvokeDCOPSlot dcopSlot(target, rb_intern(StringValuePtr(slotname)), args, *dataArray, replyTypeName, replyType, *replyArray); dcopSlot.next(); @@ -989,7 +989,7 @@ dcop_process(VALUE /*self*/, VALUE target, VALUE slotname, VALUE args, VALUE dat static VALUE dcop_call(int argc, VALUE * argv, VALUE /*self*/) { - QCString fun(StringValuePtr(argv[1])); + TQCString fun(StringValuePtr(argv[1])); VALUE args = argv[2]; bool useEventLoop = (argv[argc-2] == Qtrue ? true : false); int timeout = NUM2INT(argv[argc-1]); @@ -1003,7 +1003,7 @@ dcop_call(int argc, VALUE * argv, VALUE /*self*/) static VALUE dcop_send(int argc, VALUE * argv, VALUE /*self*/) { - QCString fun(StringValuePtr(argv[1])); + TQCString fun(StringValuePtr(argv[1])); VALUE args = argv[2]; VALUE result = Qnil; @@ -1071,7 +1071,7 @@ config_additem(int argc, VALUE * argv, VALUE self) if (argc == 1) { config->addItem(item); } else { - config->addItem(item, QString(StringValuePtr(argv[1]))); + config->addItem(item, TQString(StringValuePtr(argv[1]))); } return self; @@ -1085,16 +1085,16 @@ konsole_part_startprogram(VALUE self, VALUE value_program, VALUE value_args) smokeruby_object * o = value_obj_info(self); TerminalInterface * t = static_cast<TerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->qt_cast("TerminalInterface")); - QStrList *args = new QStrList; + TQStrList *args = new QStrList; if (value_args != Qnil) { for (long i = 0; i < RARRAY(value_args)->len; i++) { VALUE item = rb_ary_entry(value_args, i); - args->append(QString::fromLatin1(StringValuePtr(item), RSTRING(item)->len)); + args->append(TQString::fromLatin1(StringValuePtr(item), RSTRING(item)->len)); } } - t->startProgram(QString::fromLatin1(StringValuePtr(value_program)), args); + t->startProgram(TQString::fromLatin1(StringValuePtr(value_program)), args); return self; } diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp index 4d8d5741..1d631399 100644 --- a/korundum/rubylib/korundum/kdehandlers.cpp +++ b/korundum/rubylib/korundum/kdehandlers.cpp @@ -22,7 +22,7 @@ #include <dcopclient.h> #include <dcopobject.h> #include <dcopref.h> -#include <qptrlist.h> +#include <tqptrlist.h> #include <ktrader.h> #include <kservicegroup.h> #include <kservice.h> @@ -128,10 +128,10 @@ void marshall_QCStringList(Marshall *m) { for(long i = 0; i < count; i++) { VALUE item = rb_ary_entry(list, i); if(TYPE(item) != T_STRING) { - stringlist->append(QCString()); + stringlist->append(TQCString()); continue; } - stringlist->append(QCString(StringValuePtr(item), RSTRING(item)->len + 1)); + stringlist->append(TQCString(StringValuePtr(item), RSTRING(item)->len + 1)); } m->item().s_voidp = stringlist; @@ -245,7 +245,7 @@ void marshall_WIdList(Marshall *m) { break; } int count = RARRAY(list)->len; - QValueList<WId> *valuelist = new QValueList<WId>; + TQValueList<WId> *valuelist = new TQValueList<WId>; long i; for(i = 0; i < count; i++) { VALUE item = rb_ary_entry(list, i); @@ -261,7 +261,7 @@ void marshall_WIdList(Marshall *m) { if (!m->type().isConst()) { rb_ary_clear(list); - for(QValueListIterator<WId> it = valuelist->begin(); + for(TQValueListIterator<WId> it = valuelist->begin(); it != valuelist->end(); ++it) rb_ary_push(list, LONG2NUM((int)*it)); @@ -274,7 +274,7 @@ void marshall_WIdList(Marshall *m) { break; case Marshall::ToVALUE: { - QValueList<WId> *valuelist = (QValueList<WId>*)m->item().s_voidp; + TQValueList<WId> *valuelist = (TQValueList<WId>*)m->item().s_voidp; if(!valuelist) { *(m->var()) = Qnil; break; @@ -282,7 +282,7 @@ void marshall_WIdList(Marshall *m) { VALUE av = rb_ary_new(); - for(QValueListIterator<WId> it = valuelist->begin(); + for(TQValueListIterator<WId> it = valuelist->begin(); it != valuelist->end(); ++it) rb_ary_push(av, LONG2NUM(*it)); @@ -1081,17 +1081,17 @@ void marshall_ItemList(Marshall *m) { #define DEF_LIST_MARSHALLER(ListIdent,ItemList,Item) namespace { char ListIdent##STR[] = #Item; }; \ Marshall::HandlerFn marshall_##ListIdent = marshall_ItemList<Item,ItemList,ListIdent##STR>; -DEF_LIST_MARSHALLER( KFileItemList, QPtrList<KFileItem>, KFileItem ) -DEF_LIST_MARSHALLER( KMainWindowList, QPtrList<KMainWindow>, KMainWindow ) -DEF_LIST_MARSHALLER( KActionList, QPtrList<KAction>, KAction ) -DEF_LIST_MARSHALLER( DCOPObjectList, QPtrList<DCOPObject>, DCOPObject ) -DEF_LIST_MARSHALLER( KDockWidgetList, QPtrList<KDockWidget>, KDockWidget ) -DEF_LIST_MARSHALLER( KFileTreeBranch, QPtrList<KFileTreeBranch>, KFileTreeBranch ) -DEF_LIST_MARSHALLER( KFileTreeViewItem, QPtrList<KFileTreeViewItem>, KFileTreeViewItem ) -DEF_LIST_MARSHALLER( KPartList, QPtrList<KParts::Part>, KParts::Part ) -DEF_LIST_MARSHALLER( KPartPluginList, QPtrList<KParts::Plugin>, KParts::Plugin ) -DEF_LIST_MARSHALLER( KPartReadOnlyPartList, QPtrList<KParts::ReadOnlyPart>, KParts::ReadOnlyPart ) -DEF_LIST_MARSHALLER( KServiceTypeProfileList, QPtrList<KServiceTypeProfile>, KServiceTypeProfile ) +DEF_LIST_MARSHALLER( KFileItemList, TQPtrList<KFileItem>, KFileItem ) +DEF_LIST_MARSHALLER( KMainWindowList, TQPtrList<KMainWindow>, KMainWindow ) +DEF_LIST_MARSHALLER( KActionList, TQPtrList<KAction>, KAction ) +DEF_LIST_MARSHALLER( DCOPObjectList, TQPtrList<DCOPObject>, DCOPObject ) +DEF_LIST_MARSHALLER( KDockWidgetList, TQPtrList<KDockWidget>, KDockWidget ) +DEF_LIST_MARSHALLER( KFileTreeBranch, TQPtrList<KFileTreeBranch>, KFileTreeBranch ) +DEF_LIST_MARSHALLER( KFileTreeViewItem, TQPtrList<KFileTreeViewItem>, KFileTreeViewItem ) +DEF_LIST_MARSHALLER( KPartList, TQPtrList<KParts::Part>, KParts::Part ) +DEF_LIST_MARSHALLER( KPartPluginList, TQPtrList<KParts::Plugin>, KParts::Plugin ) +DEF_LIST_MARSHALLER( KPartReadOnlyPartList, TQPtrList<KParts::ReadOnlyPart>, KParts::ReadOnlyPart ) +DEF_LIST_MARSHALLER( KServiceTypeProfileList, TQPtrList<KServiceTypeProfile>, KServiceTypeProfile ) template <class Item, class ItemList, class ItemListIterator, const char *ItemSTR > void marshall_ValueItemList(Marshall *m) { @@ -1187,13 +1187,13 @@ void marshall_ValueItemList(Marshall *m) { Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList<Item,ItemList,Itr,ListIdent##STR>; #if KDE_VERSION >= 0x030200 -DEF_VALUELIST_MARSHALLER( ChoicesList, QValueList<KConfigSkeleton::ItemEnum::Choice>, KConfigSkeleton::ItemEnum::Choice, QValueList<KConfigSkeleton::ItemEnum::Choice>::Iterator ) +DEF_VALUELIST_MARSHALLER( ChoicesList, TQValueList<KConfigSkeleton::ItemEnum::Choice>, KConfigSkeleton::ItemEnum::Choice, TQValueList<KConfigSkeleton::ItemEnum::Choice>::Iterator ) #endif -DEF_VALUELIST_MARSHALLER( KAboutPersonList, QValueList<KAboutPerson>, KAboutPerson, QValueList<KAboutPerson>::Iterator ) -DEF_VALUELIST_MARSHALLER( KAboutTranslatorList, QValueList<KAboutTranslator>, KAboutTranslator, QValueList<KAboutTranslator>::Iterator ) -DEF_VALUELIST_MARSHALLER( KIOCopyInfoList, QValueList<KIO::CopyInfo>, KIO::CopyInfo, QValueList<KIO::CopyInfo>::Iterator ) -DEF_VALUELIST_MARSHALLER( KServiceOfferList, QValueList<KServiceOffer>, KServiceOffer, QValueList<KServiceOffer>::Iterator ) -DEF_VALUELIST_MARSHALLER( UDSEntry, QValueList<KIO::UDSAtom>, KIO::UDSAtom, QValueList<KIO::UDSAtom>::Iterator ) +DEF_VALUELIST_MARSHALLER( KAboutPersonList, TQValueList<KAboutPerson>, KAboutPerson, TQValueList<KAboutPerson>::Iterator ) +DEF_VALUELIST_MARSHALLER( KAboutTranslatorList, TQValueList<KAboutTranslator>, KAboutTranslator, TQValueList<KAboutTranslator>::Iterator ) +DEF_VALUELIST_MARSHALLER( KIOCopyInfoList, TQValueList<KIO::CopyInfo>, KIO::CopyInfo, TQValueList<KIO::CopyInfo>::Iterator ) +DEF_VALUELIST_MARSHALLER( KServiceOfferList, TQValueList<KServiceOffer>, KServiceOffer, TQValueList<KServiceOffer>::Iterator ) +DEF_VALUELIST_MARSHALLER( UDSEntry, TQValueList<KIO::UDSAtom>, KIO::UDSAtom, TQValueList<KIO::UDSAtom>::Iterator ) template <class Key, class Value, class ItemMapIterator, const char *KeySTR, const char *ValueSTR > void marshall_Map(Marshall *m) { @@ -1206,7 +1206,7 @@ void marshall_Map(Marshall *m) { break; } - QMap<Key,Value> * map = new QMap<Key,Value>; + TQMap<Key,Value> * map = new TQMap<Key,Value>; // Convert the ruby hash to an array of key/value arrays VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0); @@ -1239,7 +1239,7 @@ void marshall_Map(Marshall *m) { break; case Marshall::ToVALUE: { - QMap<Key,Value> *map = (QMap<Key,Value>*)m->item().s_voidp; + TQMap<Key,Value> *map = (TQMap<Key,Value>*)m->item().s_voidp; if(!map) { *(m->var()) = Qnil; break; @@ -1297,7 +1297,7 @@ void marshall_Map(Marshall *m) { } #define DEF_MAP_MARSHALLER(MapIdent,Key,Value) namespace { char KeyIdent##STR[] = #Key; char ValueIdent##STR[] = #Value; }; \ - Marshall::HandlerFn marshall_##MapIdent = marshall_Map<Key, Value,QMap<Key,Value>::Iterator,KeyIdent##STR, ValueIdent##STR>; + Marshall::HandlerFn marshall_##MapIdent = marshall_Map<Key, Value,TQMap<Key,Value>::Iterator,KeyIdent##STR, ValueIdent##STR>; DEF_MAP_MARSHALLER( QMapKEntryKeyKEntry, KEntryKey, KEntry ) @@ -1311,7 +1311,7 @@ void marshall_QMapQCStringDCOPRef(Marshall *m) { break; } - QMap<QCString,DCOPRef> * map = new QMap<QCString,DCOPRef>; + TQMap<TQCString,DCOPRef> * map = new TQMap<TQCString,DCOPRef>; // Convert the ruby hash to an array of key/value arrays VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0); @@ -1326,7 +1326,7 @@ void marshall_QMapQCStringDCOPRef(Marshall *m) { void * ptr = o->ptr; ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("DCOPRef")); - (*map)[QCString(StringValuePtr(key))] = (DCOPRef)*(DCOPRef*)ptr; + (*map)[TQCString(StringValuePtr(key))] = (DCOPRef)*(DCOPRef*)ptr; } m->item().s_voidp = map; @@ -1338,7 +1338,7 @@ void marshall_QMapQCStringDCOPRef(Marshall *m) { break; case Marshall::ToVALUE: { - QMap<QCString,DCOPRef> *map = (QMap<QCString,DCOPRef>*)m->item().s_voidp; + TQMap<TQCString,DCOPRef> *map = (TQMap<TQCString,DCOPRef>*)m->item().s_voidp; if(!map) { *(m->var()) = Qnil; break; @@ -1346,7 +1346,7 @@ void marshall_QMapQCStringDCOPRef(Marshall *m) { VALUE hv = rb_hash_new(); - QMap<QCString,DCOPRef>::Iterator it; + TQMap<TQCString,DCOPRef>::Iterator it; for (it = map->begin(); it != map->end(); ++it) { void *p = new DCOPRef(it.data()); VALUE obj = getPointerObject(p); @@ -1380,8 +1380,8 @@ TypeHandler KDE_handlers[] = { { "QCStringList", marshall_QCStringList }, { "KCmdLineOptions*", marshall_KCmdLineOptions }, { "KActionPtrList", marshall_KActionList }, - { "QPtrList<KAction>", marshall_KActionList }, - { "QPtrList<KAction>&", marshall_KActionList }, + { "TQPtrList<KAction>", marshall_KActionList }, + { "TQPtrList<KAction>&", marshall_KActionList }, { "KMimeType::List", marshall_KMimeTypeList }, { "KMimeType::Ptr", marshall_KMimeTypePtr }, { "KService::Ptr", marshall_KServicePtr }, @@ -1391,8 +1391,8 @@ TypeHandler KDE_handlers[] = { #if KDE_VERSION >= 0x030200 { "KMountPoint::List", marshall_KMountPointList }, { "KPluginInfo::List", marshall_KPluginInfoList }, - { "QValueList<KConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList }, - { "QValueList<KConfigSkeleton::ItemEnum::Choice>&", marshall_ChoicesList }, + { "TQValueList<KConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList }, + { "TQValueList<KConfigSkeleton::ItemEnum::Choice>&", marshall_ChoicesList }, #endif { "KServiceType::List", marshall_KServiceTypeList }, { "KTrader::OfferList", marshall_KTraderOfferList }, @@ -1400,29 +1400,29 @@ TypeHandler KDE_handlers[] = { { "KURL::List&", marshall_KURLList }, { "KFileItemList", marshall_KFileItemList }, { "KFileItemList*", marshall_KFileItemList }, - { "QPtrList<KMainWindow>*", marshall_KMainWindowList }, - { "QPtrList<DCOPObject>", marshall_DCOPObjectList }, - { "QPtrList<KDockWidget>&", marshall_KDockWidgetList }, - { "QPtrList<KDockWidget>*", marshall_KDockWidgetList }, + { "TQPtrList<KMainWindow>*", marshall_KMainWindowList }, + { "TQPtrList<DCOPObject>", marshall_DCOPObjectList }, + { "TQPtrList<KDockWidget>&", marshall_KDockWidgetList }, + { "TQPtrList<KDockWidget>*", marshall_KDockWidgetList }, { "KFileTreeBranchList&", marshall_KFileTreeBranch }, { "KFileTreeViewItemList&", marshall_KFileTreeViewItem }, - { "QPtrList<KParts::Part>*", marshall_KPartList }, - { "QPtrList<KParts::Plugin>", marshall_KPartPluginList }, - { "QPtrList<KParts::ReadOnlyPart>", marshall_KPartReadOnlyPartList }, - { "QPtrList<KServiceTypeProfile>&", marshall_KServiceTypeProfileList }, - { "QValueList<KAction*>", marshall_KActionPtrList }, + { "TQPtrList<KParts::Part>*", marshall_KPartList }, + { "TQPtrList<KParts::Plugin>", marshall_KPartPluginList }, + { "TQPtrList<KParts::ReadOnlyPart>", marshall_KPartReadOnlyPartList }, + { "TQPtrList<KServiceTypeProfile>&", marshall_KServiceTypeProfileList }, + { "TQValueList<KAction*>", marshall_KActionPtrList }, { "KActionPtrList", marshall_KActionPtrList }, - { "QValueList<KAboutPerson>", marshall_KAboutPersonList }, - { "QValueList<KAboutTranslator>", marshall_KAboutTranslatorList }, - { "QValueList<KIO::CopyInfo>&", marshall_KIOCopyInfoList }, + { "TQValueList<KAboutPerson>", marshall_KAboutPersonList }, + { "TQValueList<KAboutTranslator>", marshall_KAboutTranslatorList }, + { "TQValueList<KIO::CopyInfo>&", marshall_KIOCopyInfoList }, { "KIO::UDSEntry&", marshall_UDSEntry }, { "KIO::UDSEntryList&", marshall_UDSEntryList }, { "KServiceTypeProfile::OfferList", marshall_KServiceOfferList }, { "KEntryMap", marshall_QMapKEntryKeyKEntry }, { "KEntryMap&", marshall_QMapKEntryKeyKEntry }, { "KEntryMap*", marshall_QMapKEntryKeyKEntry }, - { "QMap<QCString,DCOPRef>", marshall_QMapQCStringDCOPRef }, - { "QValueList<WId>&", marshall_WIdList }, - { "QValueList<WId>", marshall_WIdList }, + { "TQMap<TQCString,DCOPRef>", marshall_QMapQCStringDCOPRef }, + { "TQValueList<WId>&", marshall_WIdList }, + { "TQValueList<WId>", marshall_WIdList }, { 0, 0 } }; diff --git a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp index 6274e4bf..ee11862e 100644 --- a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp +++ b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp @@ -22,10 +22,10 @@ Boston, MA 02110-1301, USA. */ -#include <qfile.h> -#include <qtextstream.h> -#include <qdom.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqdom.h> +#include <tqregexp.h> #include <kaboutdata.h> #include <kapplication.h> @@ -51,23 +51,23 @@ static const KCmdLineOptions options[] = bool globalEnums; bool itemAccessors; -QStringList allNames; -QRegExp *validNameRegexp; +TQStringList allNames; +TQRegExp *validNameRegexp; class CfgEntry { public: struct Choice { - QString name; - QString label; - QString whatsThis; + TQString name; + TQString label; + TQString whatsThis; }; - CfgEntry( const QString &group, const QString &type, const QString &key, - const QString &name, const QString &label, - const QString &whatsThis, const QString &code, - const QString &defaultValue, const QValueList<Choice> &choices, + CfgEntry( const TQString &group, const TQString &type, const TQString &key, + const TQString &name, const TQString &label, + const TQString &whatsThis, const TQString &code, + const TQString &defaultValue, const TQValueList<Choice> &choices, bool hidden ) : mGroup( group ), mType( type ), mKey( key ), mName( name ), mLabel( label ), mWhatsThis( whatsThis ), mCode( code ), @@ -76,53 +76,53 @@ class CfgEntry { } - void setGroup( const QString &group ) { mGroup = group; } - QString group() const { return mGroup; } + void setGroup( const TQString &group ) { mGroup = group; } + TQString group() const { return mGroup; } - void setType( const QString &type ) { mType = type; } - QString type() const { return mType; } + void setType( const TQString &type ) { mType = type; } + TQString type() const { return mType; } - void setKey( const QString &key ) { mKey = key; } - QString key() const { return mKey; } + void setKey( const TQString &key ) { mKey = key; } + TQString key() const { return mKey; } - void setName( const QString &name ) { mName = name; } - QString name() const { return mName; } + void setName( const TQString &name ) { mName = name; } + TQString name() const { return mName; } - void setLabel( const QString &label ) { mLabel = label; } - QString label() const { return mLabel; } + void setLabel( const TQString &label ) { mLabel = label; } + TQString label() const { return mLabel; } - void setWhatsThis( const QString &whatsThis ) { mWhatsThis = whatsThis; } - QString whatsThis() const { return mWhatsThis; } + void setWhatsThis( const TQString &whatsThis ) { mWhatsThis = whatsThis; } + TQString whatsThis() const { return mWhatsThis; } - void setDefaultValue( const QString &d ) { mDefaultValue = d; } - QString defaultValue() const { return mDefaultValue; } + void setDefaultValue( const TQString &d ) { mDefaultValue = d; } + TQString defaultValue() const { return mDefaultValue; } - void setCode( const QString &d ) { mCode = d; } - QString code() const { return mCode; } + void setCode( const TQString &d ) { mCode = d; } + TQString code() const { return mCode; } - void setMinValue( const QString &d ) { mMin = d; } - QString minValue() const { return mMin; } + void setMinValue( const TQString &d ) { mMin = d; } + TQString minValue() const { return mMin; } - void setMaxValue( const QString &d ) { mMax = d; } - QString maxValue() const { return mMax; } + void setMaxValue( const TQString &d ) { mMax = d; } + TQString maxValue() const { return mMax; } - void setParam( const QString &d ) { mParam = d; } - QString param() const { return mParam; } + void setParam( const TQString &d ) { mParam = d; } + TQString param() const { return mParam; } - void setParamName( const QString &d ) { mParamName = d; } - QString paramName() const { return mParamName; } + void setParamName( const TQString &d ) { mParamName = d; } + TQString paramName() const { return mParamName; } - void setParamType( const QString &d ) { mParamType = d; } - QString paramType() const { return mParamType; } + void setParamType( const TQString &d ) { mParamType = d; } + TQString paramType() const { return mParamType; } - void setChoices( const QValueList<Choice> &d ) { mChoices = d; } - QValueList<Choice> choices() const { return mChoices; } + void setChoices( const TQValueList<Choice> &d ) { mChoices = d; } + TQValueList<Choice> choices() const { return mChoices; } - void setParamValues( const QStringList &d ) { mParamValues = d; } - QStringList paramValues() const { return mParamValues; } + void setParamValues( const TQStringList &d ) { mParamValues = d; } + TQStringList paramValues() const { return mParamValues; } - void setParamDefaultValues( const QStringList &d ) { mParamDefaultValues = d; } - QString paramDefaultValue(int i) const { return mParamDefaultValues[i]; } + void setParamDefaultValues( const TQStringList &d ) { mParamDefaultValues = d; } + TQString paramDefaultValue(int i) const { return mParamDefaultValues[i]; } void setParamMax( int d ) { mParamMax = d; } int paramMax() const { return mParamMax; } @@ -155,73 +155,73 @@ class CfgEntry } private: - QString mGroup; - QString mType; - QString mKey; - QString mName; - QString mLabel; - QString mWhatsThis; - QString mCode; - QString mDefaultValue; - QString mParam; - QString mParamName; - QString mParamType; - QValueList<Choice> mChoices; - QStringList mParamValues; - QStringList mParamDefaultValues; + TQString mGroup; + TQString mType; + TQString mKey; + TQString mName; + TQString mLabel; + TQString mWhatsThis; + TQString mCode; + TQString mDefaultValue; + TQString mParam; + TQString mParamName; + TQString mParamType; + TQValueList<Choice> mChoices; + TQStringList mParamValues; + TQStringList mParamDefaultValues; int mParamMax; bool mHidden; - QString mMin; - QString mMax; + TQString mMin; + TQString mMax; }; -static QString varName(const QString &n) +static TQString varName(const TQString &n) { - QString result = "@"+n; + TQString result = "@"+n; result[1] = result[1].lower(); return result; } -static QString enumName(const QString &n) +static TQString enumName(const TQString &n) { - QString result = "Enum"+n; + TQString result = "Enum"+n; result[4] = result[4].upper(); return result; } -static QString enumValue(const QString &n) +static TQString enumValue(const TQString &n) { - QString result = n; + TQString result = n; result[0] = result[0].upper(); return result; } -static QString setFunction(const QString &n) +static TQString setFunction(const TQString &n) { - QString result = "set"+n; + TQString result = "set"+n; result[3] = result[3].upper(); return result; } -static QString getFunction(const QString &n) +static TQString getFunction(const TQString &n) { - QString result = n; + TQString result = n; result[0] = result[0].lower(); return result; } -static void addQuotes( QString &s ) +static void addQuotes( TQString &s ) { if ( s.left( 1 ) != "\"" ) s.prepend( "\"" ); if ( s.right( 1 ) != "\"" ) s.append( "\"" ); } -static QString quoteString( const QString &s ) +static TQString quoteString( const TQString &s ) { - QString r = s; + TQString r = s; r.replace( "\\", "\\\\" ); r.replace( "\"", "\\\"" ); r.replace( "\r", "" ); @@ -229,7 +229,7 @@ static QString quoteString( const QString &s ) return "\"" + r + "\""; } -static QString literalString( const QString &s ) +static TQString literalString( const TQString &s ) { bool isAscii = true; for(int i = s.length(); i--;) @@ -238,15 +238,15 @@ static QString literalString( const QString &s ) return quoteString(s); // if (isAscii) -// return "QString::fromLatin1( " + quoteString(s) + " )"; +// return "TQString::fromLatin1( " + quoteString(s) + " )"; // else -// return "QString::fromUtf8( " + quoteString(s) + " )"; +// return "TQString::fromUtf8( " + quoteString(s) + " )"; } -static QString dumpNode(const QDomNode &node) +static TQString dumpNode(const TQDomNode &node) { - QString msg; - QTextStream s(&msg, IO_WriteOnly ); + TQString msg; + TQTextStream s(&msg, IO_WriteOnly ); node.save(s, 0); msg = msg.simplifyWhiteSpace(); @@ -255,7 +255,7 @@ static QString dumpNode(const QDomNode &node) return msg; } -static QString filenameOnly(QString path) +static TQString filenameOnly(TQString path) { int i = path.findRev('/'); if (i >= 0) @@ -263,10 +263,10 @@ static QString filenameOnly(QString path) return path; } -static void preProcessDefault( QString &defaultValue, const QString &name, - const QString &type, - const QValueList<CfgEntry::Choice> &choices, - QString &code ) +static void preProcessDefault( TQString &defaultValue, const TQString &name, + const TQString &type, + const TQValueList<CfgEntry::Choice> &choices, + TQString &code ) { if ( type == "String" && !defaultValue.isEmpty() ) { defaultValue = literalString(defaultValue); @@ -275,14 +275,14 @@ static void preProcessDefault( QString &defaultValue, const QString &name, defaultValue = literalString( defaultValue ); } else if ( type == "StringList" && !defaultValue.isEmpty() ) { - QTextStream rb( &code, IO_WriteOnly | IO_Append ); + TQTextStream rb( &code, IO_WriteOnly | IO_Append ); if (!code.isEmpty()) rb << endl; -// rb << " QStringList default" << name << ";" << endl; +// rb << " TQStringList default" << name << ";" << endl; rb << " default" << name << " = []" << endl; - QStringList defaults = QStringList::split( ",", defaultValue ); - QStringList::ConstIterator it; + TQStringList defaults = TQStringList::split( ",", defaultValue ); + TQStringList::ConstIterator it; for( it = defaults.begin(); it != defaults.end(); ++it ) { rb << " default" << name << " << \"" << *it << "\"" << endl; @@ -290,7 +290,7 @@ static void preProcessDefault( QString &defaultValue, const QString &name, defaultValue = "default" + name; } else if ( type == "Color" && !defaultValue.isEmpty() ) { - QRegExp colorRe("\\d+,\\s*\\d+,\\s*\\d+"); + TQRegExp colorRe("\\d+,\\s*\\d+,\\s*\\d+"); if (colorRe.exactMatch(defaultValue)) { defaultValue = "Qt::Color.new( " + defaultValue + " )"; @@ -302,7 +302,7 @@ static void preProcessDefault( QString &defaultValue, const QString &name, } else if ( type == "Enum" ) { if ( !globalEnums ) { - QValueList<CfgEntry::Choice>::ConstIterator it; + TQValueList<CfgEntry::Choice>::ConstIterator it; for( it = choices.begin(); it != choices.end(); ++it ) { if ( (*it).name == defaultValue ) { defaultValue.prepend( enumName(name) + "_"); @@ -312,13 +312,13 @@ static void preProcessDefault( QString &defaultValue, const QString &name, } } else if ( type == "IntList" ) { - QTextStream rb( &code, IO_WriteOnly | IO_Append ); + TQTextStream rb( &code, IO_WriteOnly | IO_Append ); if (!code.isEmpty()) rb << endl; rb << " default" << name << " = []" << endl; - QStringList defaults = QStringList::split( ",", defaultValue ); - QStringList::ConstIterator it; + TQStringList defaults = TQStringList::split( ",", defaultValue ); + TQStringList::ConstIterator it; for( it = defaults.begin(); it != defaults.end(); ++it ) { rb << " default" << name << " << " << *it << "" << endl; @@ -328,31 +328,31 @@ static void preProcessDefault( QString &defaultValue, const QString &name, } -CfgEntry *parseEntry( const QString &group, const QDomElement &element ) +CfgEntry *parseEntry( const TQString &group, const TQDomElement &element ) { bool defaultCode = false; - QString type = element.attribute( "type" ); - QString name = element.attribute( "name" ); - QString key = element.attribute( "key" ); - QString hidden = element.attribute( "hidden" ); - QString label; - QString whatsThis; - QString defaultValue; - QString code; - QString param; - QString paramName; - QString paramType; - QValueList<CfgEntry::Choice> choices; - QStringList paramValues; - QStringList paramDefaultValues; - QString minValue; - QString maxValue; + TQString type = element.attribute( "type" ); + TQString name = element.attribute( "name" ); + TQString key = element.attribute( "key" ); + TQString hidden = element.attribute( "hidden" ); + TQString label; + TQString whatsThis; + TQString defaultValue; + TQString code; + TQString param; + TQString paramName; + TQString paramType; + TQValueList<CfgEntry::Choice> choices; + TQStringList paramValues; + TQStringList paramDefaultValues; + TQString minValue; + TQString maxValue; int paramMax = 0; - QDomNode n; + TQDomNode n; for ( n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) { - QDomElement e = n.toElement(); - QString tag = e.tagName(); + TQDomElement e = n.toElement(); + TQString tag = e.tagName(); if ( tag == "label" ) label = e.text(); else if ( tag == "whatsthis" ) whatsThis = e.text(); else if ( tag == "min" ) minValue = e.text(); @@ -382,14 +382,14 @@ CfgEntry *parseEntry( const QString &group, const QDomElement &element ) } else if (paramType == "Enum") { - QDomNode n2; + TQDomNode n2; for ( n2 = e.firstChild(); !n2.isNull(); n2 = n2.nextSibling() ) { - QDomElement e2 = n2.toElement(); + TQDomElement e2 = n2.toElement(); if (e2.tagName() == "values") { - QDomNode n3; + TQDomNode n3; for ( n3 = e2.firstChild(); !n3.isNull(); n3 = n3.nextSibling() ) { - QDomElement e3 = n3.toElement(); + TQDomElement e3 = n3.toElement(); if (e3.tagName() == "value") { paramValues.append( e3.text() ); @@ -421,18 +421,18 @@ CfgEntry *parseEntry( const QString &group, const QDomElement &element ) } } else if ( tag == "choices" ) { - QDomNode n2; + TQDomNode n2; for( n2 = e.firstChild(); !n2.isNull(); n2 = n2.nextSibling() ) { - QDomElement e2 = n2.toElement(); + TQDomElement e2 = n2.toElement(); if ( e2.tagName() == "choice" ) { - QDomNode n3; + TQDomNode n3; CfgEntry::Choice choice; choice.name = e2.attribute( "name" ); if ( choice.name.isEmpty() ) { kdError() << "Tag <choice> requires attribute 'name'." << endl; } for( n3 = e2.firstChild(); !n3.isNull(); n3 = n3.nextSibling() ) { - QDomElement e3 = n3.toElement(); + TQDomElement e3 = n3.toElement(); if ( e3.tagName() == "label" ) choice.label = e3.text(); if ( e3.tagName() == "whatsthis" ) choice.whatsThis = e3.text(); } @@ -454,7 +454,7 @@ CfgEntry *parseEntry( const QString &group, const QDomElement &element ) if ( nameIsEmpty ) { name = key; - name.replace( " ", QString::null ); + name.replace( " ", TQString::null ); } else if ( name.contains( ' ' ) ) { kdWarning()<<"Entry '"<<name<<"' contains spaces! <name> elements can't contain speces!"<<endl; name.remove( ' ' ); @@ -487,20 +487,20 @@ CfgEntry *parseEntry( const QString &group, const QDomElement &element ) { // Adjust name paramName = name; - name.replace("$("+param+")", QString::null); + name.replace("$("+param+")", TQString::null); // Lookup defaults for indexed entries for(int i = 0; i <= paramMax; i++) { - paramDefaultValues.append(QString::null); + paramDefaultValues.append(TQString::null); } - QDomNode n; + TQDomNode n; for ( n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) { - QDomElement e = n.toElement(); - QString tag = e.tagName(); + TQDomElement e = n.toElement(); + TQString tag = e.tagName(); if ( tag == "default" ) { - QString index = e.attribute("param"); + TQString index = e.attribute("param"); if (index.isEmpty()) continue; @@ -522,7 +522,7 @@ CfgEntry *parseEntry( const QString &group, const QDomElement &element ) return 0; } - QString tmpDefaultValue = e.text(); + TQString tmpDefaultValue = e.text(); if (e.attribute( "code" ) != "true") preProcessDefault(tmpDefaultValue, name, type, choices, code); @@ -579,36 +579,36 @@ CfgEntry *parseEntry( const QString &group, const QDomElement &element ) /** Return parameter declaration for given type. */ -QString param( const QString &type ) +TQString param( const TQString &type ) { - if ( type == "String" ) return "const QString &"; - else if ( type == "StringList" ) return "const QStringList &"; - else if ( type == "Font" ) return "const QFont &"; - else if ( type == "Rect" ) return "const QRect &"; - else if ( type == "Size" ) return "const QSize &"; - else if ( type == "Color" ) return "const QColor &"; - else if ( type == "Point" ) return "const QPoint &"; + if ( type == "String" ) return "const TQString &"; + else if ( type == "StringList" ) return "const TQStringList &"; + else if ( type == "Font" ) return "const TQFont &"; + else if ( type == "Rect" ) return "const TQRect &"; + else if ( type == "Size" ) return "const TQSize &"; + else if ( type == "Color" ) return "const TQColor &"; + else if ( type == "Point" ) return "const TQPoint &"; else if ( type == "Int" ) return "int"; else if ( type == "UInt" ) return "uint"; else if ( type == "Bool" ) return "bool"; else if ( type == "Double" ) return "double"; - else if ( type == "DateTime" ) return "const QDateTime &"; + else if ( type == "DateTime" ) return "const TQDateTime &"; else if ( type == "Int64" ) return "Q_INT64"; else if ( type == "UInt64" ) return "Q_UINT64"; - else if ( type == "IntList" ) return "const QValueList<int> &"; + else if ( type == "IntList" ) return "const TQValueList<int> &"; else if ( type == "Enum" ) return "int"; - else if ( type == "Path" ) return "const QString &"; - else if ( type == "Password" ) return "const QString &"; + else if ( type == "Path" ) return "const TQString &"; + else if ( type == "Password" ) return "const TQString &"; else { kdError() <<"rbkconfig_compiler does not support type \""<< type <<"\""<<endl; - return "QString"; //For now, but an assert would be better + return "TQString"; //For now, but an assert would be better } } /** Actual Ruby initializer value to give a type. */ -QString rbType( const QString &type ) +TQString rbType( const TQString &type ) { if ( type == "String" ) return "\"\""; else if ( type == "StringList" ) return "[]"; @@ -634,7 +634,7 @@ QString rbType( const QString &type ) } } -QString defaultValue( const QString &type ) +TQString defaultValue( const TQString &type ) { if ( type == "String" ) return "\"\""; // Use empty string, not null string! else if ( type == "StringList" ) return "[]"; @@ -660,16 +660,16 @@ QString defaultValue( const QString &type ) } } -QString itemType( const QString &type ) +TQString itemType( const TQString &type ) { - QString t; + TQString t; t = type; t.replace( 0, 1, t.left( 1 ).upper() ); return t; } -static QString itemVar(const CfgEntry *e) +static TQString itemVar(const CfgEntry *e) { if (itemAccessors) return varName( e->name() ) + "Item"; @@ -678,10 +678,10 @@ static QString itemVar(const CfgEntry *e) } -QString newItem( const QString &type, const QString &name, const QString &key, - const QString &defaultValue, const QString ¶m = QString::null) +TQString newItem( const TQString &type, const TQString &name, const TQString &key, + const TQString &defaultValue, const TQString ¶m = TQString::null) { - QString t = "Item" + itemType( type ) + + TQString t = "Item" + itemType( type ) + ".new( currentGroup(), " + key + ", " + varName( name ) + param; if ( type == "Enum" ) { t += ".toInt"; @@ -703,11 +703,11 @@ QString newItem( const QString &type, const QString &name, const QString &key, return t; } -QString addItem( const QString &type, const QString &name, const QString &key, - const QString &defaultValue, const QString ¶m = QString::null, - const QString ¶mName = QString::null ) +TQString addItem( const TQString &type, const TQString &name, const TQString &key, + const TQString &defaultValue, const TQString ¶m = TQString::null, + const TQString ¶mName = TQString::null ) { - QString t = "addItem" + itemType( type ) + + TQString t = "addItem" + itemType( type ) + "( " + key + ", " + varName( name ) + param; if ( type == "Enum" ) t += ", values" + name; if ( !defaultValue.isEmpty() ) { @@ -726,20 +726,20 @@ QString addItem( const QString &type, const QString &name, const QString &key, return t; } -QString paramString(const QString &s, const CfgEntry *e, int i) +TQString paramString(const TQString &s, const CfgEntry *e, int i) { - QString result = s; - QString needle = "$("+e->param()+")"; + TQString result = s; + TQString needle = "$("+e->param()+")"; if (result.contains(needle)) { - QString tmp; + TQString tmp; if (e->paramType() == "Enum") { tmp = e->paramValues()[i]; } else { - tmp = QString::number(i); + tmp = TQString::number(i); } result.replace(needle, tmp); @@ -747,12 +747,12 @@ QString paramString(const QString &s, const CfgEntry *e, int i) return result; } -QString paramString(const QString &group, const QStringList ¶meters) +TQString paramString(const TQString &group, const TQStringList ¶meters) { - QString paramString = group; - QString arguments; + TQString paramString = group; + TQString arguments; int i = 0; - for( QStringList::ConstIterator it = parameters.begin(); + for( TQStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it) { if (paramString.contains("$("+*it+")")) @@ -776,9 +776,9 @@ QString paramString(const QString &group, const QStringList ¶meters) } /* int i is the value of the parameter */ -QString userTextsFunctions( CfgEntry *e, QString itemVarStr=QString::null, QString i=QString::null ) +TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString::null, TQString i=TQString::null ) { - QString txt; + TQString txt; if (itemVarStr.isNull()) itemVarStr=itemVar(e); if ( !e->label().isEmpty() ) { txt += " " + itemVarStr + ".setLabel( i18n("; @@ -827,35 +827,35 @@ int main( int argc, char **argv ) return 1; } - validNameRegexp = new QRegExp("[a-zA-Z_][a-zA-Z0-9_]*"); + validNameRegexp = new TQRegExp("[a-zA-Z_][a-zA-Z0-9_]*"); - QString baseDir = QFile::decodeName(args->getOption("directory")); + TQString baseDir = TQFile::decodeName(args->getOption("directory")); if (!baseDir.endsWith("/")) baseDir.append("/"); - QString inputFilename = args->url( 0 ).path(); - QString codegenFilename = args->url( 1 ).path(); + TQString inputFilename = args->url( 0 ).path(); + TQString codegenFilename = args->url( 1 ).path(); if (!codegenFilename.endsWith(".kcfgc")) { kdError() << "Codegen options file must have extension .kcfgc" << endl; return 1; } - QString baseName = args->url( 1 ).fileName(); + TQString baseName = args->url( 1 ).fileName(); baseName = baseName.left(baseName.length() - 6); KSimpleConfig codegenConfig( codegenFilename, true ); - QString nameSpace = codegenConfig.readEntry("NameSpace"); - QString className = codegenConfig.readEntry("ClassName"); - QString inherits = codegenConfig.readEntry("Inherits"); - QString visibility = codegenConfig.readEntry("Visibility"); + TQString nameSpace = codegenConfig.readEntry("NameSpace"); + TQString className = codegenConfig.readEntry("ClassName"); + TQString inherits = codegenConfig.readEntry("Inherits"); + TQString visibility = codegenConfig.readEntry("Visibility"); if (!visibility.isEmpty()) visibility+=" "; bool singleton = codegenConfig.readBoolEntry("Singleton", false); bool customAddons = codegenConfig.readBoolEntry("CustomAdditions"); - QString memberVariables = codegenConfig.readEntry("MemberVariables"); - QStringList headerIncludes = codegenConfig.readListEntry("IncludeFiles"); - QStringList mutators = codegenConfig.readListEntry("Mutators"); + TQString memberVariables = codegenConfig.readEntry("MemberVariables"); + TQStringList headerIncludes = codegenConfig.readListEntry("IncludeFiles"); + TQStringList mutators = codegenConfig.readListEntry("Mutators"); bool allMutators = false; if ((mutators.count() == 1) && (mutators[0].lower() == "true")) allMutators = true; @@ -864,10 +864,10 @@ int main( int argc, char **argv ) globalEnums = codegenConfig.readBoolEntry( "GlobalEnums", false ); - QFile input( inputFilename ); + TQFile input( inputFilename ); - QDomDocument doc; - QString errorMsg; + TQDomDocument doc; + TQString errorMsg; int errorRow; int errorCol; if ( !doc.setContent( &input, &errorMsg, &errorRow, &errorCol ) ) { @@ -876,52 +876,52 @@ int main( int argc, char **argv ) return 1; } - QDomElement cfgElement = doc.documentElement(); + TQDomElement cfgElement = doc.documentElement(); if ( cfgElement.isNull() ) { kdError() << "No document in kcfg file" << endl; return 1; } - QString cfgFileName; + TQString cfgFileName; bool cfgFileNameArg = false; - QStringList parameters; - QStringList includes; + TQStringList parameters; + TQStringList includes; - QPtrList<CfgEntry> entries; + TQPtrList<CfgEntry> entries; entries.setAutoDelete( true ); - QDomNode n; + TQDomNode n; for ( n = cfgElement.firstChild(); !n.isNull(); n = n.nextSibling() ) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); - QString tag = e.tagName(); + TQString tag = e.tagName(); if ( tag == "include" ) { - QString includeFile = e.text(); + TQString includeFile = e.text(); if (!includeFile.isEmpty()) includes.append(includeFile); } else if ( tag == "kcfgfile" ) { cfgFileName = e.attribute( "name" ); cfgFileNameArg = e.attribute( "arg" ).lower() == "true"; - QDomNode n2; + TQDomNode n2; for( n2 = e.firstChild(); !n2.isNull(); n2 = n2.nextSibling() ) { - QDomElement e2 = n2.toElement(); + TQDomElement e2 = n2.toElement(); if ( e2.tagName() == "parameter" ) { parameters.append( e2.attribute( "name" ) ); } } } else if ( tag == "group" ) { - QString group = e.attribute( "name" ); + TQString group = e.attribute( "name" ); if ( group.isEmpty() ) { kdError() << "Group without name" << endl; return 1; } - QDomNode n2; + TQDomNode n2; for( n2 = e.firstChild(); !n2.isNull(); n2 = n2.nextSibling() ) { - QDomElement e2 = n2.toElement(); + TQDomElement e2 = n2.toElement(); if ( e2.tagName() != "entry" ) continue; CfgEntry *entry = parseEntry( group, e2 ); if ( entry ) entries.append( entry ); @@ -968,15 +968,15 @@ int main( int argc, char **argv ) } #endif - QString implementationFileName = baseName + ".rb"; + TQString implementationFileName = baseName + ".rb"; - QFile implementation( baseDir + implementationFileName ); + TQFile implementation( baseDir + implementationFileName ); if ( !implementation.open( IO_WriteOnly ) ) { kdError() << "Can't open '" << implementationFileName << "for writing." << endl; return 1; } - QTextStream rb( &implementation ); + TQTextStream rb( &implementation ); rb << "# This file is generated by rbkconfig_compiler from " << args->url(0).fileName() << "." << endl; rb << "# All changes you do to this file will be lost." << endl; @@ -994,7 +994,7 @@ int main( int argc, char **argv ) // << className.upper() << "_H" << endl << endl; // Includes -// QStringList::ConstIterator it; +// TQStringList::ConstIterator it; // for( it = headerIncludes.begin(); it != headerIncludes.end(); ++it ) { // rb << "#include <" << *it << ">" << endl; // } @@ -1016,10 +1016,10 @@ int main( int argc, char **argv ) // enums CfgEntry *e; for( e = entries.first(); e; e = entries.next() ) { - QValueList<CfgEntry::Choice> choices = e->choices(); + TQValueList<CfgEntry::Choice> choices = e->choices(); if ( !choices.isEmpty() ) { - QStringList values; - QValueList<CfgEntry::Choice>::ConstIterator itChoice; + TQStringList values; + TQValueList<CfgEntry::Choice>::ConstIterator itChoice; for( itChoice = choices.begin(); itChoice != choices.end(); ++itChoice ) { if (globalEnums) { values.append( enumValue((*itChoice).name) ); @@ -1031,16 +1031,16 @@ int main( int argc, char **argv ) values.append( enumName(e->name()) + "_COUNT" ); } int count = 0; - for ( QStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { + for ( TQStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { rb << " " << *it << " = " << count << endl; } rb << endl; } - QStringList values = e->paramValues(); + TQStringList values = e->paramValues(); if ( !values.isEmpty() ) { int count = 0; - for ( QStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { + for ( TQStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { if (globalEnums) { rb << " " << enumValue(*it) << " = " << count << endl; } else { @@ -1055,7 +1055,7 @@ int main( int argc, char **argv ) rb << " def " << enumName(e->param()) << "ToString(i)" << endl; rb << " ["; count = 0; - for ( QStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { + for ( TQStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { if (count > 0) { rb << ", "; } @@ -1071,8 +1071,8 @@ int main( int argc, char **argv ) rb << endl; for( e = entries.first(); e; e = entries.next() ) { - QString n = e->name(); - QString t = e->type(); + TQString n = e->name(); + TQString t = e->type(); // Manipulator if (allMutators || mutators.contains(n)) @@ -1180,7 +1180,7 @@ int main( int argc, char **argv ) rb << " def initialize( "; if (cfgFileNameArg) rb << " config" << (parameters.isEmpty() ? " " : ", "); - for (QStringList::ConstIterator it = parameters.begin(); + for (TQStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it) { if (it != parameters.begin()) @@ -1196,13 +1196,13 @@ int main( int argc, char **argv ) rb << ")" << endl; // Store parameters - for (QStringList::ConstIterator it = parameters.begin(); + for (TQStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it) { rb << " @param" << *it << " = Qt::Variant.new( " << *it << " )" << endl; } - QString group; + TQString group; for( e = entries.first(); e; e = entries.next() ) { if ( e->group() != group ) { group = e->group(); @@ -1227,7 +1227,7 @@ int main( int argc, char **argv ) rb << endl; - group = QString::null; + group = TQString::null; for( e = entries.first(); e; e = entries.next() ) { if ( e->group() != group ) { if ( !group.isEmpty() ) rb << endl; @@ -1235,7 +1235,7 @@ int main( int argc, char **argv ) rb << " setCurrentGroup( " << paramString(group, parameters) << " )" << endl << endl; } - QString key = paramString(e->key(), parameters); + TQString key = paramString(e->key(), parameters); if ( !e->code().isEmpty()) { rb << e->code() << endl; @@ -1243,8 +1243,8 @@ int main( int argc, char **argv ) if ( e->type() == "Enum" ) { rb << " values" << e->name() << " = []" << endl; - QValueList<CfgEntry::Choice> choices = e->choices(); - QValueList<CfgEntry::Choice>::ConstIterator it; + TQValueList<CfgEntry::Choice> choices = e->choices(); + TQValueList<CfgEntry::Choice>::ConstIterator it; for( it = choices.begin(); it != choices.end(); ++it ) { rb << " choice = ItemEnum::Choice.new" << endl; rb << " choice.name = \"" << enumValue((*it).name) << "\" " << endl; @@ -1275,7 +1275,7 @@ int main( int argc, char **argv ) rb << userTextsFunctions( e ); rb << " addItem( " << itemVar(e); - QString quotedName = e->name(); + TQString quotedName = e->name(); addQuotes( quotedName ); if ( quotedName != key ) rb << ", \"" << e->name() << "\""; rb << " )" << endl; @@ -1286,8 +1286,8 @@ int main( int argc, char **argv ) rb << " " << itemVar(e) << " = Array.new(" << e->paramMax()+1 << ")" << endl; for(int i = 0; i <= e->paramMax(); i++) { - QString defaultStr; - QString itemVarStr(itemVar(e)+QString("[%1]").arg(i)); + TQString defaultStr; + TQString itemVarStr(itemVar(e)+TQString("[%1]").arg(i)); if ( !e->paramDefaultValue(i).isEmpty() ) defaultStr = e->paramDefaultValue(i); @@ -1297,10 +1297,10 @@ int main( int argc, char **argv ) defaultStr = defaultValue( e->type() ); rb << " " << itemVarStr << " = " - << newItem( e->type(), e->name(), paramString(key, e, i), defaultStr, QString("[%1]").arg(i) ) + << newItem( e->type(), e->name(), paramString(key, e, i), defaultStr, TQString("[%1]").arg(i) ) << endl; - rb << " " << itemVarStr << ".property = " << varName(e->name())+QString("[%1]").arg(i) << endl; + rb << " " << itemVarStr << ".property = " << varName(e->name())+TQString("[%1]").arg(i) << endl; if ( setUserTexts ) rb << userTextsFunctions( e, itemVarStr, e->paramName() ); |