/[gentoo-x86]/kde-base/qtruby/files/qtruby-3.5.10-gcc44.patch
Gentoo

Contents of /kde-base/qtruby/files/qtruby-3.5.10-gcc44.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download) (as text)
Fri Nov 20 01:01:09 2009 UTC (10 years, 10 months ago) by ssuominen
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
File MIME type: text/x-diff
FILE REMOVED
Rremove KDE 3.5.10.

1 diff -Naurp qtruby-3.5.10-orig/qtruby/rubylib/qtruby/Qt.cpp qtruby-3.5.10/qtruby/rubylib/qtruby/Qt.cpp
2 --- qtruby-3.5.10-orig/qtruby/rubylib/qtruby/Qt.cpp 2007-01-15 05:19:09.000000000 -0600
3 +++ qtruby-3.5.10/qtruby/rubylib/qtruby/Qt.cpp 2009-03-27 23:20:17.000000000 -0600
4 @@ -950,7 +950,7 @@ cast_object_to(VALUE /*self*/, VALUE obj
5 const char *
6 get_VALUEtype(VALUE ruby_value)
7 {
8 - char * classname = rb_obj_classname(ruby_value);
9 + const char * classname = rb_obj_classname(ruby_value);
10 const char *r = "";
11 if(ruby_value == Qnil)
12 r = "u";
13 @@ -1432,7 +1432,7 @@ static QCString * mcid = 0;
14 static VALUE
15 method_missing(int argc, VALUE * argv, VALUE self)
16 {
17 - char * methodName = rb_id2name(SYM2ID(argv[0]));
18 + char * methodName = const_cast<char *>(rb_id2name(SYM2ID(argv[0])));
19 VALUE klass = rb_funcall(self, rb_intern("class"), 0);
20
21 // Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
22 @@ -1482,7 +1482,7 @@ static QString * pred = 0;
23
24 VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
25 if (_current_method == -1) {
26 - char * op = rb_id2name(SYM2ID(argv[0]));
27 + const char * op = rb_id2name(SYM2ID(argv[0]));
28 if ( qstrcmp(op, "-") == 0
29 || qstrcmp(op, "+") == 0
30 || qstrcmp(op, "/") == 0
31 @@ -1557,7 +1557,7 @@ static VALUE
32 class_method_missing(int argc, VALUE * argv, VALUE klass)
33 {
34 VALUE result = Qnil;
35 - char * methodName = rb_id2name(SYM2ID(argv[0]));
36 + char * methodName = const_cast<char *>(rb_id2name(SYM2ID(argv[0])));
37 VALUE * temp_stack = (VALUE *) calloc(argc+3, sizeof(VALUE));
38 temp_stack[0] = rb_str_new2("Qt");
39 temp_stack[1] = rb_str_new2(methodName);
40 @@ -1674,7 +1674,7 @@ initialize_qt(int argc, VALUE * argv, VA
41 {
42 // Put this in a C block so that the mcid will be de-allocated at the end of the block,
43 // rather than on f'n exit, to avoid the longjmp problem described below
44 - QCString * mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
45 + QCString * mcid = find_cached_selector(argc+4, temp_stack, klass, const_cast<char *>(rb_class2name(klass)));
46
47 if (_current_method == -1) {
48 retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+4, temp_stack);
49 @@ -1772,7 +1772,7 @@ qapplication_argv(VALUE /*self*/)
50 VALUE
51 getmetainfo(VALUE self, int &offset, int &index)
52 {
53 - char * signalname = rb_id2name(rb_frame_last_func());
54 + char * signalname = const_cast<char *>(rb_id2name(rb_frame_last_func()));
55 VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self);
56
57 smokeruby_object *ometa = value_obj_info(metaObject_value);

  ViewVC Help
Powered by ViewVC 1.1.20