[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebindings/qtruby/rubylib/qtruby
From:       Richard Dale <Richard_Dale () tipitina ! demon ! co ! uk>
Date:       2006-07-18 21:48:34
Message-ID: 1153259314.904146.11801.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 563940 by rdale:

* Replace some more QStrings with QByteArrays



 M  +6 -6      Qt.cpp  


--- trunk/KDE/kdebindings/qtruby/rubylib/qtruby/Qt.cpp #563939:563940
@@ -484,7 +484,7 @@
 		// The class isn't in the Smoke lib..
 		if (classId == 0) {
 			VALUE new_klass = Qnil;
-			QString className(meta->className());
+			QByteArray className(meta->className());
 
 			// The konsolePart class is in kdebase, and so it can't be in the Smoke library.
 			// This hack instantiates a Ruby KDE::KonsolePart instance
@@ -497,11 +497,11 @@
 			} else if (className.startsWith("Q")) {
 				className.replace("Q", "");
 				className = className.mid(0, 1).toUpper() + className.mid(1);
-    			new_klass = rb_define_class_under(qt_module, className.toLatin1(), klass);
+    			new_klass = rb_define_class_under(qt_module, className, klass);
 			} else if (kde_module == Qnil) {
-    			new_klass = rb_define_class(className.toLatin1(), klass);
+    			new_klass = rb_define_class(className, klass);
 			} else {
-				new_klass = kde_package_to_class(className.toLatin1(), klass);
+				new_klass = kde_package_to_class(className, klass);
 			}
 
 			if (new_klass != Qnil) {
@@ -616,12 +616,12 @@
 	} else {
 		// Assume the value of the Qt::Variant can be obtained
 		// with a call such as Qt::Variant.toPoint()
-		QString toValueMethodName(classname);
+		QByteArray toValueMethodName(classname);
 		if (toValueMethodName.startsWith("Qt::")) {
 			toValueMethodName.remove(0, strlen("Qt::"));
 		}
 		toValueMethodName.prepend("to");
-		return rb_funcall(variant_value, rb_intern(toValueMethodName.toLatin1()), 1, variant_value);
+		return rb_funcall(variant_value, rb_intern(toValueMethodName), 1, variant_value);
 	}
 
 	VALUE result = Qnil;
[prev in list] [next in list] [prev in thread] [next in thread]