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

List:       kde-commits
Subject:    KDE/kdebindings/ruby/qtruby/src
From:       Richard Dale <Richard_Dale () tipitina ! demon ! co ! uk>
Date:       2009-12-17 17:56:50
Message-ID: 1261072610.810778.22773.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1063280 by rdale:

* Avoid using the Smoke::classMap as it really should be private


 M  +5 -3      Qt.cpp  


--- trunk/KDE/kdebindings/ruby/qtruby/src/Qt.cpp #1063279:1063280
@@ -466,7 +466,7 @@
 		const QMetaObject * meta = qobject->metaObject();
 
 		while (meta != 0) {
-			Smoke::ModuleIndex mi = Smoke::classMap[meta->className()];
+			Smoke::ModuleIndex mi = o->smoke->findClass(meta->className());
 			o->smoke = mi.smoke;
 			o->classId = mi.index;
 			if (o->smoke != 0) {
@@ -494,9 +494,11 @@
     char *c = StringValuePtr(c_value);
     char *name = StringValuePtr(name_value);
     VALUE result = rb_ary_new();
-    Smoke* s = Smoke::classMap[c].smoke;
+    Smoke::ModuleIndex classId = qt_Smoke->findClass(c);    
     Smoke::ModuleIndex meth = qt_Smoke->NullModuleIndex;
-    if (s) meth = s->findMethod(c, name);
+    if (classId.smoke != 0) {
+        meth = classId.smoke->findMethod(c, name);
+    }
 #ifdef DEBUG
     if (do_debug & qtdb_calls) qWarning("Found method %s::%s => %d", c, name, meth.index);
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]