summaryrefslogtreecommitdiffstats
path: root/korundum/rubylib/korundum
diff options
context:
space:
mode:
Diffstat (limited to 'korundum/rubylib/korundum')
-rw-r--r--korundum/rubylib/korundum/Korundum.cpp182
-rw-r--r--korundum/rubylib/korundum/kdehandlers.cpp98
2 files changed, 140 insertions, 140 deletions
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp
index a4751bb6..effdf522 100644
--- a/korundum/rubylib/korundum/Korundum.cpp
+++ b/korundum/rubylib/korundum/Korundum.cpp
@@ -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, TTQDataStream* 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, TTQDataStream* stream, int i
break;
case xmoc_QString:
{
- TTQString temp((const TTQString&) *((TTQString *) 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, TTQDataStream* stream, int i
case Smoke::t_voidp:
{
// Special case any types which are in the Smoke runtime, but
- // don't have TTQDataStream '<<' methods
- if (strcmp(t.name(), "TTQCString") == 0) {
- TTQCString temp((const TTQCString&) *((TTQCString *) 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(), "TQCStringList") == 0) {
TQCStringList temp((const TQCStringList&) *((TQCStringList *) stack[i].s_voidp));
*stream << temp;
break;
- } else if (strcmp(t.name(), "TTQStringList") == 0) {
- TTQStringList temp((const TTQStringList&) *((TTQStringList *) 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(), "TTQMap<TTQCString,DCOPRef>") == 0) {
- TTQMap<TTQCString,DCOPRef> temp((const TTQMap<TTQCString,DCOPRef>&) *((TTQMap<TTQCString,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: TTQDataStream & operator<<(TTQDataStream&, const MyClass&)
+ // Look for methods of the form: TQDataStream & operator<<(TQDataStream&, const MyClass&)
Smoke::Index meth = t.smoke()->findMethod("TQGlobalSpace", "operator<<##");
Smoke::Index ix;
if (meth > 0) {
@@ -165,7 +165,7 @@ smokeStackToStream(Marshall *m, Smoke::Stack stack, TTQDataStream* stream, int i
TQString refType("const ");
refType += t.name();
refType += "&";
- if ( strcmp( "TTQDataStream&",
+ 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, TTQDataStream* 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 TTQDataStream 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, TTQDataStream* stream, int i
and for converting a dcop reply to a ruby value.
*/
static void
-smokeStackFromStream(Marshall *m, Smoke::Stack stack, TTQDataStream* 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, TTQDataStream* stream, int
break;
case xmoc_QString:
{
- TTQString temp;
+ TQString temp;
*stream >> temp;
- stack[i].s_voidp = new TTQString(temp);
+ stack[i].s_voidp = new TQString(temp);
}
break;
default: // case xmoc_ptr:
@@ -288,35 +288,35 @@ smokeStackFromStream(Marshall *m, Smoke::Stack stack, TTQDataStream* stream, int
case Smoke::t_voidp:
{
// Special case any types which are in the Smoke runtime, but
- // don't have TTQDataStream '>>' methods
- if (strcmp(t.name(), "TTQCString") == 0) {
- TTQCString temp;
+ // don't have TQDataStream '>>' methods
+ if (strcmp(t.name(), "TQCString") == 0) {
+ TQCString temp;
*stream >> temp;
- stack[i].s_voidp = new TTQCString(temp);
+ stack[i].s_voidp = new TQCString(temp);
break;
} else if (strcmp(t.name(), "TQCStringList") == 0) {
TQCStringList temp;
*stream >> temp;
stack[i].s_voidp = new TQCStringList(temp);
break;
- } else if (strcmp(t.name(), "TTQStringList") == 0) {
- TTQStringList temp;
+ } else if (strcmp(t.name(), "TQStringList") == 0) {
+ TQStringList temp;
*stream >> temp;
- stack[i].s_voidp = new TTQStringList(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(), "TTQMap<TTQCString,DCOPRef>") == 0) {
- TTQMap<TTQCString,DCOPRef> temp;
+ } else if (strcmp(t.name(), "TQMap<TQCString,DCOPRef>") == 0) {
+ TQMap<TQCString,DCOPRef> temp;
*stream >> temp;
- stack[i].s_voidp = new TTQMap<TTQCString,DCOPRef>(temp);
+ stack[i].s_voidp = new TQMap<TQCString,DCOPRef>(temp);
break;
}
- // First construct an instance to read the TTQDataStream 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, TTQDataStream* stream, int
(*classfn)(t.smoke()->methods[ctor].method, 0, ctor_stack);
stack[i].s_voidp = ctor_stack[0].s_voidp;
- // Look for methods of the form: TTQDataStream & operator>>(TTQDataStream&, MyClass&)
+ // Look for methods of the form: TQDataStream & operator>>(TQDataStream&, MyClass&)
Smoke::Index meth = t.smoke()->findMethod("TQGlobalSpace", "operator>>##");
Smoke::Index ix;
if (meth > 0) {
@@ -343,7 +343,7 @@ smokeStackFromStream(Marshall *m, Smoke::Stack stack, TTQDataStream* stream, int
Smoke::Method &method = t.smoke()->methods[t.smoke()->ambiguousMethodList[ix]];
TQString refType(t.name());
refType += "&";
- if ( strcmp( "TTQDataStream&",
+ 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, TTQDataStream* stream, int
Smoke::StackItem local_stack[3];
local_stack[1].s_voidp = stream;
local_stack[2].s_voidp = stack[i].s_voidp;
- // Call the TTQDataStream 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, TTQDataStream* stream, int
}
/*
- Converts a TTQByteArray 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(TTQDataStream & 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;
- TTQCString & _remFun;
+ TQCString & _remFun;
int _items;
VALUE *_sp;
- TTQByteArray *_data;
- TTQDataStream *_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, TTQCString & 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 TTQByteArray();
- _stream = new TTQDataStream(*_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();
- TTQCString replyType;
- TTQByteArray dataReceived;
+ TQCString replyType;
+ TQByteArray dataReceived;
#if TDE_VERSION >= 0x030200
bool ok = dc->call(dcopRef->app(), dcopRef->obj(), _remFun, *_data, replyType, dataReceived, _useEventLoop, _timeout);
#else
@@ -487,15 +487,15 @@ public:
return;
}
- TTQDataStream ds(dataReceived, IO_ReadOnly);
+ TQDataStream ds(dataReceived, IO_ReadOnly);
- if (replyType == "TTQValueList<DCOPRef>") {
- // Special case TTQValueList<DCOPRef> as a TTQDataStream marshaller
+ if (replyType == "TQValueList<DCOPRef>") {
+ // Special case TQValueList<DCOPRef> as a TQDataStream marshaller
// isn't in the Smoke runtime
- TTQValueList<DCOPRef> valuelist;
+ TQValueList<DCOPRef> valuelist;
ds >> valuelist;
_result = rb_ary_new();
- for (TTQValueListIterator<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 == "TTQValueList<TTQCString>") {
+ } else if (replyType == "TQValueList<TQCString>") {
// And special case this type too
- TTQValueList<TTQCString> propertyList;
+ TQValueList<TQCString> propertyList;
ds >> propertyList;
_result = rb_ary_new();
- for (TTQValueListIterator<TTQCString> 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 == "TTQValueList<int>") {
+ } else if (replyType == "TQValueList<int>") {
// And special case this type too
- TTQValueList<int> propertyList;
+ TQValueList<int> propertyList;
ds >> propertyList;
_result = rb_ary_new();
- for (TTQValueListIterator<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 == "TTQMap<TTQString,DCOPRef>") {
+ } else if (replyType == "TQMap<TQString,DCOPRef>") {
// And another..
- TTQMap<TTQString,DCOPRef> actionMap;
+ TQMap<TQString,DCOPRef> actionMap;
ds >> actionMap;
_result = rb_hash_new();
- TTQMap<TTQString,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;
- TTQCString & _remFun;
- TTQByteArray *_data;
- TTQDataStream *_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, TTQCString & 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 TTQByteArray();
- _stream = new TTQDataStream(*_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;
- TTQByteArray *_data;
- TTQDataStream *_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 TTQByteArray();
- _stream = new TTQDataStream(*_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(TTQByteArray & retval, VALUE * result, VALUE replyType)
+ DCOPReplyValue(TQByteArray & retval, VALUE * result, VALUE replyType)
{
- TTQDataStream _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;
- TTQDataStream * _stream;
+ TQDataStream * _stream;
const char * _replyTypeName;
VALUE _replyType;
- TTQByteArray * _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, "TTQValueList<DCOPRef>") == 0
+ if ( strcmp(_replyTypeName, "TQValueList<DCOPRef>") == 0
&& TYPE(result) == T_ARRAY )
{
- // Special case TTQValueList<DCOPRef> as a TTQDataStream marshaller
+ // Special case TQValueList<DCOPRef> as a TQDataStream marshaller
// isn't in the Smoke runtime
- TTQValueList<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);
}
- TTQDataStream retval(*_retval, IO_WriteOnly);
+ TQDataStream retval(*_retval, IO_WriteOnly);
retval << windowList;
- } else if ( strcmp(_replyTypeName, "TTQValueList<TTQCString>") == 0
+ } else if ( strcmp(_replyTypeName, "TQValueList<TQCString>") == 0
&& TYPE(result) == T_ARRAY )
{
// And special case this type too
- TTQValueList<TTQCString> propertyList;
+ TQValueList<TQCString> propertyList;
for (long i = 0; i < RARRAY(result)->len; i++) {
VALUE item = rb_ary_entry(result, i);
- propertyList.append(TTQCString(StringValuePtr(item)));
+ propertyList.append(TQCString(StringValuePtr(item)));
}
- TTQDataStream retval(*_retval, IO_WriteOnly);
+ TQDataStream retval(*_retval, IO_WriteOnly);
retval << propertyList;
- } else if ( strcmp(_replyTypeName, "TTQMap<TTQString,DCOPRef>") == 0
+ } else if ( strcmp(_replyTypeName, "TQMap<TQString,DCOPRef>") == 0
&& TYPE(result) == T_HASH )
{
// And another..
- TTQMap<TTQString,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[TTQString(StringValuePtr(action))] = (DCOPRef)*(DCOPRef*)ptr;
+ actionMap[TQString(StringValuePtr(action))] = (DCOPRef)*(DCOPRef*)ptr;
}
- TTQDataStream 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, TTQByteArray& data, VALUE replyTypeName, VALUE replyType, TTQByteArray& 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 TTQDataStream(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, TTQString & 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);
- TTQString 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;
}
- TTQByteArray * dataArray = (TTQByteArray*) o->ptr;
+ TQByteArray * dataArray = (TQByteArray*) o->ptr;
o = value_obj_info(replyData);
if (o == 0 || o->ptr == 0) {
return Qfalse;
}
- TTQByteArray * replyArray = (TTQByteArray*) 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*/)
{
- TTQCString 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*/)
{
- TTQCString 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, TTQString(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"));
- TTQStrList *args = new TTQStrList;
+ TQStrList *args = new TQStrList;
if (value_args != Qnil) {
for (long i = 0; i < RARRAY(value_args)->len; i++) {
VALUE item = rb_ary_entry(value_args, i);
- args->append(TTQString::fromLatin1(StringValuePtr(item), RSTRING(item)->len));
+ args->append(TQString::fromLatin1(StringValuePtr(item), RSTRING(item)->len));
}
}
- t->startProgram(TTQString::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 4dc5e138..8951c794 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -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(TTQCString());
+ stringlist->append(TQCString());
continue;
}
- stringlist->append(TTQCString(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;
- TTQValueList<WId> *valuelist = new TTQValueList<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(TTQValueListIterator<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:
{
- TTQValueList<WId> *valuelist = (TTQValueList<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(TTQValueListIterator<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, TTQPtrList<KFileItem>, KFileItem )
-DEF_LIST_MARSHALLER( KMainWindowList, TTQPtrList<KMainWindow>, KMainWindow )
-DEF_LIST_MARSHALLER( KActionList, TTQPtrList<KAction>, KAction )
-DEF_LIST_MARSHALLER( DCOPObjectList, TTQPtrList<DCOPObject>, DCOPObject )
-DEF_LIST_MARSHALLER( KDockWidgetList, TTQPtrList<KDockWidget>, KDockWidget )
-DEF_LIST_MARSHALLER( KFileTreeBranch, TTQPtrList<KFileTreeBranch>, KFileTreeBranch )
-DEF_LIST_MARSHALLER( KFileTreeViewItem, TTQPtrList<KFileTreeViewItem>, KFileTreeViewItem )
-DEF_LIST_MARSHALLER( KPartList, TTQPtrList<KParts::Part>, KParts::Part )
-DEF_LIST_MARSHALLER( KPartPluginList, TTQPtrList<KParts::Plugin>, KParts::Plugin )
-DEF_LIST_MARSHALLER( KPartReadOnlyPartList, TTQPtrList<KParts::ReadOnlyPart>, KParts::ReadOnlyPart )
-DEF_LIST_MARSHALLER( KServiceTypeProfileList, TTQPtrList<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 TDE_VERSION >= 0x030200
-DEF_VALUELIST_MARSHALLER( ChoicesList, TTQValueList<KConfigSkeleton::ItemEnum::Choice>, KConfigSkeleton::ItemEnum::Choice, TTQValueList<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, TTQValueList<KAboutPerson>, KAboutPerson, TTQValueList<KAboutPerson>::Iterator )
-DEF_VALUELIST_MARSHALLER( KAboutTranslatorList, TTQValueList<KAboutTranslator>, KAboutTranslator, TTQValueList<KAboutTranslator>::Iterator )
-DEF_VALUELIST_MARSHALLER( KIOCopyInfoList, TTQValueList<KIO::CopyInfo>, KIO::CopyInfo, TTQValueList<KIO::CopyInfo>::Iterator )
-DEF_VALUELIST_MARSHALLER( KServiceOfferList, TTQValueList<KServiceOffer>, KServiceOffer, TTQValueList<KServiceOffer>::Iterator )
-DEF_VALUELIST_MARSHALLER( UDSEntry, TTQValueList<KIO::UDSAtom>, KIO::UDSAtom, TTQValueList<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;
}
- TTQMap<Key,Value> * map = new TTQMap<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:
{
- TTQMap<Key,Value> *map = (TTQMap<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,TTQMap<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( TQMapKEntryKeyKEntry, KEntryKey, KEntry )
@@ -1311,7 +1311,7 @@ void marshall_QMapTQCStringDCOPRef(Marshall *m) {
break;
}
- TTQMap<TTQCString,DCOPRef> * map = new TTQMap<TTQCString,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_QMapTQCStringDCOPRef(Marshall *m) {
void * ptr = o->ptr;
ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("DCOPRef"));
- (*map)[TTQCString(StringValuePtr(key))] = (DCOPRef)*(DCOPRef*)ptr;
+ (*map)[TQCString(StringValuePtr(key))] = (DCOPRef)*(DCOPRef*)ptr;
}
m->item().s_voidp = map;
@@ -1338,7 +1338,7 @@ void marshall_QMapTQCStringDCOPRef(Marshall *m) {
break;
case Marshall::ToVALUE:
{
- TTQMap<TTQCString,DCOPRef> *map = (TTQMap<TTQCString,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_QMapTQCStringDCOPRef(Marshall *m) {
VALUE hv = rb_hash_new();
- TTQMap<TTQCString,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[] = {
{ "TQCStringList", marshall_QCStringList },
{ "KCmdLineOptions*", marshall_KCmdLineOptions },
{ "KActionPtrList", marshall_KActionList },
- { "TTQPtrList<KAction>", marshall_KActionList },
- { "TTQPtrList<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 TDE_VERSION >= 0x030200
{ "KMountPoint::List", marshall_KMountPointList },
{ "KPluginInfo::List", marshall_KPluginInfoList },
- { "TTQValueList<KConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList },
- { "TTQValueList<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 },
- { "TTQPtrList<KMainWindow>*", marshall_KMainWindowList },
- { "TTQPtrList<DCOPObject>", marshall_DCOPObjectList },
- { "TTQPtrList<KDockWidget>&", marshall_KDockWidgetList },
- { "TTQPtrList<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 },
- { "TTQPtrList<KParts::Part>*", marshall_KPartList },
- { "TTQPtrList<KParts::Plugin>", marshall_KPartPluginList },
- { "TTQPtrList<KParts::ReadOnlyPart>", marshall_KPartReadOnlyPartList },
- { "TTQPtrList<KServiceTypeProfile>&", marshall_KServiceTypeProfileList },
- { "TTQValueList<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 },
- { "TTQValueList<KAboutPerson>", marshall_KAboutPersonList },
- { "TTQValueList<KAboutTranslator>", marshall_KAboutTranslatorList },
- { "TTQValueList<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 },
- { "TTQMap<TTQCString,DCOPRef>", marshall_QMapTQCStringDCOPRef },
- { "TTQValueList<WId>&", marshall_WIdList },
- { "TTQValueList<WId>", marshall_WIdList },
+ { "TQMap<TQCString,DCOPRef>", marshall_QMapTQCStringDCOPRef },
+ { "TQValueList<WId>&", marshall_WIdList },
+ { "TQValueList<WId>", marshall_WIdList },
{ 0, 0 }
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 16:56:43 +0000