diff options
Diffstat (limited to 'korundum')
| -rw-r--r-- | korundum/rubylib/korundum/Korundum.cpp | 20 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/tdehandlers.cpp | 9 |
2 files changed, 0 insertions, 29 deletions
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp index b7325d75..cf82a988 100644 --- a/korundum/rubylib/korundum/Korundum.cpp +++ b/korundum/rubylib/korundum/Korundum.cpp @@ -20,15 +20,12 @@ #include <tqmap.h> #include <tqdatastream.h> -#include <tdeversion.h> #include <dcopclient.h> #include <dcopobject.h> #include <dcopref.h> #include <tdeapplication.h> #include <kurl.h> -#if TDE_VERSION >= 0x030200 #include <tdeconfigskeleton.h> -#endif #include <tdeio/global.h> #include <tdeparts/browserextension.h> #include <kde_terminal_interface.h> @@ -482,11 +479,7 @@ public: DCOPClient* dc = dcopRef->dcopClient(); TQCString replyType; TQByteArray dataReceived; -#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); -#endif if (!ok) { // Note that a failed dcop call returns 'nil', not 'false' @@ -1051,8 +1044,6 @@ new_kde(int argc, VALUE * argv, VALUE klass) return instance; } -#if TDE_VERSION >= 0x030200 - static VALUE tdeconfigskeletonitem_immutable(VALUE self) { @@ -1087,8 +1078,6 @@ config_additem(int argc, VALUE * argv, VALUE self) return self; } -#endif - static VALUE konsole_part_startprogram(VALUE self, VALUE value_program, VALUE value_args) { @@ -1126,7 +1115,6 @@ konsole_part_sendinput(VALUE self, VALUE value_text) return self; } -#if TDE_VERSION >= 0x030500 static VALUE konsole_part_setautostartshell(VALUE self, VALUE enabled) { @@ -1144,7 +1132,6 @@ konsole_part_setautodestroy(VALUE self, VALUE enabled) t->setAutoDestroy(enabled == Qtrue); return self; } -#endif void Init_korundum() @@ -1155,9 +1142,7 @@ Init_korundum() } set_new_kde(new_kde); -#if TDE_VERSION >= 0x030200 set_tdeconfigskeletonitem_immutable(tdeconfigskeletonitem_immutable); -#endif set_kde_resolve_classname(kde_resolve_classname); // The Qt extension is linked against libsmoketqt.so, but Korundum links against @@ -1173,19 +1158,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 TDE_VERSION >= 0x030200 rb_define_method(tdeconfigskeleton_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 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); rb_define_method(konsole_part_class, "autoDestroy=", (VALUE (*) (...)) konsole_part_setautodestroy, 1); -#endif rb_require("KDE/korundum.rb"); } diff --git a/korundum/rubylib/korundum/tdehandlers.cpp b/korundum/rubylib/korundum/tdehandlers.cpp index f4707824..f4bfd27c 100644 --- a/korundum/rubylib/korundum/tdehandlers.cpp +++ b/korundum/rubylib/korundum/tdehandlers.cpp @@ -18,7 +18,6 @@ #include <qtruby.h> #include <smokeruby.h> -#include <tdeversion.h> #include <dcopclient.h> #include <dcopobject.h> #include <dcopref.h> @@ -41,11 +40,9 @@ #include <kuserprofile.h> #include <tdeaboutdata.h> #include <karchive.h> -#if TDE_VERSION >= 0x030200 #include <tdeconfigskeleton.h> #include <kplugininfo.h> #include <kmountpoint.h> -#endif #include <tdeio/jobclasses.h> #include <dom/dom_node.h> #include <dom/dom_element.h> @@ -616,7 +613,6 @@ void marshall_KServiceGroupList(Marshall *m) { } } -#if TDE_VERSION >= 0x030200 void marshall_KMountPointList(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: @@ -714,7 +710,6 @@ void marshall_KPluginInfoList(Marshall *m) { break; } } -#endif void marshall_TDEActionPtrList(Marshall *m) { switch(m->action()) { @@ -1196,9 +1191,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 TDE_VERSION >= 0x030200 DEF_VALUELIST_MARSHALLER( ChoicesList, TQValueList<TDEConfigSkeleton::ItemEnum::Choice>, TDEConfigSkeleton::ItemEnum::Choice, TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::Iterator ) -#endif DEF_VALUELIST_MARSHALLER( TDEAboutPersonList, TQValueList<TDEAboutPerson>, TDEAboutPerson, TQValueList<TDEAboutPerson>::Iterator ) DEF_VALUELIST_MARSHALLER( TDEAboutTranslatorList, TQValueList<TDEAboutTranslator>, TDEAboutTranslator, TQValueList<TDEAboutTranslator>::Iterator ) DEF_VALUELIST_MARSHALLER( KIOCopyInfoList, TQValueList<TDEIO::CopyInfo>, TDEIO::CopyInfo, TQValueList<TDEIO::CopyInfo>::Iterator ) @@ -1398,12 +1391,10 @@ TypeHandler KDE_handlers[] = { { "KService::List", marshall_KServiceList }, { "KServiceGroup::List", marshall_KServiceGroupList }, { "KServiceGroup::Ptr", marshall_KServiceGroupPtr }, -#if TDE_VERSION >= 0x030200 { "KMountPoint::List", marshall_KMountPointList }, { "KPluginInfo::List", marshall_KPluginInfoList }, { "TQValueList<TDEConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList }, { "TQValueList<TDEConfigSkeleton::ItemEnum::Choice>&", marshall_ChoicesList }, -#endif { "KServiceType::List", marshall_KServiceTypeList }, { "TDETrader::OfferList", marshall_TDETraderOfferList }, { "KURL::List", marshall_KURLList }, |