Rename KDE_VERSION to TDE_VERSION

pull/1/head
Timothy Pearson 13 years ago
parent e402ace275
commit 88a071548f

@ -236,7 +236,7 @@ AC_DEFUN([KDE_CHECK_MDI],
#include <kdeversion.h> #include <kdeversion.h>
], ],
[ [
#if KDE_VERSION < ((3<<16) | (2<<8) | (0)) #if TDE_VERSION < ((3<<16) | (2<<8) | (0))
KDE_choke me KDE_choke me
#endif #endif
], ],
@ -276,7 +276,7 @@ AC_DEFUN([KDE_CHECK_KNS],
#include <kdeversion.h> #include <kdeversion.h>
], ],
[ [
#if KDE_VERSION < ((3<<16) | (3<<8) | (92)) #if TDE_VERSION < ((3<<16) | (3<<8) | (92))
KDE_choke me KDE_choke me
#endif #endif
], ],

@ -22,13 +22,13 @@ import org.kde.qt.QColorGroup;
*/ */
public class KDE { public class KDE {
/** /**
Returns the encoded number of KDE's version, see the KDE_VERSION macro. Returns the encoded number of KDE's version, see the TDE_VERSION macro.
In contrary to that macro this function returns the number of the actully In contrary to that macro this function returns the number of the actully
installed KDE version, not the number of the KDE version that was installed KDE version, not the number of the KDE version that was
installed when the program was compiled. installed when the program was compiled.
@return the version number, encoded in a single uint @return the version number, encoded in a single uint
@short Returns the encoded number of KDE's version, see the KDE_VERSION macro. @short Returns the encoded number of KDE's version, see the TDE_VERSION macro.
*/ */
public static native int version(); public static native int version();
/** /**

@ -26,7 +26,7 @@
#include <dcopref.h> #include <dcopref.h>
#include <kapplication.h> #include <kapplication.h>
#include <kurl.h> #include <kurl.h>
#if KDE_VERSION >= 0x030200 #if TDE_VERSION >= 0x030200
#include <kconfigskeleton.h> #include <kconfigskeleton.h>
#endif #endif
#include <kio/global.h> #include <kio/global.h>
@ -472,7 +472,7 @@ public:
DCOPClient* dc = dcopRef->dcopClient(); DCOPClient* dc = dcopRef->dcopClient();
TQCString replyType; TQCString replyType;
TQByteArray dataReceived; TQByteArray dataReceived;
#if KDE_VERSION >= 0x030200 #if TDE_VERSION >= 0x030200
bool ok = dc->call(dcopRef->app(), dcopRef->obj(), _remFun, *_data, replyType, dataReceived, _useEventLoop, _timeout); bool ok = dc->call(dcopRef->app(), dcopRef->obj(), _remFun, *_data, replyType, dataReceived, _useEventLoop, _timeout);
#else #else
bool ok = dc->call(dcopRef->app(), dcopRef->obj(), _remFun, *_data, replyType, dataReceived, _useEventLoop); 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; return instance;
} }
#if KDE_VERSION >= 0x030200 #if TDE_VERSION >= 0x030200
static VALUE static VALUE
kconfigskeletonitem_immutable(VALUE self) kconfigskeletonitem_immutable(VALUE self)
@ -1116,7 +1116,7 @@ konsole_part_sendinput(VALUE self, VALUE value_text)
return self; return self;
} }
#if KDE_VERSION >= 0x030500 #if TDE_VERSION >= 0x030500
static VALUE static VALUE
konsole_part_setautostartshell(VALUE self, VALUE enabled) konsole_part_setautostartshell(VALUE self, VALUE enabled)
{ {
@ -1145,7 +1145,7 @@ Init_korundum()
} }
set_new_kde(new_kde); set_new_kde(new_kde);
#if KDE_VERSION >= 0x030200 #if TDE_VERSION >= 0x030200
set_kconfigskeletonitem_immutable(kconfigskeletonitem_immutable); set_kconfigskeletonitem_immutable(kconfigskeletonitem_immutable);
#endif #endif
set_kde_resolve_classname(kde_resolve_classname); 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_call", (VALUE (*) (...)) dcop_call, -1);
rb_define_singleton_method(kde_module, "dcop_send", (VALUE (*) (...)) dcop_send, -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); rb_define_method(kconfigskeleton_class, "addItem", (VALUE (*) (...)) config_additem, -1);
#endif #endif
rb_define_method(konsole_part_class, "startProgram", (VALUE (*) (...)) konsole_part_startprogram, 2); 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, "showShellInDir", (VALUE (*) (...)) konsole_part_showshellindir, 1);
rb_define_method(konsole_part_class, "sendInput", (VALUE (*) (...)) konsole_part_sendinput, 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, "setAutoStartShell", (VALUE (*) (...)) konsole_part_setautostartshell, 1);
rb_define_method(konsole_part_class, "autoStartShell=", (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, "setAutoDestroy", (VALUE (*) (...)) konsole_part_setautodestroy, 1);

@ -41,7 +41,7 @@
#include <kuserprofile.h> #include <kuserprofile.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <karchive.h> #include <karchive.h>
#if KDE_VERSION >= 0x030200 #if TDE_VERSION >= 0x030200
#include <kconfigskeleton.h> #include <kconfigskeleton.h>
#include <kplugininfo.h> #include <kplugininfo.h>
#include <kmountpoint.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) { void marshall_KMountPointList(Marshall *m) {
switch(m->action()) { switch(m->action()) {
case Marshall::FromVALUE: 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; }; \ #define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace { char ListIdent##STR[] = #Item; }; \
Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList<Item,ItemList,Itr,ListIdent##STR>; 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 ) DEF_VALUELIST_MARSHALLER( ChoicesList, TQValueList<KConfigSkeleton::ItemEnum::Choice>, KConfigSkeleton::ItemEnum::Choice, TQValueList<KConfigSkeleton::ItemEnum::Choice>::Iterator )
#endif #endif
DEF_VALUELIST_MARSHALLER( KAboutPersonList, TQValueList<KAboutPerson>, KAboutPerson, TQValueList<KAboutPerson>::Iterator ) DEF_VALUELIST_MARSHALLER( KAboutPersonList, TQValueList<KAboutPerson>, KAboutPerson, TQValueList<KAboutPerson>::Iterator )
@ -1388,7 +1388,7 @@ TypeHandler KDE_handlers[] = {
{ "KService::List", marshall_KServiceList }, { "KService::List", marshall_KServiceList },
{ "KServiceGroup::List", marshall_KServiceGroupList }, { "KServiceGroup::List", marshall_KServiceGroupList },
{ "KServiceGroup::Ptr", marshall_KServiceGroupPtr }, { "KServiceGroup::Ptr", marshall_KServiceGroupPtr },
#if KDE_VERSION >= 0x030200 #if TDE_VERSION >= 0x030200
{ "KMountPoint::List", marshall_KMountPointList }, { "KMountPoint::List", marshall_KMountPointList },
{ "KPluginInfo::List", marshall_KPluginInfoList }, { "KPluginInfo::List", marshall_KPluginInfoList },
{ "TQValueList<KConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList }, { "TQValueList<KConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList },

Loading…
Cancel
Save