[Kde-bindings] branches/work/kdebindings-smoke2

[Arno Rehn]

SVN commit 768298 by arnorehn:

* Fixed wrong method name being taken in smoke.h
* Fixed bug when iterating over the inheritance list in smoke.h
* Added first part of Korundum. There is still a large part missing
  (marshallers, resolve_classname, ...). Some things already work, some
  don't.
* Fixed dates in this file.

CCMAIL: kde-bindings at kde.org



 M  +13 -4     ChangeLog  
 M  +1 -0      ruby/CMakeLists.txt  
 A             ruby/korundum (directory)  
 A             ruby/korundum/CMakeLists.txt  
 A             ruby/korundum/example.rb  
 A             ruby/korundum/korundum.cpp   [License: UNKNOWN]
 A             ruby/korundum/korundum.rb  
 M  +5 -4      smoke/smoke.h  


--- branches/work/kdebindings-smoke2/ChangeLog #768297:768298
@@ -1,5 +1,14 @@
-2007-01-20  Arno Rehn  <arno at arnorehn.de>
+2008-01-29  Arno Rehn  <arno at arnorehn.de>
 
+    * Fixed wrong method name being taken in smoke.h
+    * Fixed bug when iterating over the inheritance list in smoke.h
+    * Added first part of Korundum. There is still a large part missing
+      (marshallers, resolve_classname, ...). Some things already work, some
+      don't.
+    * Fixed dates in this file.
+
+2008-01-20  Arno Rehn  <arno at arnorehn.de>
+
 	* Removed classlist from smoke/qt as it is not needed.
 	* Updated smoke/kde. Strangely there are just a few basic methods
 	  (qt_metacall, tr, metaObject) generated for KPageModel, so the build will
@@ -12,11 +21,11 @@
 	  in handy when writing classlists for new modules.
 	* Added kde_smoke.h
 
-2207-01-15  Arno Rehn  <arno at arnorehn.de>
+2008-01-15  Arno Rehn  <arno at arnorehn.de>
 
 	* If no classlist is given, process all classes.
 
-2007-01-10  Arno Rehn  <arno at arnorehn.de>
+2008-01-10  Arno Rehn  <arno at arnorehn.de>
 
     * Kalyptus now takes a list of classes which should be included, rather
       than a list of classes which should be excluded, as suggested by
@@ -24,7 +33,7 @@
     * Added stuff for parsing Q_DECLARE_FLAGS to kalyptus from trunk.
     * Added missing Q_DECL_EXPORT macros to Qyoto.
 
-2007-01-08  Arno Rehn  <arno at arnorehn.de>
+2008-01-08  Arno Rehn  <arno at arnorehn.de>
 
     * Removed some unnecessary files in smoke/qsci.
     * Updated kalyptus with the sources in trunk.
--- branches/work/kdebindings-smoke2/ruby/CMakeLists.txt #768297:768298
@@ -28,6 +28,7 @@
 endif(RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
 message(STATUS "Build QtRuby... " ${QTRUBY_ENABLED})
 add_subdirectory( qsci )
+add_subdirectory( korundum )
 #message(STATUS "Build Korundum... " ${KORUNDUM_ENABLED})
 #message(STATUS "Build Plasma... " ${PLASMA_ENABLED})
 
--- branches/work/kdebindings-smoke2/smoke/smoke.h #768297:768298
@@ -451,7 +451,8 @@
 	    Index ci = inheritanceList[p];
 	    Smoke *s = classMap[className(ci)];
 	    ModuleIndex cmi = s->idClass(className(ci));
-	    ModuleIndex mi = s->findMethod(cmi, name);
+	    ModuleIndex nmi = s->findMethodName(className(ci), name.smoke->methodNames[name.index]);
+	    ModuleIndex mi = s->findMethod(cmi, nmi);
 	    if (mi.index) return mi;
 	}
 	return NullModuleIndex;
@@ -469,14 +470,14 @@
 	if (smoke == baseSmoke && classId == baseId)
 	    return true;
 	
-	for(Index p = smoke->classes[classId].parents; inheritanceList[p]; p++) {
-	    Class& cur = smoke->classes[inheritanceList[p]];
+	for(Index p = smoke->classes[classId].parents; smoke->inheritanceList[p]; p++) {
+	    Class& cur = smoke->classes[smoke->inheritanceList[p]];
 	    if (cur.external) {
 		ModuleIndex mi = findClass(cur.className);
 		if (!mi.index) return false;
 		return isDerivedFrom(mi.smoke, mi.index, baseSmoke, baseId);
 	    }
-	    if (isDerivedFrom(smoke, inheritanceList[p], baseSmoke, baseId))
+	    if (isDerivedFrom(smoke, smoke->inheritanceList[p], baseSmoke, baseId))
 		return true;
 	}
 	return false;