[Kde-bindings] branches/KDE/4.4/kdebindings

[Arno Rehn]

SVN commit 1084696 by arnorehn:

backport from trunk:
Fix method lookup for global functions.
Include the various Icon functions from kiconloader.h.

CCMAIL: kde-bindings at kde.org


 M  +5 -1      csharp/qyoto/src/qyoto.cpp  
 M  +6 -2      smoke/kdeui/smokeconfig.xml  
 M  +5 -4      smoke/smoke.h  


--- branches/KDE/4.4/kdebindings/csharp/qyoto/src/qyoto.cpp #1084695:1084696
@@ -141,7 +141,11 @@
 	if (do_debug & qtdb_calls) printf("DAMNIT on %s::%s => %d\n", classname, mungedname, meth.index);
 #endif
 	if (meth.index == 0) {
-    	meth = qtcore_Smoke->findMethod("QGlobalSpace", mungedname);
+		foreach (Smoke *smoke, qyoto_modules.keys()) {
+			meth = smoke->findMethod("QGlobalSpace", mungedname);
+			if (meth.index)
+				break;
+		}
 #ifdef DEBUG
 		if (do_debug & qtdb_calls) printf("DAMNIT on QGlobalSpace::%s => %d\n", mungedname, meth.index);
 #endif
--- branches/KDE/4.4/kdebindings/smoke/kdeui/smokeconfig.xml #1084695:1084696
@@ -36,8 +36,12 @@
         <signature>.*KStandardShortcut::insert\(\).*</signature>
     </exclude>
     <functions>
-        <name>KStandardAction::.*</name>
-        <name>KStandardShortcut::.*</name>
+        <name>BarIcon.*</name>
+        <name>DesktopIcon.*</name>
+        <name>IconSize.*</name>
+        <name>MainBarIcon.*</name>
+        <name>SmallIcon.*</name>
+        <name>UserIcon.*</name>
     </functions>
     <classList>
         <class>KAboutApplicationDialog</class>
--- branches/KDE/4.4/kdebindings/smoke/smoke.h #1084695:1084696
@@ -505,10 +505,11 @@
     }
 
     inline ModuleIndex findMethod(const char *c, const char *name) {
-	ModuleIndex idc = findClass(c);
-	if (!idc.smoke || !idc.index) return NullModuleIndex;
-	ModuleIndex idname = idc.smoke->findMethodName(c, name);
-	return idc.smoke->findMethod(idc, idname);
+        ModuleIndex idc = idClass(c);
+        if (!idc.smoke) idc = findClass(c);
+        if (!idc.smoke || !idc.index) return NullModuleIndex;
+        ModuleIndex idname = idc.smoke->findMethodName(c, name);
+        return idc.smoke->findMethod(idc, idname);
     }
 
     static inline bool isDerivedFrom(const ModuleIndex& classId, const ModuleIndex& baseClassId) {