commit kdebindings4 for openSUSE:Factory

6 May 2009

Hello community,

here is the log from the commit of package kdebindings4 for openSUSE:Factory
checked in at Wed May 6 18:47:05 CEST 2009.



--------

--- KDE/kdebindings4/kdebindings4.changes	2009-03-27 00:40:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.changes	2009-04-30 21:31:58.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 30 21:31:47 CEST 2009 - dmueller@suse.de
+
+- update to 4.2.3
+  * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php
+
+-------------------------------------------------------------------
mono-kde4.changes: same change
python-kde4.changes: same change
ruby-kde4.changes: same change

calling whatdependson for head-i586


Old:
----
  kdebindings-4.2.2.tar.bz2

New:
----
  kdebindings-4.2.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebindings4.spec ++++++
--- /var/tmp/diff_new_pack.e26742/_old	2009-05-06 18:46:45.000000000 +0200
+++ /var/tmp/diff_new_pack.e26742/_new	2009-05-06 18:46:45.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package kdebindings4 (Version 4.2.2)
+# spec file for package kdebindings4 (Version 4.2.3)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -30,7 +30,7 @@
 License:        LGPL v2.1 or later
 Group:          Development/Libraries/KDE
 Summary:        Bindings for KDE 4.x libraries
-Version:        4.2.2
+Version:        4.2.3
 Release:        1
 Source0:        kdebindings-%version.tar.bz2
 Patch0:         4_2_BRANCH.diff
@@ -383,6 +383,9 @@
 %endif
 
 %changelog
+* Thu Apr 30 2009 dmueller@suse.de
+- update to 4.2.3
+  * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php
 * Fri Mar 27 2009 dmueller@suse.de
 - update to 4.2.2
   * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php
@@ -400,7 +403,7 @@
 - update to 4.1.96
 * Sat Jan 10 2009 dmueller@suse.de
 - update to KDE 4.1.87 (KDE 4.2 Januar snapshot)
-* Mon Dec 08 2008 dmueller@suse.de
+* Tue Dec 09 2008 dmueller@suse.de
 - fix build against sip 4.7.9
 * Fri Oct 31 2008 dmueller@suse.de
 - update to 4.1.3

++++++ mono-kde4.spec ++++++
--- /var/tmp/diff_new_pack.e26742/_old	2009-05-06 18:46:45.000000000 +0200
+++ /var/tmp/diff_new_pack.e26742/_new	2009-05-06 18:46:45.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package mono-kde4 (Version 4.2.2)
+# spec file for package mono-kde4 (Version 4.2.3)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -30,7 +30,7 @@
 License:        GPL v2 or later
 Group:          Development/Libraries/KDE
 Summary:        Mono bindings for KDE 4.x libraries
-Version:        4.2.2
+Version:        4.2.3
 Release:        1
 Source0:        kdebindings-%version.tar.bz2
 Patch0:         4_2_BRANCH.diff
@@ -382,6 +382,9 @@
 %endif
 
 %changelog
+* Thu Apr 30 2009 dmueller@suse.de
+- update to 4.2.3
+  * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php
 * Fri Mar 27 2009 dmueller@suse.de
 - update to 4.2.2
   * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php
@@ -399,7 +402,7 @@
 - update to 4.1.96
 * Sat Jan 10 2009 dmueller@suse.de
 - update to KDE 4.1.87 (KDE 4.2 Januar snapshot)
-* Mon Dec 08 2008 dmueller@suse.de
+* Tue Dec 09 2008 dmueller@suse.de
 - fix build against sip 4.7.9
 * Fri Oct 31 2008 dmueller@suse.de
 - update to 4.1.3

++++++ python-kde4.spec ++++++
--- /var/tmp/diff_new_pack.e26742/_old	2009-05-06 18:46:45.000000000 +0200
+++ /var/tmp/diff_new_pack.e26742/_new	2009-05-06 18:46:45.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package python-kde4 (Version 4.2.2)
+# spec file for package python-kde4 (Version 4.2.3)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -30,7 +30,7 @@
 License:        LGPL v2.1 or later
 Group:          Development/Libraries/KDE
 Summary:        Python Bindings for KDE 4.x Platform
-Version:        4.2.2
+Version:        4.2.3
 Release:        1
 Source0:        kdebindings-%version.tar.bz2
 Patch0:         4_2_BRANCH.diff
