diff options
Diffstat (limited to 'korundum/rubylib/korundum/kdehandlers.cpp')
| -rw-r--r-- | korundum/rubylib/korundum/kdehandlers.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp index 11b97b52..1e4eb3a4 100644 --- a/korundum/rubylib/korundum/kdehandlers.cpp +++ b/korundum/rubylib/korundum/kdehandlers.cpp @@ -924,11 +924,11 @@ void marshall_UDSEntryList(Marshall *m) { break; } - KIO::UDSEntryList *cpplist = new KIO::UDSEntryList; + TDEIO::UDSEntryList *cpplist = new TDEIO::UDSEntryList; for(long i = 0; i < RARRAY_LEN(list); i++) { VALUE item = rb_ary_entry(list, i); - KIO::UDSEntry *cppsublist = new KIO::UDSEntry; + TDEIO::UDSEntry *cppsublist = new TDEIO::UDSEntry; for (int j = 0; j < RARRAY_LEN(item); j++) { VALUE subitem = rb_ary_entry(item, j); @@ -936,8 +936,8 @@ void marshall_UDSEntryList(Marshall *m) { if(!o || !o->ptr) continue; void *ptr = o->ptr; - ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("KIO::UDSAtom")); - cppsublist->append(*(KIO::UDSAtom*)ptr); + ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("TDEIO::UDSAtom")); + cppsublist->append(*(TDEIO::UDSAtom*)ptr); } cpplist->append(*cppsublist); @@ -949,7 +949,7 @@ void marshall_UDSEntryList(Marshall *m) { break; case Marshall::ToVALUE: { - KIO::UDSEntryList *valuelist = (KIO::UDSEntryList*)m->item().s_voidp; + TDEIO::UDSEntryList *valuelist = (TDEIO::UDSEntryList*)m->item().s_voidp; if (!valuelist) { *(m->var()) = Qnil; break; @@ -957,16 +957,16 @@ void marshall_UDSEntryList(Marshall *m) { VALUE av = rb_ary_new(); - int ix = m->smoke()->idClass("KIO::UDSAtom"); + int ix = m->smoke()->idClass("TDEIO::UDSAtom"); - for ( KIO::UDSEntryList::Iterator it = valuelist->begin(); + for ( TDEIO::UDSEntryList::Iterator it = valuelist->begin(); it != valuelist->end(); ++it ) { - KIO::UDSEntry * udsentry = &(*it); + TDEIO::UDSEntry * udsentry = &(*it); VALUE subav = rb_ary_new(); - for ( KIO::UDSEntry::Iterator it = udsentry->begin(); + for ( TDEIO::UDSEntry::Iterator it = udsentry->begin(); it != udsentry->end(); ++it ) { @@ -978,7 +978,7 @@ void marshall_UDSEntryList(Marshall *m) { o->classId = ix; o->ptr = p; o->allocated = false; - obj = set_obj_info("KIO::UDSAtom", o); + obj = set_obj_info("TDEIO::UDSAtom", o); } rb_ary_push(subav, obj); @@ -1197,13 +1197,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, TQValueList<KConfigSkeleton::ItemEnum::Choice>, KConfigSkeleton::ItemEnum::Choice, TQValueList<KConfigSkeleton::ItemEnum::Choice>::Iterator ) +DEF_VALUELIST_MARSHALLER( ChoicesList, TQValueList<TDEConfigSkeleton::ItemEnum::Choice>, TDEConfigSkeleton::ItemEnum::Choice, TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::Iterator ) #endif 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( KIOCopyInfoList, TQValueList<TDEIO::CopyInfo>, TDEIO::CopyInfo, TQValueList<TDEIO::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 ) +DEF_VALUELIST_MARSHALLER( UDSEntry, TQValueList<TDEIO::UDSAtom>, TDEIO::UDSAtom, TQValueList<TDEIO::UDSAtom>::Iterator ) template <class Key, class Value, class ItemMapIterator, const char *KeySTR, const char *ValueSTR > void marshall_Map(Marshall *m) { @@ -1401,8 +1401,8 @@ TypeHandler KDE_handlers[] = { #if TDE_VERSION >= 0x030200 { "KMountPoint::List", marshall_KMountPointList }, { "KPluginInfo::List", marshall_KPluginInfoList }, - { "TQValueList<KConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList }, - { "TQValueList<KConfigSkeleton::ItemEnum::Choice>&", marshall_ChoicesList }, + { "TQValueList<TDEConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList }, + { "TQValueList<TDEConfigSkeleton::ItemEnum::Choice>&", marshall_ChoicesList }, #endif { "KServiceType::List", marshall_KServiceTypeList }, { "KTrader::OfferList", marshall_KTraderOfferList }, @@ -1424,9 +1424,9 @@ TypeHandler KDE_handlers[] = { { "KActionPtrList", marshall_KActionPtrList }, { "TQValueList<KAboutPerson>", marshall_KAboutPersonList }, { "TQValueList<KAboutTranslator>", marshall_KAboutTranslatorList }, - { "TQValueList<KIO::CopyInfo>&", marshall_KIOCopyInfoList }, - { "KIO::UDSEntry&", marshall_UDSEntry }, - { "KIO::UDSEntryList&", marshall_UDSEntryList }, + { "TQValueList<TDEIO::CopyInfo>&", marshall_KIOCopyInfoList }, + { "TDEIO::UDSEntry&", marshall_UDSEntry }, + { "TDEIO::UDSEntryList&", marshall_UDSEntryList }, { "KServiceTypeProfile::OfferList", marshall_KServiceOfferList }, { "KEntryMap", marshall_TQMapKEntryKeyKEntry }, { "KEntryMap&", marshall_TQMapKEntryKeyKEntry }, |