mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-10 20:54:39 +08:00
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
--- trunk/KDE/kdebindings/ruby/korundum/src/krubypluginfactory.cpp 2010/07/20 14:22:25 1152205
|
|
+++ trunk/KDE/kdebindings/ruby/korundum/src/krubypluginfactory.cpp 2010/09/30 15:34:41 1181284
|
|
@@ -52,16 +52,17 @@
|
|
VALUE bt = rb_funcall(info, rb_intern("backtrace"), 0);
|
|
VALUE message = RARRAY_PTR(bt)[0];
|
|
|
|
+ VALUE obj_string = rb_obj_as_string(info);
|
|
QString errormessage = QString("%1: %2 (%3)")
|
|
- .arg( STR2CSTR(message) )
|
|
- .arg( STR2CSTR(rb_obj_as_string(info)) )
|
|
- .arg( rb_class2name(CLASS_OF(info)) );
|
|
+ .arg( QString::fromLatin1(StringValuePtr(message)) )
|
|
+ .arg( QString::fromLatin1(StringValuePtr(obj_string)) )
|
|
+ .arg( QString::fromLatin1(rb_class2name(CLASS_OF(info))) );
|
|
fprintf(stderr, "%s\n", errormessage.toLatin1().constData());
|
|
|
|
QString tracemessage;
|
|
for(int i = 1; i < RARRAY_LEN(bt); ++i) {
|
|
if( TYPE(RARRAY_PTR(bt)[i]) == T_STRING ) {
|
|
- QString s = QString("%1\n").arg( STR2CSTR(RARRAY_PTR(bt)[i]) );
|
|
+ QString s = QString("%1\n").arg( QString::fromLatin1(StringValuePtr(RARRAY_PTR(bt)[i])) );
|
|
Q_ASSERT( ! s.isNull() );
|
|
tracemessage += s;
|
|
fprintf(stderr, "\t%s", s.toLatin1().constData());
|