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

[Richard Dale]

SVN commit 725154 by rdale:

* The QScintilla class names now all start with Qsci instead of Qext,
   so change the QtRuby module name for the classes from Qext:: to Qsci::
* Fixes a seg fault pointed out by Adreas Pakulat

CCMAIL: kde-bindings at kde.org



 M  +6 -0      ChangeLog  
 M  +6 -6      src/Qt.cpp  
 M  +3 -2      src/lib/Qt/qtruby4.rb  


--- trunk/KDE/kdebindings/ruby/qtruby/ChangeLog #725153:725154
@@ -1,3 +1,9 @@
+2007-10-14  Richard Dale  <rdale at foton.es>
+
+	* The QScintilla class names now all start with Qsci instead of Qext,
+	  so change the QtRuby module name from Qext:: to Qsci::
+	* Fixes a seg fault pointed out by Adreas Pakulat
+
 2007-10-08  Richard Dale  <rdale at foton.es>
 
 	* Added some missing modules for namespaces in the KDE4 classes
--- trunk/KDE/kdebindings/ruby/qtruby/src/Qt.cpp #725153:725154
@@ -3201,11 +3201,11 @@
 		if (packageName == "Qt::AbstractItemModel") {
 			rb_define_method(klass, "createIndex", (VALUE (*) (...)) qabstractitemmodel_createindex, -1);
 		}
-	} else if (packageName.startsWith("Qext::")) {
+	} else if (packageName.startsWith("Qsci::")) {
 		if (qext_scintilla_module == Qnil) {
-			qext_scintilla_module = rb_define_module("Qext");
+			qext_scintilla_module = rb_define_module("Qsci");
 		}
-		klass = rb_define_class_under(qext_scintilla_module, package+strlen("Qext::"), qt_base_class);
+		klass = rb_define_class_under(qext_scintilla_module, package+strlen("Qsci::"), qt_base_class);
 	} else if (packageName.startsWith("Qwt::")) {
 		if (qwt_module == Qnil) {
 			qwt_module = rb_define_module("Qwt");
@@ -3244,11 +3244,11 @@
 		klass = rb_define_class_under(qtextlayout_class, package+strlen("Qt::TextLayout::"), qt_base_class);
 	} else if (packageName.startsWith("Qt::")) {
 		klass = rb_define_class_under(qt_module, package+strlen("Qt::"), qt_base_class);
-	} else if (packageName.startsWith("Qext::")) {
+	} else if (packageName.startsWith("Qsci::")) {
 		if (qext_scintilla_module == Qnil) {
-			qext_scintilla_module = rb_define_module("Qext");
+			qext_scintilla_module = rb_define_module("Qsci");
 		}
-    	klass = rb_define_class_under(qext_scintilla_module, package+strlen("Qext::"), qt_base_class);
+    	klass = rb_define_class_under(qext_scintilla_module, package+strlen("Qsci::"), qt_base_class);
 	} else if (packageName.startsWith("Qwt::")) {
 		if (qwt_module == Qnil) {
 			qwt_module = rb_define_module("Qwt");
--- trunk/KDE/kdebindings/ruby/qtruby/src/lib/Qt/qtruby4.rb #725153:725154
@@ -2062,8 +2062,8 @@
 		@@idclass   = []
 
 		def Internal.normalize_classname(classname)
-			if classname =~ /^Qext/
-				now = classname.sub(/^Qext(?=[A-Z])/,'Qext::')
+			if classname =~ /^Qsci/
+				now = classname.sub(/^Qsci(?=[A-Z])/,'Qsci::')
 			elsif classname =~ /^Qwt/
 				now = classname.sub(/^Qwt(?=[A-Z])/,'Qwt::')
 			elsif classname =~ /^Q3/
@@ -2082,6 +2082,7 @@
 		end
 
 		def Internal.init_class(c)
+puts c
 			classname = Qt::Internal::normalize_classname(c)
 			classId = Qt::Internal.idClass(c)
 			insert_pclassid(classname, classId)