[patch] qtruby-3.5.10-gcc44.patch

qtruby-3.5.10-gcc44.patch (text/plain), 2.66 KB, created by Ryan Hill (RETIRED) on 2009-03-28 05:22:55 UTC

diff -Naurp qtruby-3.5.10-orig/qtruby/rubylib/qtruby/Qt.cpp qtruby-3.5.10/qtruby/rubylib/qtruby/Qt.cpp
--- qtruby-3.5.10-orig/qtruby/rubylib/qtruby/Qt.cpp	2007-01-15 05:19:09.000000000 -0600
+++ qtruby-3.5.10/qtruby/rubylib/qtruby/Qt.cpp	2009-03-27 23:20:17.000000000 -0600
@@ -950,7 +950,7 @@ cast_object_to(VALUE /*self*/, VALUE obj
 const char *
 get_VALUEtype(VALUE ruby_value)
 {
-	char * classname = rb_obj_classname(ruby_value);
+	const char * classname = rb_obj_classname(ruby_value);
     const char *r = "";
     if(ruby_value == Qnil)
 	r = "u";
@@ -1432,7 +1432,7 @@ static QCString * mcid = 0;
 static VALUE
 method_missing(int argc, VALUE * argv, VALUE self)
 {
-	char * methodName = rb_id2name(SYM2ID(argv[0]));
+	char * methodName = const_cast<char *>(rb_id2name(SYM2ID(argv[0])));
     VALUE klass = rb_funcall(self, rb_intern("class"), 0);
 
 	// Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
@@ -1482,7 +1482,7 @@ static QString * pred = 0;
 
 			VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
 			if (_current_method == -1) {
-				char * op = rb_id2name(SYM2ID(argv[0]));
+				const char * op = rb_id2name(SYM2ID(argv[0]));
 				if (	qstrcmp(op, "-") == 0
 						|| qstrcmp(op, "+") == 0
 						|| qstrcmp(op, "/") == 0
@@ -1557,7 +1557,7 @@ static VALUE
 class_method_missing(int argc, VALUE * argv, VALUE klass)
 {
 	VALUE result = Qnil;
-	char * methodName = rb_id2name(SYM2ID(argv[0]));
+	char * methodName = const_cast<char *>(rb_id2name(SYM2ID(argv[0])));
 	VALUE * temp_stack = (VALUE *) calloc(argc+3, sizeof(VALUE));
     temp_stack[0] = rb_str_new2("Qt");
     temp_stack[1] = rb_str_new2(methodName);
@@ -1674,7 +1674,7 @@ initialize_qt(int argc, VALUE * argv, VA
 	{ 
 		// Put this in a C block so that the mcid will be de-allocated at the end of the block,
 		// rather than on f'n exit, to avoid the longjmp problem described below
-		QCString * mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
+		QCString * mcid = find_cached_selector(argc+4, temp_stack, klass, const_cast<char *>(rb_class2name(klass)));
 
 		if (_current_method == -1) {
 			retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+4, temp_stack);
@@ -1772,7 +1772,7 @@ qapplication_argv(VALUE /*self*/)
 VALUE
 getmetainfo(VALUE self, int &offset, int &index)
 {
-    char * signalname = rb_id2name(rb_frame_last_func());
+    char * signalname = const_cast<char *>(rb_id2name(rb_frame_last_func()));
     VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self);
 
     smokeruby_object *ometa = value_obj_info(metaObject_value);