[Kde-bindings] KDE/kdebindings/ruby

[Richard Dale]

SVN commit 808271 by rdale:

* Rename the 'modules' global variable qtruby_modules to reduce the chances
  of a name clash

CCMAIL: kde-bindings at kde.org



 M  +1 -1      korundum/src/Korundum.cpp  
 M  +2 -2      qsci/qscintilla.cpp  
 M  +5 -0      qtruby/ChangeLog  
 M  +3 -3      qtruby/src/Qt.cpp  
 M  +5 -5      qtruby/src/qtruby.cpp  
 M  +1 -1      qtruby/src/qtruby.h  


--- trunk/KDE/kdebindings/ruby/korundum/src/Korundum.cpp #808270:808271
@@ -614,7 +614,7 @@
     smokeList << kde_Smoke;
 
     QtRubyModule module = { "KDE", resolve_classname_kde, classCreated };
-    modules[kde_Smoke] = module;
+    qtruby_modules[kde_Smoke] = module;
 
     install_handlers(KDE_handlers);
 
--- trunk/KDE/kdebindings/ruby/qsci/qscintilla.cpp #808270:808271
@@ -34,7 +34,7 @@
 Q_DECL_EXPORT void
 Init_qsciruby()
 {
-    rb_require("Qt");    // need to initialize the core runtime first
+    rb_require("Qt4");    // need to initialize the core runtime first
     init_qsci_Smoke();
 
     qsci_Smoke->binding = new QtRubySmokeBinding(qsci_Smoke);
@@ -42,7 +42,7 @@
     smokeList << qsci_Smoke;
 
     QtRubyModule module = { "Qsci", resolve_classname_qsci, 0 };
-    modules[qsci_Smoke] = module;
+    qtruby_modules[qsci_Smoke] = module;
 
     qscintilla_module = rb_define_module("Qsci");
     qscintilla_internal_module = rb_define_module_under(qscintilla_module, "Internal");
--- trunk/KDE/kdebindings/ruby/qtruby/ChangeLog #808270:808271
@@ -1,3 +1,8 @@
+2008-05-16  Richard Dale  <richard.j.dale at gmail.com>
+
+	* Rename the 'modules' global variable qtruby_modules to reduce the chances
+	  of a name clash
+
 2008-04-29  Richard Dale  <richard.j.dale at gmail.com>
 
 	* Added a marshaller for references to unsigned ints
--- trunk/KDE/kdebindings/ruby/qtruby/src/Qt.cpp #808270:808271
@@ -91,7 +91,7 @@
 }
 
 QList<Smoke*> smokeList;
-QHash<Smoke*, QtRubyModule> modules;
+QHash<Smoke*, QtRubyModule> qtruby_modules;
 
 #ifdef DEBUG
 int do_debug = qtdb_gc;
@@ -447,9 +447,9 @@
 {
     if (smoke->classes[classId].external) {
         Smoke::ModuleIndex mi = smoke->findClass(smoke->className(classId));
-        return modules.value(mi.smoke).resolve_classname(mi.smoke, mi.index, ptr);
+        return qtruby_modules.value(mi.smoke).resolve_classname(mi.smoke, mi.index, ptr);
     }
-    return modules.value(smoke).resolve_classname(smoke, classId, ptr);
+    return qtruby_modules.value(smoke).resolve_classname(smoke, classId, ptr);
 }
 
 VALUE
--- trunk/KDE/kdebindings/ruby/qtruby/src/qtruby.cpp #808270:808271
@@ -878,7 +878,7 @@
     return class_method_missing(argc, argv, qt_module);
 }
 
-static VALUE mapObject(VALUE self, VALUE obj);
+extern VALUE mapObject(VALUE self, VALUE obj);
 
 /*
 
@@ -1625,7 +1625,7 @@
 	return Qfalse;
 }
 
-static VALUE
+VALUE
 mapObject(VALUE self, VALUE obj)
 {
     smokeruby_object *o = value_obj_info(obj);
@@ -1805,7 +1805,7 @@
 	rb_define_method(klass, "connect", (VALUE (*) (...)) qobject_connect, -1);   
 	rb_define_singleton_method(klass, "connect", (VALUE (*) (...)) qobject_connect, -1);   
 
-	foreach(QtRubyModule m, modules.values()) {
+	foreach(QtRubyModule m, qtruby_modules.values()) {
 		if (m.class_created)
 			m.class_created(package, module_value, klass);
 	}
@@ -1864,7 +1864,7 @@
 #endif
 	}
 
-	foreach(QtRubyModule m, modules.values()) {
+	foreach(QtRubyModule m, qtruby_modules.values()) {
 		if (m.class_created)
 			m.class_created(package, module_value, klass);
 	}
@@ -1908,7 +1908,7 @@
     qt_Smoke->binding = new QtRubySmokeBinding(qt_Smoke);
 
     QtRubyModule module = { "QtRuby", resolve_classname_qt, 0 };
-    modules[qt_Smoke] = module;
+    qtruby_modules[qt_Smoke] = module;
 
     install_handlers(Qt_handlers);
 
--- trunk/KDE/kdebindings/ruby/qtruby/src/qtruby.h #808270:808271
@@ -104,7 +104,7 @@
 
 extern Q_DECL_EXPORT Smoke::ModuleIndex _current_method;
 
-extern Q_DECL_EXPORT QHash<Smoke*, QtRubyModule> modules;
+extern Q_DECL_EXPORT QHash<Smoke*, QtRubyModule> qtruby_modules;
 extern Q_DECL_EXPORT QList<Smoke*> smokeList;
 
 extern Q_DECL_EXPORT QHash<QByteArray, Smoke::ModuleIndex *> methcache;