diff options
Diffstat (limited to 'korundum/rubylib/korundum/Korundum.cpp')
-rw-r--r-- | korundum/rubylib/korundum/Korundum.cpp | 190 |
1 files changed, 95 insertions, 95 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; } |