@@ -383,6 +383,9 @@
 %endif
 
 %changelog
+* Thu Apr 30 2009 dmueller@suse.de
+- update to 4.2.3
+  * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php
 * Fri Mar 27 2009 dmueller@suse.de
 - update to 4.2.2
   * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php
@@ -400,7 +403,7 @@
 - update to 4.1.96
 * Sat Jan 10 2009 dmueller@suse.de
 - update to KDE 4.1.87 (KDE 4.2 Januar snapshot)
-* Mon Dec 08 2008 dmueller@suse.de
+* Tue Dec 09 2008 dmueller@suse.de
 - fix build against sip 4.7.9
 * Fri Oct 31 2008 dmueller@suse.de
 - update to 4.1.3

ruby-kde4.spec: same change
++++++ kdebindings-4.2.2.tar.bz2 -> kdebindings-4.2.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/kalyptus/kalyptus new/kdebindings-4.2.3/kalyptus/kalyptus
--- old/kdebindings-4.2.2/kalyptus/kalyptus	2009-02-26 15:15:39.000000000 +0100
+++ new/kdebindings-4.2.3/kalyptus/kalyptus	2009-04-30 11:11:38.000000000 +0200
@@ -2,7 +2,7 @@
 
 # KDOC -- C++ and CORBA IDL interface documentation tool.
 # Sirtaj Singh Kang <taj@kde.org>, Jan 1999.
-# $Id: kalyptus 928405 2009-02-19 14:09:22Z rdale $
+# $Id: kalyptus 960967 2009-04-29 11:31:30Z rdale $
 
 # All files in this project are distributed under the GNU General
 # Public License. This is Free Software.
@@ -988,6 +988,7 @@
 		my $pure = $4 eq "" ? 0 : 1;
 		$tpn =~ s/\s+/ /g;
 		$tpn =~ s/operator\s+([^\w])/operator$1/g;
+
 		$params =~ s/\s+/ /g;
 
 		print "Method: R+N:[$tpn]\n\tP:[$params]\n\t[$const]\n" if $debug;
