diff options
Diffstat (limited to 'korundum')
-rw-r--r-- | korundum/rubylib/korundum/Korundum.cpp | 14 | ||||
-rw-r--r-- | korundum/rubylib/korundum/kdehandlers.cpp | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp index 9fcd74df..b3c93c70 100644 --- a/korundum/rubylib/korundum/Korundum.cpp +++ b/korundum/rubylib/korundum/Korundum.cpp @@ -26,7 +26,7 @@ #include <dcopref.h> #include <kapplication.h> #include <kurl.h> -#if KDE_VERSION >= 0x030200 +#if TDE_VERSION >= 0x030200 #include <kconfigskeleton.h> #endif #include <kio/global.h> @@ -472,7 +472,7 @@ public: DCOPClient* dc = dcopRef->dcopClient(); TQCString replyType; TQByteArray dataReceived; -#if KDE_VERSION >= 0x030200 +#if TDE_VERSION >= 0x030200 bool ok = dc->call(dcopRef->app(), dcopRef->obj(), _remFun, *_data, replyType, dataReceived, _useEventLoop, _timeout); #else bool ok = dc->call(dcopRef->app(), dcopRef->obj(), _remFun, *_data, replyType, dataReceived, _useEventLoop); @@ -1041,7 +1041,7 @@ new_kde(int argc, VALUE * argv, VALUE klass) return instance; } -#if KDE_VERSION >= 0x030200 +#if TDE_VERSION >= 0x030200 static VALUE kconfigskeletonitem_immutable(VALUE self) @@ -1116,7 +1116,7 @@ konsole_part_sendinput(VALUE self, VALUE value_text) return self; } -#if KDE_VERSION >= 0x030500 +#if TDE_VERSION >= 0x030500 static VALUE konsole_part_setautostartshell(VALUE self, VALUE enabled) { @@ -1145,7 +1145,7 @@ Init_korundum() } set_new_kde(new_kde); -#if KDE_VERSION >= 0x030200 +#if TDE_VERSION >= 0x030200 set_kconfigskeletonitem_immutable(kconfigskeletonitem_immutable); #endif set_kde_resolve_classname(kde_resolve_classname); @@ -1163,14 +1163,14 @@ Init_korundum() rb_define_singleton_method(kde_module, "dcop_call", (VALUE (*) (...)) dcop_call, -1); rb_define_singleton_method(kde_module, "dcop_send", (VALUE (*) (...)) dcop_send, -1); -#if KDE_VERSION >= 0x030200 +#if TDE_VERSION >= 0x030200 rb_define_method(kconfigskeleton_class, "addItem", (VALUE (*) (...)) config_additem, -1); #endif rb_define_method(konsole_part_class, "startProgram", (VALUE (*) (...)) konsole_part_startprogram, 2); rb_define_method(konsole_part_class, "showShellInDir", (VALUE (*) (...)) konsole_part_showshellindir, 1); rb_define_method(konsole_part_class, "sendInput", (VALUE (*) (...)) konsole_part_sendinput, 1); -#if KDE_VERSION >= 0x030500 +#if TDE_VERSION >= 0x030500 rb_define_method(konsole_part_class, "setAutoStartShell", (VALUE (*) (...)) konsole_part_setautostartshell, 1); rb_define_method(konsole_part_class, "autoStartShell=", (VALUE (*) (...)) konsole_part_setautostartshell, 1); rb_define_method(konsole_part_class, "setAutoDestroy", (VALUE (*) (...)) konsole_part_setautodestroy, 1); diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp index 1d631399..9eeae1dc 100644 --- a/korundum/rubylib/korundum/kdehandlers.cpp +++ b/korundum/rubylib/korundum/kdehandlers.cpp @@ -41,7 +41,7 @@ #include <kuserprofile.h> #include <kaboutdata.h> #include <karchive.h> -#if KDE_VERSION >= 0x030200 +#if TDE_VERSION >= 0x030200 #include <kconfigskeleton.h> #include <kplugininfo.h> #include <kmountpoint.h> @@ -606,7 +606,7 @@ void marshall_KServiceGroupList(Marshall *m) { } } -#if KDE_VERSION >= 0x030200 +#if TDE_VERSION >= 0x030200 void marshall_KMountPointList(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: @@ -1186,7 +1186,7 @@ void marshall_ValueItemList(Marshall *m) { #define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace { char ListIdent##STR[] = #Item; }; \ Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList<Item,ItemList,Itr,ListIdent##STR>; -#if KDE_VERSION >= 0x030200 +#if TDE_VERSION >= 0x030200 DEF_VALUELIST_MARSHALLER( ChoicesList, TQValueList<KConfigSkeleton::ItemEnum::Choice>, KConfigSkeleton::ItemEnum::Choice, TQValueList<KConfigSkeleton::ItemEnum::Choice>::Iterator ) #endif DEF_VALUELIST_MARSHALLER( KAboutPersonList, TQValueList<KAboutPerson>, KAboutPerson, TQValueList<KAboutPerson>::Iterator ) @@ -1388,7 +1388,7 @@ TypeHandler KDE_handlers[] = { { "KService::List", marshall_KServiceList }, { "KServiceGroup::List", marshall_KServiceGroupList }, { "KServiceGroup::Ptr", marshall_KServiceGroupPtr }, -#if KDE_VERSION >= 0x030200 +#if TDE_VERSION >= 0x030200 { "KMountPoint::List", marshall_KMountPointList }, { "KPluginInfo::List", marshall_KPluginInfoList }, { "TQValueList<KConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList }, |