[Kde-bindings] KDE/kdebindings/ruby/qtruby

[Richard Dale]

SVN commit 898619 by rdale:

* Added another patch from Davor Ocelic for Ruby 1.9 compatible RSTRING 
  usage - thanks Davor

CCMAIL: kde-bindings at kde.org



 M  +4 -0      ChangeLog  
 M  +7 -7      src/marshall_macros.h  


--- trunk/KDE/kdebindings/ruby/qtruby/ChangeLog #898618:898619
@@ -1,3 +1,7 @@
+2008-12-18  Richard Dale  <richard.j.dale at gmail.com>
+	* Added another patch from Davor Ocelic for Ruby 1.9 compatible RSTRING 
+	  usage - thanks Davor
+
 2008-12-12  Richard Dale  <richard.j.dale at gmail.com>
 	* When resolving overloaded methods with 'uchar*' and 'const uchar*' arg
 	  types prefer the non-const version of the arg. Thanks to Davor Ocelic
--- trunk/KDE/kdebindings/ruby/qtruby/src/marshall_macros.h #898618:898619
@@ -56,7 +56,7 @@
 				break;
 			}
 
-			int count = RARRAY(list)->len;
+			int count = RARRAY_LEN(list);
 			ItemList *cpplist = new ItemList;
 			long i;
 			for(i = 0; i < count; i++) {
@@ -127,7 +127,7 @@
 			m->next();
 
 			if (!m->type().isConst()) {
-			  int count = RARRAY(av)->len;
+			  int count = RARRAY_LEN(av);
 			  long i;
 			  cpplist->clear();
 			  for (i = 0; i < count; i++) {
@@ -169,7 +169,7 @@
 				m->item().s_voidp = 0;
 				break;
 			}
-			int count = RARRAY(list)->len;
+			int count = RARRAY_LEN(list);
 			ItemList *cpplist = new ItemList;
 			long i;
 			for(i = 0; i < count; i++) {
@@ -285,7 +285,7 @@
 				break;
 			}
 
-			int count = RARRAY(list)->len;
+			int count = RARRAY_LEN(list);
 			ItemList *cpplist = new ItemList;
 			long i;
 			for (i = 0; i < count; i++) {
@@ -379,7 +379,7 @@
 				m->item().s_voidp = 0;
 				break;
 			}
-			int count = RARRAY(list)->len;
+			int count = RARRAY_LEN(list);
 			ItemList *cpplist = new ItemList;
 			long i;
 			for(i = 0; i < count; i++) {
@@ -497,7 +497,7 @@
 		// Convert the ruby hash to an array of key/value arrays
 		VALUE temp = rb_funcall(hv, rb_intern("to_a"), 0);
 
-		for (long i = 0; i < RARRAY(temp)->len; i++) {
+		for (long i = 0; i < RARRAY_LEN(temp); i++) {
 			VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
 			VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
 			
@@ -574,7 +574,7 @@
 		// Convert the ruby hash to an array of key/value arrays
 		VALUE temp = rb_funcall(hv, rb_intern("to_a"), 0);
 
-		for (long i = 0; i < RARRAY(temp)->len; i++) {
+		for (long i = 0; i < RARRAY_LEN(temp); i++) {
 			VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
 			VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);