@@ -996,6 +997,12 @@
 					|| $tpn =~ /((?:\w*\s*::\s*~?)?[-\w:]+)\s*$/  ) { # normal
 				my $name = $1;
 				$tpn = $`;
+
+        # Set return type for conversion operators
+        if ( $name =~ /^operator\s+(\S.*)/ ) {
+          $tpn = $1;
+        }
+
 				$newNode = newMethod( $tpn, $name, 
 								$params, $const, $pure, $isDeprecated );
 		}
@@ -1813,7 +1820,7 @@
 
 	my $static = 0;
 	if ( $type =~ /static/ ) {
-	#	$type =~ s/static//;
+		$type =~ s/static\s+//;
 		$static = 1;
 	}
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/kalyptus/kalyptusCxxToSmoke.pm new/kdebindings-4.2.3/kalyptus/kalyptusCxxToSmoke.pm
--- old/kdebindings-4.2.2/kalyptus/kalyptusCxxToSmoke.pm	2009-02-26 15:15:39.000000000 +0100
+++ new/kdebindings-4.2.3/kalyptus/kalyptusCxxToSmoke.pm	2009-04-30 11:11:38.000000000 +0200
@@ -177,7 +177,6 @@
    'void(* )()'  =>  'void*',
    'void (*)(void* )'  =>  'void*',
    'WState'  =>  'int',
-   'WId'  =>  'uint',
 );
 
 $headerSubdirectories = "kio/|phonon/ui/|kmediaplayer/|dnssd/|solid/|phonon/|sonnet/|kdevplatform/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/|knewstuff2/|plasma/|plasma/widgets/|kresources/|soprano/|nepomuk/|akonadi/|okular/"
@@ -493,9 +492,6 @@
 			|| $className eq 'QX11Info'
 			|| $className eq 'QwtScaleDiv'
 			|| $className eq 'Soprano::QueryResultIteratorBackend'
-			|| $className eq 'Soprano::Client::UnixSocketClient'
-			|| $className eq 'Soprano::Client::LocalSocketClient'
-			|| $className eq 'Soprano::Client::TcpClient'
 			|| $className eq 'Soprano::Util::SimpleStatementIterator'
 			|| $className eq 'Soprano::Error::ErrorCache'
 			|| $className eq 'Nepomuk::Class'
@@ -637,6 +633,7 @@
 			|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble')
 			|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getInteger')
 			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString')
+			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'file_move' && $#{$m->{ParamList}} == 2)
 			|| ($classNode->{astNodeName} eq 'KJob' and $name eq 'description')
 			|| ($classNode->{astNodeName} eq 'KJob' and $name eq 'KJob')
 			|| ($className eq 'KParts::MainWindow' and $name eq 'MainWindow' && $#{$m->{ParamList}} == 2 && $m->{ParamList}[2]->{ArgType} =~ /Qt::WindowFlags/)
@@ -732,6 +729,7 @@
 			|| ($className eq 'Akonadi::MessageThreadingAttribute' and $name eq 'setUnperfectParents')
 			|| ($className eq 'Akonadi::MessageThreadingAttribute' and $name eq 'subjectParents')
 			|| ($className eq 'Akonadi::MessageThreadingAttribute' and $name eq 'setSubjectParents')
+			|| ($className eq 'Nepomuk::ResourceManager' and $name eq 'allResources')
 			|| ($className eq 'Plasma::PaintUtils' and $name eq 'shadowText')
 			|| ($className eq 'Solid::Networking' and $name eq 'connectPolicy')
 			|| ($className eq 'Solid::Networking' and $name eq 'setDisconnectPolicy')
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/kalyptus/kalyptusDataDict.pm new/kdebindings-4.2.3/kalyptus/kalyptusDataDict.pm
--- old/kdebindings-4.2.2/kalyptus/kalyptusDataDict.pm	2008-10-23 01:03:17.000000000 +0200
+++ new/kdebindings-4.2.3/kalyptus/kalyptusDataDict.pm	2009-04-30 11:11:38.000000000 +0200
@@ -2968,7 +2968,7 @@
 		$i++;
             }
             # normalize
-	    $argType = $before."<".join( ", ", @args).">".$after;
+	    $argType = $before."<".join( ",", @args).">".$after;
 		$argType =~ s/>>/> >/g;  # Nested template types must have a space
         }
 
Files old/kdebindings-4.2.2/python/pykde4/tools/cmake_project/sample_project/doc/en/index.cache.bz2 and new/kdebindings-4.2.3/python/pykde4/tools/cmake_project/sample_project/doc/en/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/qtruby/ChangeLog new/kdebindings-4.2.3/ruby/qtruby/ChangeLog
--- old/kdebindings-4.2.2/ruby/qtruby/ChangeLog	2009-03-26 15:42:00.000000000 +0100
+++ new/kdebindings-4.2.3/ruby/qtruby/ChangeLog	2009-04-30 11:11:37.000000000 +0200
@@ -1,3 +1,33 @@
+2009-04-24  Richard Dale  <richard.j.dale@gmail.com>
+	* The resolve_classname() function was not resolving names for QObject
+	  derived classes when the class wasn't in the base Qt smoke library.
+	  For instance, this meant that a Plasma::Applet was not being resolved to
+	  a Plasma::PopupApplet to match the underlying C++ type.
+
+2009-04-17  Richard Dale  <richard.j.dale@gmail.com>
+	* When Qt::StandardItemModel#setItemPrototype was used with a 
+      Qt::StandardItem it crashed because the clone() method was using 
+      Object#clone. So special case the clone() method. Thanks to Stefano Crocco
+      for reporting the bug.
+
+2009-04-07  Richard Dale  <richard.j.dale@gmail.com>
+	* The ActiveRecord based model classes were setting changed values in the 
+	  'attributes' and then saving the changed instance, like this
+ 
+	  foo.attributes['my_att'] = value
+	  foo.save
+
+	  However, this no longer works with ActiveRecord, and the instance can 
+	  be changed more directly like this
+	  
+	  foo['my_att'] = value
+	  foo.save
+	* QtRuby wasn't building on Mac OS X with a version of Qt built without 
+	  QtDBus support, so add some #ifdefs to fix that
+
+2009-03-24  Richard Dale  <richard.j.dale@gmail.com>
+	* Raised the QtRuby version to 2.0.3 for the RubyForge release
+
 2009-03-20  Richard Dale  <richard.j.dale@gmail.com>
 	* Remove 'LIBRARY' from this line in qtruby/src/CMakeLists.txt:
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/qtruby/rails_support/active_item_model.rb new/kdebindings-4.2.3/ruby/qtruby/rails_support/active_item_model.rb
--- old/kdebindings-4.2.2/ruby/qtruby/rails_support/active_item_model.rb	2008-11-04 18:12:07.000000000 +0100
+++ new/kdebindings-4.2.3/ruby/qtruby/rails_support/active_item_model.rb	2009-04-30 11:11:37.000000000 +0200
@@ -1,7 +1,8 @@
 =begin
-This table model allows an ActiveRecord or ActiveResource to be used as a
-basis for a Qt::AbstractItemModel for viewing in a Qt::TreeView. Example
-usage:
+This Qt::AbstractItemModel based model allows an ActiveRecord or ActiveResource
+data set be used for viewing in a Qt::TreeView. 
+
+Example usage:
 
 app = Qt::Application.new(ARGV)
 agencies = TravelAgency.find(:all)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/qtruby/rails_support/active_table_model.rb new/kdebindings-4.2.3/ruby/qtruby/rails_support/active_table_model.rb
--- old/kdebindings-4.2.2/ruby/qtruby/rails_support/active_table_model.rb	2008-11-04 18:12:07.000000000 +0100
+++ new/kdebindings-4.2.3/ruby/qtruby/rails_support/active_table_model.rb	2009-04-30 11:11:37.000000000 +0200
@@ -109,7 +109,7 @@
                 value = Time.new(value.hour, value.min, value.sec)
             end
 
-            eval("item.attributes['%s'] = value" % att.gsub(/\./, "'].attributes['"))
+            eval("item['%s'] = value" % att.gsub(/\./, "']['"))
             item.save
             emit dataChanged(index, index)
             return true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/qtruby/src/handlers.cpp new/kdebindings-4.2.3/ruby/qtruby/src/handlers.cpp
--- old/kdebindings-4.2.2/ruby/qtruby/src/handlers.cpp	2009-03-26 15:42:00.000000000 +0100
+++ new/kdebindings-4.2.3/ruby/qtruby/src/handlers.cpp	2009-04-30 11:11:37.000000000 +0200
@@ -623,21 +623,6 @@
 		default:
 			break;
 		}
-	} else if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QObject")) {
-		QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
-		const QMetaObject * meta = qobject->metaObject();
-
-		while (meta != 0) {
-			o->smoke = Smoke::classMap[meta->className()];
-			if (o->smoke != 0) {
-				o->classId = o->smoke->idClass(meta->className()).index;
-				if (o->classId != 0) {
-					return qtruby_modules[o->smoke].binding->className(o->classId);
-				}
-			}
-
-			meta = meta->superClass();
-		}
 	} else if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QGraphicsItem")) {
 		QGraphicsItem * item = (QGraphicsItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QGraphicsItem").index);
 		switch (item->type()) {
@@ -1213,6 +1198,7 @@
 						stringlist->append(QString());
 						continue;
 					}
+
 				stringlist->append(*(qstringFromRString(item)));
 			}
 
@@ -1228,7 +1214,7 @@
 			if (m->cleanup()) {
 				delete stringlist;
 			}
-	   
+   
 			break;
 		}
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/qtruby/src/lib/Qt/qtruby4.rb new/kdebindings-4.2.3/ruby/qtruby/src/lib/Qt/qtruby4.rb
--- old/kdebindings-4.2.2/ruby/qtruby/src/lib/Qt/qtruby4.rb	2009-03-26 15:41:57.000000000 +0100
+++ new/kdebindings-4.2.3/ruby/qtruby/src/lib/Qt/qtruby4.rb	2009-04-30 11:11:37.000000000 +0200
@@ -1256,7 +1256,7 @@
 
 	class ListWidgetItem < Qt::Base
 		def clone(*args)
-			method_missing(:clone, *args)
+			Qt::ListWidgetItem.new(self)
 		end
 
 		def type(*args)
@@ -1265,12 +1265,12 @@
 
 		def inspect
 			str = super
-			str.sub(/>$/, " text=%s>" % text)
+			str.sub(/>$/, " text='%s'>" % text)
 		end
 		
 		def pretty_print(pp)
 			str = to_s
-			pp.text str.sub(/>$/, " text=%s>" % text)
+			pp.text str.sub(/>$/, " text='%s'>" % text)
 		end
 	end
 
@@ -1855,9 +1855,23 @@
 	end
 
 	class StandardItem < Qt::Base 
+		def inspect
+			str = super
+			str.sub(/>$/, " text='%s'>" % [text])
+		end
+		
+		def pretty_print(pp)
+			str = to_s
+			pp.text str.sub(/>$/, "\n text='%s'>" % [text])
+		end
+
 		def type(*args)
 			method_missing(:type, *args)
 		end
+
+		def clone
+			Qt::StandardItem.new(self)
+		end
 	end
 
 	class StandardItemModel < Qt::Base 
@@ -1892,7 +1906,7 @@
 
 	class TableWidgetItem < Qt::Base
 		def clone(*args)
-			method_missing(:clone, *args)
+			Qt::TableWidgetItem.new(self)
 		end
 
 		def type(*args)
@@ -1901,12 +1915,12 @@
 
 		def inspect
 			str = super
-			str.sub(/>$/, " text=%s>" % text)
+			str.sub(/>$/, " text='%s'>" % text)
 		end
 		
 		def pretty_print(pp)
 			str = to_s
-			pp.text str.sub(/>$/, " text=%s>" % text)
+			pp.text str.sub(/>$/, " text='%s'>" % text)
 		end
 	end
 
@@ -2069,7 +2083,7 @@
 			str.sub!(/>$/, "")
 			str << " parent=%s," % parent unless parent.nil?
 			for i in 0..(columnCount - 1)
-				str << " text%d=%s," % [i, self.text(i)]
+				str << " text%d='%s'," % [i, self.text(i)]
 			end
 			str.sub!(/,?$/, ">")
 		end
@@ -2079,14 +2093,14 @@
 			str.sub!(/>$/, "")
 			str << " parent=%s," % parent unless parent.nil?
 			for i in 0..(columnCount - 1)
-				str << " text%d=%s," % [i, self.text(i)]
+				str << " text%d='%s'," % [i, self.text(i)]
 			end
 			str.sub!(/,?$/, ">")
 			pp.text str
 		end
 
 		def clone(*args)
-			method_missing(:clone, *args)
+			Qt::TreeWidgetItem.new(self)
 		end
 
 		def type(*args)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/qtruby/src/marshall_basetypes.h new/kdebindings-4.2.3/ruby/qtruby/src/marshall_basetypes.h
--- old/kdebindings-4.2.2/ruby/qtruby/src/marshall_basetypes.h	2009-03-26 15:42:00.000000000 +0100
+++ new/kdebindings-4.2.3/ruby/qtruby/src/marshall_basetypes.h	2009-04-30 11:11:37.000000000 +0200
@@ -139,13 +139,13 @@
 template <>
 void marshall_to_ruby<SmokeClassWrapper>(Marshall *m)
 {
-	if(m->item().s_voidp == 0) {
+	if (m->item().s_voidp == 0) {
 		*(m->var()) = Qnil;
 		return;
 	}
 	void *p = m->item().s_voidp;
 	VALUE obj = getPointerObject(p);
-	if(obj != Qnil) {
+	if (obj != Qnil) {
 		*(m->var()) = obj;
 		return ;
 	}
@@ -153,13 +153,13 @@
 	smokeruby_object  * o = alloc_smokeruby_object(false, m->smoke(), m->type().classId(), p);
 
 	const char * classname = resolve_classname(o);
-	if(m->type().isConst() && m->type().isRef()) {
+	if (m->type().isConst() && m->type().isRef()) {
 		p = construct_copy( o );
 		if (do_debug & qtdb_gc) {
 			qWarning("copying %s %p to %p\n", classname, o->ptr, p);
 		}
 
-		if(p) {
+		if (p) {
 			o->ptr = p;
 			o->allocated = true;
 		}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/qtruby/src/marshall_types.cpp new/kdebindings-4.2.3/ruby/qtruby/src/marshall_types.cpp
--- old/kdebindings-4.2.2/ruby/qtruby/src/marshall_types.cpp	2009-03-26 15:42:00.000000000 +0100
+++ new/kdebindings-4.2.3/ruby/qtruby/src/marshall_types.cpp	2009-04-30 11:11:37.000000000 +0200
@@ -18,7 +18,15 @@
 
 #include "marshall_types.h"
 #include <smoke/qt_smoke.h>
+
+#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qmap.h>
+
+#ifdef QT_QTDBUS
 #include <QtDBus>
+#endif
 
 static bool qtruby_embedded = false;
 
@@ -661,8 +669,10 @@
 				o[0] = new QHash<void*, void*>;
 			} else if (type.startsWith("QMap")) {
 				o[0] = new QMap<void*, void*>;
+#ifdef QT_QTDBUS
 			} else if (type == "QDBusVariant") {
 				o[0] = new QDBusVariant;
+#endif
 			} else {
 				Smoke::ModuleIndex ci = qt_Smoke->findClass(type);
 				if (ci.index != 0) {
@@ -702,8 +712,11 @@
 		QByteArray t(type().name());
 		t.replace("const ", "");
 		t.replace("&", "");
+
 		if (t == "QDBusVariant") {
+#ifdef QT_QTDBUS
 			*reinterpret_cast<QDBusVariant*>(o[0]) = *(QDBusVariant*) _stack[0].s_class;
+#endif
 		} else {
 			// Save any address in zeroth element of the arrary of 'void*'s passed to 
 			// qt_metacall()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/qtruby/src/Qt.cpp new/kdebindings-4.2.3/ruby/qtruby/src/Qt.cpp
--- old/kdebindings-4.2.2/ruby/qtruby/src/Qt.cpp	2009-03-26 15:42:00.000000000 +0100
+++ new/kdebindings-4.2.3/ruby/qtruby/src/Qt.cpp	2009-04-30 11:11:37.000000000 +0200
@@ -459,6 +459,23 @@
 const char *
 resolve_classname(smokeruby_object * o)
 {
+	if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QObject")) {
+		QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
+		const QMetaObject * meta = qobject->metaObject();
+
+		while (meta != 0) {
+			o->smoke = Smoke::classMap[meta->className()];
+			if (o->smoke != 0) {
+				o->classId = o->smoke->idClass(meta->className()).index;
+				if (o->classId != 0) {
+					return qtruby_modules[o->smoke].binding->className(o->classId);
+				}
+			}
+
+			meta = meta->superClass();
+		}
+	}
+
     if (o->smoke->classes[o->classId].external) {
         Smoke::ModuleIndex mi = o->smoke->findClass(o->smoke->className(o->classId));
         o->smoke = mi.smoke;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/qtruby/src/qtruby.h new/kdebindings-4.2.3/ruby/qtruby/src/qtruby.h
--- old/kdebindings-4.2.2/ruby/qtruby/src/qtruby.h	2009-03-26 15:42:00.000000000 +0100
+++ new/kdebindings-4.2.3/ruby/qtruby/src/qtruby.h	2009-04-30 11:11:37.000000000 +0200
@@ -26,7 +26,7 @@
 #ifndef QT_VERSION_STR
 #define QT_VERSION_STR "Unknown"
 #endif
-#define QTRUBY_VERSION "2.0.3"
+#define QTRUBY_VERSION "2.0.4"
 
 #if !defined RSTRING_LEN
 #define RSTRING_LEN(a) RSTRING(a)->len
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/qttest/CMakeLists.txt new/kdebindings-4.2.3/ruby/qttest/CMakeLists.txt
--- old/kdebindings-4.2.2/ruby/qttest/CMakeLists.txt	2008-11-04 18:12:07.000000000 +0100
+++ new/kdebindings-4.2.3/ruby/qttest/CMakeLists.txt	2009-04-30 11:11:37.000000000 +0200
@@ -4,7 +4,7 @@
 set(qttest_LIBRARY_SRC qttest.cpp qttesthandlers.cpp)
 
 add_library(qttest MODULE ${qttest_LIBRARY_SRC})
-target_link_libraries(qttest ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokeqttest qtruby4shared)
+target_link_libraries(qttest ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqttest qtruby4shared)
 set_target_properties(qttest PROPERTIES PREFIX "")
 install(TARGETS qttest DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES qttest.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qttest)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/ruby/solid/solidhandlers.cpp new/kdebindings-4.2.3/ruby/solid/solidhandlers.cpp
--- old/kdebindings-4.2.2/ruby/solid/solidhandlers.cpp	2008-06-10 13:40:53.000000000 +0200
+++ new/kdebindings-4.2.3/ruby/solid/solidhandlers.cpp	2009-04-30 11:11:37.000000000 +0200
@@ -23,9 +23,54 @@
 
 #include <solid/device.h>
 
+void marshall_SolidDeviceInterfaceType(Marshall *m) {
+    switch(m->action()) {
+
+    case Marshall::FromVALUE:
+    {
+        VALUE v = *(m->var());
+
+        if (v == Qnil) {
+            m->item().s_voidp = 0;
+        } else if (TYPE(v) == T_OBJECT) {
+            // Both Qt::Enum and Qt::Integer have a value() method, so 'get_qinteger()' can be called ok
+            VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, v);
+            m->item().s_voidp = new long((long) NUM2LONG(temp));
+        } else {
+            m->item().s_voidp = new long(NUM2LONG(v));
+        }
+
+        m->next();
+        if (m->item().s_voidp != 0) {
+            delete (long*) m->item().s_voidp;
+        }
+    }
+    break;
+
+    case Marshall::ToVALUE:
+    {
+        void * ptr = m->item().s_voidp;
+        if (ptr == 0) {
+            *(m->var()) = Qnil;
+        } else {
+            *(m->var()) = rb_funcall(qt_internal_module, rb_intern("create_qenum"),
+                             2, LONG2NUM(*((long *) ptr)), rb_str_new2(m->type().name()) );
+        }
+    }
+    break;
+
+    default:
+        m->unsupported();
+        break;
+    }
+}
+
 DEF_VALUELIST_MARSHALLER( SolidDeviceList, QList<Solid::Device>, Solid::Device )
 
 TypeHandler Solid_handlers[] = {
     { "QList<Solid::Device>", marshall_SolidDeviceList },
+    { "Solid::DeviceInterface::Type", marshall_SolidDeviceInterfaceType },
+    { "Solid::DeviceInterface::Type&", marshall_SolidDeviceInterfaceType },
+
     { 0, 0 }
 };
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/smoke/kde/classlist new/kdebindings-4.2.3/smoke/kde/classlist
--- old/kdebindings-4.2.2/smoke/kde/classlist	2008-10-30 15:10:32.000000000 +0100
+++ new/kdebindings-4.2.3/smoke/kde/classlist	2009-04-30 11:11:38.000000000 +0200
@@ -215,6 +215,7 @@
 KIO::UDSEntry
 KIcon
 KIconButton
+KIconCache
 KIconEffect
 KIconLoader
 KIconTheme
@@ -306,6 +307,7 @@
 KPassivePopupMessageHandler
 KPasswordDialog
 KPasteTextAction
+KPixmapCache
 KPixmapProvider
 KPlotAxis
 KPlotObject
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.2.2/smoke/kde/kde_header_list new/kdebindings-4.2.3/smoke/kde/kde_header_list
--- old/kdebindings-4.2.2/smoke/kde/kde_header_list	2008-10-30 15:10:32.000000000 +0100
+++ new/kdebindings-4.2.3/smoke/kde/kde_header_list	2009-04-30 11:11:38.000000000 +0200
@@ -133,6 +133,7 @@
 khelpmenu.h
 khistorycombobox.h
 khuesaturationselect.h
+kiconcache.h
 kicondialog.h
 kiconeffect.h
 kicon.h
@@ -239,6 +240,7 @@
 kpassivepopupmessagehandler.h
 kpassworddialog.h
 kpastetextaction.h
+kpixmapcache.h
 kpixmapprovider.h
 kplotaxis.h
 kplotobject.h

++++++ kdebindings4.spec.in ++++++
--- /var/tmp/diff_new_pack.e26742/_old	2009-05-06 18:46:56.000000000 +0200
+++ /var/tmp/diff_new_pack.e26742/_new	2009-05-06 18:46:56.000000000 +0200
@@ -21,7 +21,7 @@
 License:        LGPL v2.1 or later
 Group:          Development/Libraries/KDE
 Summary:        Bindings for KDE 4.x libraries
-Version:        4.2.2
+Version:        4.2.3
 Release:        1
 Source0:        kdebindings-%version.tar.bz2
 Patch0:         4_2_BRANCH.diff


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)