Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 516 insertions, 0 deletions

diff --git a/python/pykde/sip/kresources/configdialog.sip b/python/pykde/sip/kresources/configdialog.sip
new file mode 100644
index 00000000..f6f840fe
--- /dev/null
+++ b/python/pykde/sip/kresources/configdialog.sip
@@ -0,0 +1,52 @@
+//
+//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
+//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
+//     may also apply
+
+
+//                 Generated by preSip
+//            module kresources  version KDE 3.5.3
+
+
+// This software is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this library; see the file COPYING.
+// If not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+%If ( KDE_3_2_0 -  )
+namespace KRES
+{
+
+class ConfigDialog : KDialogBase
+{
+%TypeHeaderCode
+#include <configdialog.h>
+%End
+
+
+public:
+                         ConfigDialog (QWidget*, const QString&, KRES::Resource*, const char* = 0);
+    void                 setInEditMode (bool);
+
+protected slots:
+    void                 accept ();
+    void                 setReadOnly (bool);
+    void                 slotNameChanged (const QString&);
+
+};  // class ConfigDialog
+
+};  // namespace KRES
+
+%End
+
diff --git a/python/pykde/sip/kresources/configpage.sip b/python/pykde/sip/kresources/configpage.sip
new file mode 100644
index 00000000..dfd8f9ed
--- /dev/null
+++ b/python/pykde/sip/kresources/configpage.sip
@@ -0,0 +1,48 @@
+//
+//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
+//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
+//     may also apply
+
+
+//                 Generated by preSip
+//            module kresources  version KDE 3.5.3
+
+
+// This software is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this library; see the file COPYING.
+// If not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+%If ( KDE_3_2_0 -  )
+namespace KRES
+{
+
+class ResourcePageInfo : KShared
+{
+%TypeHeaderCode
+#include <configpage.h>
+%End
+
+
+public:
+                         ResourcePageInfo ();
+//ig     Manager<Resource>*   mManager;
+    KConfig*             mConfig;
+
+};  // class ResourcePageInfo
+
+};  // namespace KRES
+
+%End
+
diff --git a/python/pykde/sip/kresources/configwidget.sip b/python/pykde/sip/kresources/configwidget.sip
new file mode 100644
index 00000000..8fc724a6
--- /dev/null
+++ b/python/pykde/sip/kresources/configwidget.sip
@@ -0,0 +1,56 @@
+//
+//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
+//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
+//     may also apply
+
+
+//                 Generated by preSip
+//            module kresources  version KDE 3.5.3
+
+
+// This software is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this library; see the file COPYING.
+// If not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+%If ( KDE_3_2_0 -  )
+namespace KRES
+{
+
+class ConfigWidget : QWidget
+{
+%TypeHeaderCode
+#include <configwidget.h>
+%End
+
+
+public:
+                         ConfigWidget (QWidget* = 0, const char* = 0);
+    virtual void         setInEditMode (bool);
+
+public slots:
+    virtual void         loadSettings (KRES::Resource*)  = 0;
+    virtual void         saveSettings (KRES::Resource*)  = 0;
+
+signals:
+    void                 setReadOnly (bool);
+
+protected:
+
+};  // class ConfigWidget
+
+};  // namespace KRES
+
+%End
+
diff --git a/python/pykde/sip/kresources/factory.sip b/python/pykde/sip/kresources/factory.sip
new file mode 100644
index 00000000..31851a3b
--- /dev/null
+++ b/python/pykde/sip/kresources/factory.sip
@@ -0,0 +1,54 @@
+//
+//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
+//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
+//     may also apply
+
+
+//                 Generated by preSip
+//            module kresources  version KDE 3.5.3
+
+
+// This software is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this library; see the file COPYING.
+// If not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+%If ( KDE_3_2_0 -  )
+namespace KRES
+{
+
+class Factory
+{
+%TypeHeaderCode
+#include <factory.h>
+%End
+
+
+public:
+    static KRES::Factory* self (const QString&);
+    KRES::ConfigWidget*  configWidget (const QString&, QWidget* = 0);
+    KRES::Resource*      resource (const QString&, const KConfig*);
+    QStringList          typeNames () const;
+    QString              typeName (const QString&) const;
+    QString              typeDescription (const QString&) const;
+
+protected:
+                         Factory (const QString&);
+
+};  // class Factory
+
+};  // namespace KRES
+
+%End
+
diff --git a/python/pykde/sip/kresources/kresourcesmod.sip b/python/pykde/sip/kresources/kresourcesmod.sip
new file mode 100644
index 00000000..2843d6c5
--- /dev/null
+++ b/python/pykde/sip/kresources/kresourcesmod.sip
@@ -0,0 +1,44 @@
+//
+//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
+//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
+//     may also apply
+
+
+//                 Generated by preSip
+//            module kresources  version KDE_3_5_2
+
+%Copying
+
+ This software is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public
+ License along with this library; see the file COPYING.
+ If not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+%End
+
+%Module kresources
+
+%Import qt/qtmod.sip
+%Import qtxml/qtxmlmod.sip
+%Import dcopmod.sip
+%Import kdecoremod.sip
+%Import kdefxmod.sip
+%Import kdeuimod.sip
+%Import kiomod.sip
+
+%Include configdialog.sip
+%Include configpage.sip
+%Include configwidget.sip
+%Include factory.sip
+%Include resource.sip
+%Include selectdialog.sip
diff --git a/python/pykde/sip/kresources/kresourcesmod.sip.in b/python/pykde/sip/kresources/kresourcesmod.sip.in
new file mode 100644
index 00000000..990ee683
--- /dev/null
+++ b/python/pykde/sip/kresources/kresourcesmod.sip.in
@@ -0,0 +1,45 @@
+//
+//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
+//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
+//     may also apply
+
+
+//                 Generated by preSip
+//            module kresources  version KDE_3_5_2
+
+%Copying
+
+ This software is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public
+ License along with this library; see the file COPYING.
+ If not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+%End
+
+%Module kresources
+
+%Import qt/qtmod.sip
+%Import qtxml/qtxmlmod.sip
+%Import dcopmod.sip
+%Import kdecoremod.sip
+%Import kdefxmod.sip
+%Import kdeuimod.sip
+%Import kiomod.sip
+
+%Include configdialog.sip
+%Include configpage.sip
+%Include configwidget.sip
+%Include factory.sip
+%Include resource.sip
+%Include selectdialog.sip
+@mark@
diff --git a/python/pykde/sip/kresources/resource.sip b/python/pykde/sip/kresources/resource.sip
new file mode 100644
index 00000000..f3d3d8d6
--- /dev/null
+++ b/python/pykde/sip/kresources/resource.sip
@@ -0,0 +1,84 @@
+//
+//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
+//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
+//     may also apply
+
+
+//                 Generated by preSip
+//            module kresources  version KDE 3.5.3
+
+
+// This software is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this library; see the file COPYING.
+// If not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+%If ( KDE_3_2_0 -  )
+namespace KRES
+{
+
+class Resource : QObject
+{
+%TypeHeaderCode
+#include <kconfig.h>
+#include <resource.h>
+%End
+
+
+public:
+    typedef QValueList<KRES::Resource*> List;
+                         Resource (const KConfig*);
+    virtual void         writeConfig (KConfig*);
+    bool                 open ();
+    void                 close ();
+    bool                 isOpen () const;
+    QString              identifier () const;
+    QString              type () const;
+    virtual void         setReadOnly (bool);
+    virtual bool         readOnly () const;
+    virtual void         setResourceName (const QString&);
+    virtual QString      resourceName () const;
+    void                 setActive (bool);
+    bool                 isActive () const;
+    virtual void         dump () const;
+
+protected:
+    virtual bool         doOpen ();
+    virtual void         doClose ();
+    void                 setIdentifier (const QString&);
+    void                 setType (const QString&);
+
+};  // class Resource
+
+
+class PluginFactoryBase : KLibFactory
+{
+%TypeHeaderCode
+#include <resource.h>
+%End
+
+
+public:
+    virtual KRES::Resource* resource (const KConfig*)  = 0;
+    virtual KRES::ConfigWidget* configWidget (QWidget*)  = 0;
+
+protected:
+    virtual QObject*     createObject (QObject*, const char*, const char*, const QStringList&);
+
+};  // class PluginFactoryBase
+
+};  // namespace KRES
+
+%End
+
diff --git a/python/pykde/sip/kresources/selectdialog.sip b/python/pykde/sip/kresources/selectdialog.sip
new file mode 100644
index 00000000..fb473c5c
--- /dev/null
+++ b/python/pykde/sip/kresources/selectdialog.sip
@@ -0,0 +1,133 @@
+//
+//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
+//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
+//     may also apply
+
+
+//                 Generated by preSip
+//            module kresources  version KDE 3.5.3
+
+
+// This software is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this library; see the file COPYING.
+// If not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+%ModuleHeaderCode
+#include <qwidget.h>
+%End
+
+
+%If ( KDE_3_2_0 -  )
+namespace KRES
+{
+
+class SelectDialog
+{
+%TypeHeaderCode
+#include <selectdialog.h>
+%End
+
+
+public:
+                         SelectDialog (QPtrList<KRES::Resource>, QWidget* = 0, const char* = 0);
+    KRES::Resource*      resource ();
+    static KRES::Resource* getResource (QPtrList<KRES::Resource>, QWidget* = 0);
+//force
+
+private:
+                         SelectDialog (const KRES::SelectDialog&);
+//end
+
+};  // class SelectDialog
+
+};  // namespace KRES
+
+%End
+
+
+
+%If (KDE_3_2_0 - )
+%MappedType QPtrList<KRES::Resource>
+//converts a Python list of KRES::Resource
+{
+%TypeHeaderCode
+#include <qptrlist.h>
+#include <resource.h>
+#include <sipkresourcesKRESResource.h>
+%End
+
+%ConvertFromTypeCode
+    if (!sipCpp)
+        return PyList_New (0);
+
+    PyObject *pylist;
+
+    // Create the list
+
+    if ((pylist = PyList_New(0)) == NULL)
+        return NULL;
+
+    // Get it.
+
+    QPtrList<KRES::Resource> *cpplist = (QPtrList<KRES::Resource> *)sipCpp;
+    KRES::Resource *cpp;
+    PyObject *inst;
+
+    // the loop depends on the type of iterator the  tmeplate makes available
+    for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () )
+    {
+        if (((inst = sipConvertFromInstance (cpp, sipClass_KRES_Resource, sipTransferObj)) == NULL)
+            || PyList_Append (pylist, inst) < 0)
+        {
+            Py_DECREF (pylist);
+            return NULL;
+        }
+    }
+
+    return pylist;
+%End
+
+%ConvertToTypeCode
+    if (sipIsErr == NULL)
+        return PyList_Check(sipPy);
+
+    QPtrList<KRES::Resource> *cpplist = new QPtrList<KRES::Resource>;
+
+    PyObject *elem;
+    KRES::Resource *cpp;
+    int iserr = 0;
+
+    for (int i = 0; i < PyList_Size (sipPy); i++)
+    {
+        elem = PyList_GET_ITEM (sipPy, i);
+        cpp = (KRES::Resource *)sipForceConvertTo_KRES_Resource (elem, &iserr);
+
+        if (iserr)
+        {
+            *sipIsErr = 1;
+            delete cpplist;
+            return 0;
+        }
+
+        cpplist->append (cpp);
+    }
+
+    *sipCppPtr = cpplist;
+
+    return 1;
+%End
+};
+%End
+
+