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

[Richard Dale]

SVN commit 1074646 by rdale:

* Remove the KDevelop smoke lib, as it should be in the kde playground
* Add some fixes for the kde libs from the trunk

CCMAIL: kde-bindings at kde.org


 M  +0 -6      CMakeLists.txt  
 M  +3 -0      kdecore/smokeconfig.xml  
 M  +1 -4      kdeui/CMakeLists.txt  
 M  +1 -14     kdeui/smokeconfig.xml  
 D             kdevplatform (directory)  
 D             kdevplatform_smoke.h  
 M  +1 -15     kio/smokeconfig.xml  


--- branches/KDE/4.4/kdebindings/smoke/CMakeLists.txt #1074645:1074646
@@ -26,7 +26,6 @@
 OPTION(ENABLE_KNEWSTUFF2_SMOKE "build KNewStuff2" ON)
 OPTION(ENABLE_KNEWSTUFF3_SMOKE "build KNewStuff3" ON)
 OPTION(ENABLE_KUTILS_SMOKE "build KUtils" ON)
-OPTION(ENABLE_KDEVPLATFORM_SMOKE "build KDevPlatformSmoke" OFF)
 OPTION(ENABLE_KHTML_SMOKE "build KHTMLSmoke" ON)
 OPTION(ENABLE_KTEXTEDITOR_SMOKE "build KTextEditorSmoke" ON)
 OPTION(ENABLE_SOLID_SMOKE "build SolidSmoke" ON)
@@ -196,11 +195,6 @@
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Akonadi")
     endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
 
-    if(ENABLE_KDEVPLATFORM_SMOKE)
-        add_subdirectory(kdevplatform)
-        set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDevPlatform")
-    endif(ENABLE_KDEVPLATFORM_SMOKE)
-
     if(ENABLE_KHTML_SMOKE)
         add_subdirectory(khtml)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, KHTML")
--- branches/KDE/4.4/kdebindings/smoke/kdecore/smokeconfig.xml #1074645:1074646
@@ -199,5 +199,8 @@
         <class>Sonnet::Loader</class>
         <class>Sonnet::Speller</class>
         <class>Sonnet::SpellerPlugin</class>
+
+        <!-- namespaces -->
+        <class>KDE</class>
     </classList>
 </config>
--- branches/KDE/4.4/kdebindings/smoke/kdeui/CMakeLists.txt #1074645:1074646
@@ -72,11 +72,8 @@
     ${QT_QTXML_LIBRARY}
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KDEUI_LIBS}
+    smokeqtsvg
     smokeqtcore
-    smokeqtgui
-    smokeqtnetwork
-    smokeqtdbus
-    smokeqtxml
     smokekdecore
 )
 
--- branches/KDE/4.4/kdebindings/smoke/kdeui/smokeconfig.xml #1074645:1074646
@@ -1,11 +1,7 @@
 <config>
     <moduleName>kdeui</moduleName>
     <parentModules>
-        <module>qtcore</module>
-        <module>qtnetwork</module>
-        <module>qtdbus</module>
-        <module>qtgui</module>
-        <module>qtxml</module>
+        <module>qtsvg</module>
         <module>kdecore</module>
     </parentModules>
     <scalarTypes>
@@ -37,15 +33,6 @@
         <signature>.*operator(<<|>>)\(QDataStream&, (const\s)?KDateTime.*</signature>
     </exclude>
     <functions>
-        <!-- include functions starting with 'k' -->
-        <name>^k.*</name>
-        <name>.*::k.*</name>
-
-        <name>K.*::.*</name>
-        <!-- and operators -->
-        <name>.*operator.*</name>
-        <!-- and i18n functions -->
-        <name>.*i18n.*</name>
     </functions>
     <classList>
         <class>KAboutApplicationDialog</class>
--- branches/KDE/4.4/kdebindings/smoke/kio/smokeconfig.xml #1074645:1074646
@@ -1,12 +1,6 @@
 <config>
     <moduleName>kio</moduleName>
     <parentModules>
-        <module>qtcore</module>
-        <module>qtnetwork</module>
-        <module>qtdbus</module>
-        <module>qtgui</module>
-        <module>qtxml</module>
-        <module>kdecore</module>
         <module>kdeui</module>
     </parentModules>
     <scalarTypes>
@@ -40,15 +34,6 @@
         <signature>.*operator(<<|>>)\(QDataStream&, (const\s)?KDateTime.*</signature>
     </exclude>
     <functions>
-        <!-- include functions starting with 'k' -->
-        <name>^k.*</name>
-        <name>.*::k.*</name>
-
-        <name>K.*::.*</name>
-        <!-- and operators -->
-        <name>.*operator.*</name>
-        <!-- and i18n functions -->
-        <name>.*i18n.*</name>
     </functions>
     <classList>
         <class>KAbstractFileModule</class>
@@ -81,6 +66,7 @@
         <class>KDirWatch</class>
         <class>KDiskFreeSpace</class>
         <class>KEncodingFileDialog</class>
+        <class>KEncodingFileDialog::Result</class>
         <class>KFileDialog</class>
         <class>KFileItemActions</class>
         <class>KFileItemDelegate</class>