[Kde-bindings] KDE/kdebindings/ruby/korundum
Richard Dale
Richard_Dale at tipitina.demon.co.uk
Mon Mar 24 19:14:26 UTC 2008
SVN commit 789634 by rdale:
* Remove the rbkconfig_compiler and associated code as afaik it wasn't being used
in kde3 korundum and currently causes crashes in korundum4.
CCMAIL: kde-bindings at kde.org
M +5 -0 ChangeLog
M +0 -99 src/Korundum.cpp
M +0 -4 src/kdehandlers.cpp
D tools/rbkconfig_compiler (directory)
--- trunk/KDE/kdebindings/ruby/korundum/ChangeLog #789633:789634
@@ -1,3 +1,8 @@
+2008-03-24 Richard Dale <rdale at foton.es>
+
+ * Remove the rbkconfig_compiler and associated code as afaik it wasn't being used
+ in kde3 korundum and currently causes crashes in korundum4.
+
2008-03-16 Richard Dale <rdale at foton.es>
* Work round the problem with DBusQueryResultIterator.current only ever returning
--- trunk/KDE/kdebindings/ruby/korundum/src/Korundum.cpp #789633:789634
@@ -32,7 +32,6 @@
#include <kdeversion.h>
#include <kapplication.h>
#include <kurl.h>
-#include <kconfigskeleton.h>
#include <kio/global.h>
#include <ruby.h>
@@ -44,8 +43,6 @@
extern "C" {
extern VALUE qt_internal_module;
-extern VALUE kconfigskeleton_class;
-extern VALUE kconfigskeleton_itemenum_choice_class;
extern VALUE kconfiggroup_class;
extern VALUE set_obj_info(const char * className, smokeruby_object * o);
extern void set_kde_resolve_classname(const char * (*kde_resolve_classname) (Smoke*, int, void *));
@@ -152,7 +149,6 @@
extern Q_DECL_EXPORT void Init_korundum4();
extern void Init_qtruby4();
extern void set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE));
-extern void set_kconfigskeletonitem_immutable(VALUE (*kconfigskeletonitem_immutable) (VALUE));
extern void set_kde_resolve_classname(const char * (*kde_resolve_classname) (Smoke*, int, void *));
extern const char * kde_resolve_classname(Smoke* smoke, int classId, void * ptr);
extern VALUE new_qt(int argc, VALUE * argv, VALUE klass);
@@ -186,91 +182,6 @@
return Qnil;
}
-static VALUE
-kconfigskeletonitem_immutable(VALUE self)
-{
- smokeruby_object *o = value_obj_info(self);
- KConfigSkeletonItem * item = (KConfigSkeletonItem *) o->ptr;
- return item->isImmutable() ? Qtrue : Qfalse;
-}
-
-static VALUE
-config_additem(int argc, VALUE * argv, VALUE self)
-{
- smokeruby_object *o = value_obj_info(self);
- KConfigSkeleton * config = (KConfigSkeleton *) o->ptr;
-
- if (argc < 1 || argc > 2) {
- rb_raise(rb_eArgError, "wrong number of arguments(%d for 2)\n", argc);
- }
-
- if (TYPE(argv[0]) != T_DATA) {
- rb_raise(rb_eArgError, "wrong argument type, expected KDE::ConfigSkeletonItem\n", argc);
- }
-
- smokeruby_object *c = value_obj_info(argv[0]);
- KConfigSkeletonItem * item = (KConfigSkeletonItem *) c->ptr;
-
- if (argc == 1) {
- config->addItem(item);
- } else {
- config->addItem(item, QString(StringValuePtr(argv[1])));
- }
-
- return self;
-}
-
-static VALUE
-choice_name(VALUE self)
-{
- smokeruby_object *o = value_obj_info(self);
- KConfigSkeleton::ItemEnum::Choice * choice = (KConfigSkeleton::ItemEnum::Choice *) o->ptr;
- return rb_str_new2(choice->name.latin1());
-}
-
-static VALUE
-set_choice_name(VALUE self, VALUE name)
-{
- smokeruby_object *o = value_obj_info(self);
- KConfigSkeleton::ItemEnum::Choice * choice = (KConfigSkeleton::ItemEnum::Choice *) o->ptr;
- choice->name = StringValuePtr(name);
- return self;
-}
-
-static VALUE
-choice_label(VALUE self)
-{
- smokeruby_object *o = value_obj_info(self);
- KConfigSkeleton::ItemEnum::Choice * choice = (KConfigSkeleton::ItemEnum::Choice *) o->ptr;
- return rb_str_new2(choice->label.latin1());
-}
-
-static VALUE
-set_choice_label(VALUE self, VALUE label)
-{
- smokeruby_object *o = value_obj_info(self);
- KConfigSkeleton::ItemEnum::Choice * choice = (KConfigSkeleton::ItemEnum::Choice *) o->ptr;
- choice->label = StringValuePtr(label);
- return self;
-}
-
-static VALUE
-choice_whatsthis(VALUE self)
-{
- smokeruby_object *o = value_obj_info(self);
- KConfigSkeleton::ItemEnum::Choice * choice = (KConfigSkeleton::ItemEnum::Choice *) o->ptr;
- return rb_str_new2(choice->whatsThis.latin1());
-}
-
-static VALUE
-set_choice_whatsthis(VALUE self, VALUE whatsthis)
-{
- smokeruby_object *o = value_obj_info(self);
- KConfigSkeleton::ItemEnum::Choice * choice = (KConfigSkeleton::ItemEnum::Choice *) o->ptr;
- choice->whatsThis = StringValuePtr(whatsthis);
- return self;
-}
-
void
Init_korundum4()
{
@@ -280,7 +191,6 @@
}
set_new_kde(new_kde);
- set_kconfigskeletonitem_immutable(kconfigskeletonitem_immutable);
set_kde_resolve_classname(kde_resolve_classname);
// The Qt extension is linked against libsmokeqt.so, but Korundum links against
@@ -293,15 +203,6 @@
kde_internal_module = rb_define_module_under(kde_module, "Internal");
- rb_define_method(kconfigskeleton_class, "addItem", (VALUE (*) (...)) config_additem, -1);
-
- rb_define_method(kconfigskeleton_itemenum_choice_class, "name", (VALUE (*) (...)) choice_name, 0);
- rb_define_method(kconfigskeleton_itemenum_choice_class, "label", (VALUE (*) (...)) choice_label, 0);
- rb_define_method(kconfigskeleton_itemenum_choice_class, "whatsThis", (VALUE (*) (...)) choice_whatsthis, 0);
- rb_define_method(kconfigskeleton_itemenum_choice_class, "name=", (VALUE (*) (...)) set_choice_name, 1);
- rb_define_method(kconfigskeleton_itemenum_choice_class, "label=", (VALUE (*) (...)) set_choice_label, 1);
- rb_define_method(kconfigskeleton_itemenum_choice_class, "whatsThis=", (VALUE (*) (...)) set_choice_whatsthis, 1);
-
rb_define_method(kconfiggroup_class, "readEntry", (VALUE (*) (...)) kconfiggroup_read_entry, -1);
rb_define_method(kconfiggroup_class, "writeEntry", (VALUE (*) (...)) kconfiggroup_write_entry, -1);
--- trunk/KDE/kdebindings/ruby/korundum/src/kdehandlers.cpp #789633:789634
@@ -33,7 +33,6 @@
#include <kparts/plugin.h>
#include <kaboutdata.h>
#include <karchive.h>
-#include <kconfigskeleton.h>
#include <kplugininfo.h>
#include <kmountpoint.h>
#include <kio/jobclasses.h>
@@ -823,7 +822,6 @@
DEF_VALUELIST_MARSHALLER( KAboutPersonList, QList<KAboutPerson>, KAboutPerson )
DEF_VALUELIST_MARSHALLER( QColorList, QList<QColor>, QColor )
-DEF_VALUELIST_MARSHALLER( ChoicesList, QList<KConfigSkeleton::ItemEnum::Choice>, KConfigSkeleton::ItemEnum::Choice )
DEF_VALUELIST_MARSHALLER( KDataToolInfoList, QList<KDataToolInfo>, KDataToolInfo )
DEF_VALUELIST_MARSHALLER( KIOCopyInfoList, QList<KIO::CopyInfo>, KIO::CopyInfo )
DEF_VALUELIST_MARSHALLER( KPartsPluginPluginInfoList, QList<KParts::Plugin::PluginInfo>, KParts::Plugin::PluginInfo )DEF_VALUELIST_MARSHALLER( KUserList, QList<KUser>, KUser )
@@ -948,8 +946,6 @@
{ "QList<KActionCollection*>&", marshall_KActionCollectionList },
{ "QList<QColor>", marshall_QColorList },
{ "QList<QColor>&", marshall_QColorList },
- { "QList<KConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList },
- { "QList<KConfigSkeleton::ItemEnum::Choice>&", marshall_ChoicesList },
{ "QList<KDataToolInfo>", marshall_KDataToolInfoList },
{ "QList<KDataToolInfo>&", marshall_KDataToolInfoList },
{ "QList<KIO::CopyInfo>&", marshall_KIOCopyInfoList },
More information about the Kde-bindings
mailing list