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