diff options
Diffstat (limited to 'korundum')
| -rw-r--r-- | korundum/ChangeLog | 2 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/Korundum.cpp | 10 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/kdehandlers.cpp | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/korundum/ChangeLog b/korundum/ChangeLog index 99a1be50..c3236176 100644 --- a/korundum/ChangeLog +++ b/korundum/ChangeLog @@ -434,7 +434,7 @@ CCMAIL: kde-bindings@kde.org 2004-07-17 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * More missing DCOP marshallers - TQStringList and TQCStringList + * More missing DCOP marshallers - TQStringList and QCStringList * A class with a 'k_dcop' slots declaration can now be an instance of DCOPObject * Converted the 'petshop' DCOP server example from pytde python diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp index effdf522..66731e95 100644 --- a/korundum/rubylib/korundum/Korundum.cpp +++ b/korundum/rubylib/korundum/Korundum.cpp @@ -136,8 +136,8 @@ smokeStackToStream(Marshall *m, Smoke::Stack stack, TQDataStream* stream, int it 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)); + } else if (strcmp(t.name(), "QCStringList") == 0) { + QCStringList temp((const QCStringList&) *((QCStringList *) stack[i].s_voidp)); *stream << temp; break; } else if (strcmp(t.name(), "TQStringList") == 0) { @@ -294,10 +294,10 @@ smokeStackFromStream(Marshall *m, Smoke::Stack stack, TQDataStream* stream, int *stream >> temp; stack[i].s_voidp = new TQCString(temp); break; - } else if (strcmp(t.name(), "TQCStringList") == 0) { - TQCStringList temp; + } else if (strcmp(t.name(), "QCStringList") == 0) { + QCStringList temp; *stream >> temp; - stack[i].s_voidp = new TQCStringList(temp); + stack[i].s_voidp = new QCStringList(temp); break; } else if (strcmp(t.name(), "TQStringList") == 0) { TQStringList temp; diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp index 8951c794..a2ee1862 100644 --- a/korundum/rubylib/korundum/kdehandlers.cpp +++ b/korundum/rubylib/korundum/kdehandlers.cpp @@ -123,7 +123,7 @@ void marshall_QCStringList(Marshall *m) { } int count = RARRAY(list)->len; - TQCStringList *stringlist = new TQCStringList; + QCStringList *stringlist = new QCStringList; for(long i = 0; i < count; i++) { VALUE item = rb_ary_entry(list, i); @@ -139,7 +139,7 @@ void marshall_QCStringList(Marshall *m) { if(m->cleanup()) { rb_ary_clear(list); - for(TQCStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) + for(QCStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) rb_ary_push(list, rb_str_new2(static_cast<const char *>(*it))); delete stringlist; } @@ -147,14 +147,14 @@ void marshall_QCStringList(Marshall *m) { } case Marshall::ToVALUE: { - TQCStringList *stringlist = static_cast<TQCStringList *>(m->item().s_voidp); + QCStringList *stringlist = static_cast<QCStringList *>(m->item().s_voidp); if(!stringlist) { *(m->var()) = Qnil; break; } VALUE av = rb_ary_new(); - for(TQCStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) { + for(QCStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) { VALUE rv = rb_str_new2(static_cast<const char *>((*it))); rb_ary_push(av, rv); } @@ -1377,7 +1377,7 @@ void marshall_QMapTQCStringDCOPRef(Marshall *m) { } TypeHandler KDE_handlers[] = { - { "TQCStringList", marshall_QCStringList }, + { "QCStringList", marshall_QCStringList }, { "KCmdLineOptions*", marshall_KCmdLineOptions }, { "KActionPtrList", marshall_KActionList }, { "TQPtrList<KAction>", marshall_KActionList }, |