[Kde-bindings] branches/KDE/3.5/kdebindings/qtruby

[Richard Dale]

SVN commit 586385 by rdale:

* Upped the QtRuby version to 1.0.13 for the KDE 3.5.5 release

* Fixed a crash when a slot was inherited by a subclass, and the
  subclass had no slots or signals of its own

CCMAIL: kde-bindings at kde.org



 M  +7 -0      ChangeLog  
 M  +1 -1      rubylib/qtruby/Qt.cpp  
 M  +6 -1      rubylib/qtruby/lib/Qt/qtruby.rb  


--- branches/KDE/3.5/kdebindings/qtruby/ChangeLog #586384:586385
@@ -1,3 +1,10 @@
+2006-09-19  Richard Dale  <rdale at foton.es>
+
+	* Upped the QtRuby version to 1.0.13 for the KDE 3.5.5 release
+
+	* Fixed a crash when a slot was inherited by a subclass, and the
+	  subclass had no slots or signals of its own
+
 2006-09-17  Richard Dale  <rdale at foton.es>
 
 	* Fixed bug reported by Caleb Tennis where temporary QString const arguments
--- branches/KDE/3.5/kdebindings/qtruby/rubylib/qtruby/Qt.cpp #586384:586385
@@ -62,7 +62,7 @@
 
 // #define DEBUG
 
-#define QTRUBY_VERSION "1.0.12"
+#define QTRUBY_VERSION "1.0.13"
 
 extern Smoke *qt_Smoke;
 extern void init_qt_Smoke();
--- branches/KDE/3.5/kdebindings/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb #586384:586385
@@ -1606,7 +1606,12 @@
 		end
 		
 		def Internal.getMetaObject(qobject)
-			meta = Meta[qobject.class.name]
+			klass = qobject.class
+			begin
+				meta = Meta[klass.name]
+				klass = klass.superclass
+			end while meta.nil? and klass != Object
+
 			return nil if meta.nil?
 	
 			if meta.metaobject.nil? or meta.changed