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

[Richard Dale]

SVN commit 507218 by rdale:

* When KDE::CmdLineArgs.init() was called with just a single
  KDE::AboutData arg, it crashed. Fixes problem reported by
  Han Holl.

* KDE::CmdLineArgs and KDE::AboutData instances are no longer
  deleted by qtruby on garbage collection. Fixes another problem
  reported by Han Holl.

CCMAIL: kde-bindings at kde.org



 M  +10 -0     ChangeLog  
 M  +12 -8     rubylib/korundum/lib/KDE/korundum.rb  


--- branches/KDE/3.5/kdebindings/korundum/ChangeLog #507217:507218
@@ -1,3 +1,13 @@
+2006-02-08  Richard Dale  <Richard_Dale at tipitina.demon.co.uk>
+
+	* When KDE::CmdLineArgs.init() was called with just a single
+	  KDE::AboutData arg, it crashed. Fixes problem reported by
+	  Han Holl.
+	
+	* KDE::CmdLineArgs and KDE::AboutData instances are no longer
+	  deleted by qtruby on garbage collection. Fixes another problem
+	  reported by Han Holl.
+
 2005-12-08  Richard Dale  <Richard_Dale at tipitina.demon.co.uk>
 
 	* A marshaller was defined for 'KFileItemList' as a value type, but not for
--- branches/KDE/3.5/kdebindings/korundum/rubylib/korundum/lib/KDE/korundum.rb #507217:507218
@@ -357,11 +357,15 @@
 	end
 	
 	def CmdLineArgs::init(*k)
-		if k.length > 0 and k[0].kind_of?(Array)
-			# If init() is passed an array as the first argument, assume it's ARGV.
-			# Then convert to a pair of args 'ARGV.length+1, [$0]+ARGV'
-			array = k.shift
-			super(*([array.length+1] + [[$0] + array] + k))
+		if k.length > 0
+			if k[0].kind_of? Array
+				# If init() is passed an array as the first argument, assume it's ARGV.
+				# Then convert to a pair of args 'ARGV.length+1, [$0]+ARGV'
+				array = k.shift
+				super(*([array.length+1] + [[$0] + array] + k))
+			elsif k[0].kind_of? KDE::AboutData
+				super(1, [$0], k[0])
+			end
 		else
 			super
 		end
@@ -519,14 +523,14 @@
 	def I18N_NOOP2(comment, x) x end
 end
 
-class Module
-	def k_dcop_signals(*signal_list)
+class Qt::Base
+	def self.k_dcop_signals(*signal_list)
 		meta = KDE::DCOPMeta[self.name] || KDE::DCOPMetaInfo.new(self)
 		meta.add_signals(signal_list)
 		meta.changed = true
 	end
 
-	def k_dcop(*slot_list)
+	def self.k_dcop(*slot_list)
 		meta = KDE::DCOPMeta[self.name] || KDE::DCOPMetaInfo.new(self)
 		meta.add_slots(slot_list)
 		meta.changed = true