[Kde-bindings] KDE/kdebindings

[Arno Rehn]

SVN commit 1082635 by arnorehn:

Add cf_namespace flag.
Include all functions from included namespaces. Only top-level functions have
to be named in the <functions> element of smokeconfig.xml.

CCMAIL: kde-bindings at kde.org



 M  +2 -1      generator/generators/smoke/helpers.cpp  
 M  +2 -0      generator/generators/smoke/writeSmokeDataFile.cpp  
 M  +3 -0      smoke/kio/smokeconfig.xml  
 M  +1 -1      smoke/phonon/CMakeLists.txt  
 M  +2 -0      smoke/phonon/phonon_includes.h  
 M  +1 -1      smoke/qimageblitz/CMakeLists.txt  
 M  +2 -0      smoke/qimageblitz/qimageblitz_includes.h  
 M  +1 -0      smoke/smoke.h  


--- trunk/KDE/kdebindings/generator/generators/smoke/helpers.cpp #1082634:1082635
@@ -107,7 +107,8 @@
         
         // gcc doesn't like this function... for whatever reason
         if (fn.name() == "_IO_ftrylockfile"
-            || (!Options::functionNameIncluded(fn.qualifiedName()) && !Options::functionSignatureIncluded(fnString))
+            // functions in named namespaces are covered by the class list - only check for top-level functions here
+            || (fn.nameSpace().isEmpty() && !Options::functionNameIncluded(fn.qualifiedName()) && !Options::functionSignatureIncluded(fnString))
             || Options::typeExcluded(fnString))
         {
             // we don't want that function...
--- trunk/KDE/kdebindings/generator/generators/smoke/writeSmokeDataFile.cpp #1082634:1082635
@@ -266,6 +266,8 @@
                 if (Util::canClassBeCopied(klass)) flags += "|Smoke::cf_deepcopy";
                 if (Util::hasClassVirtualDestructor(klass)) flags += "|Smoke::cf_virtual";
                 flags.replace("0|", ""); // beautify
+            } else {
+                flags = "Smoke::cf_namespace";
             }
             out << flags << ", ";
             if (!klass->isNameSpace())
--- trunk/KDE/kdebindings/smoke/kio/smokeconfig.xml #1082634:1082635
@@ -33,6 +33,9 @@
 
         <!-- operator(<<|>>)(QDataStream&, KDateTime*) - why are these operators not implemented/exported? -->
         <signature>.*operator(<<|>>)\(QDataStream&, (const\s)?KDateTime.*</signature>
+
+        <signature>.*KIO::file_move\(const KUrl&, const KUrl&, KIO::JobFlags.*</signature>
+        <signature>.*KIO::buildHTMLErrorString\(.*</signature>
     </exclude>
     <functions>
     </functions>
--- trunk/KDE/kdebindings/smoke/phonon/CMakeLists.txt #1082634:1082635
@@ -20,7 +20,7 @@
 
     COMMAND generator
     ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-         -I "${PHONON_INCLUDE_DIR}" -dm PHONON_EXPORT -- ${CMAKE_CURRENT_SOURCE_DIR}/phonon_includes.h
+         -I "${PHONON_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/phonon_includes.h
     DEPENDS generator generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
--- trunk/KDE/kdebindings/smoke/phonon/phonon_includes.h #1082634:1082635
@@ -1,3 +1,5 @@
+#define PHONON_EXPORT
+
 #include <phonon/abstractaudiooutput.h>
 #include <phonon/abstractmediastream.h>
 #include <phonon/abstractvideooutput.h>
--- trunk/KDE/kdebindings/smoke/qimageblitz/CMakeLists.txt #1082634:1082635
@@ -9,7 +9,7 @@
 
     COMMAND generator
     ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-         -I ${QIMAGEBLITZ_INCLUDES} -dm QIMAGEBLITZ_EXPORT -- ${CMAKE_CURRENT_SOURCE_DIR}/qimageblitz_includes.h
+         -I ${QIMAGEBLITZ_INCLUDES} -- ${CMAKE_CURRENT_SOURCE_DIR}/qimageblitz_includes.h
     DEPENDS generator generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
--- trunk/KDE/kdebindings/smoke/qimageblitz/qimageblitz_includes.h #1082634:1082635
@@ -1,3 +1,5 @@
+#define QIMAGEBLITZ_EXPORT
+
 #include <qimageblitz.h>
 
 #include <qglobal.h>
--- trunk/KDE/kdebindings/smoke/smoke.h #1082634:1082635
@@ -117,6 +117,7 @@
         cf_constructor = 0x01,  // has a constructor
         cf_deepcopy = 0x02,     // has copy constructor
         cf_virtual = 0x04,      // has virtual destructor
+        cf_namespace = 0x08,    // is a namespace
         cf_undefined = 0x10     // defined elsewhere
     };
     /**