diff -ur PyKDE-snapshot20050316/sip/kdecore/kconfigskeleton.sip PyKDE-snapshot20050316.patched/sip/kdecore/kconfigskeleton.sip --- PyKDE-snapshot20050316/sip/kdecore/kconfigskeleton.sip 2005-03-05 06:45:33.000000000 +0100 +++ PyKDE-snapshot20050316.patched/sip/kdecore/kconfigskeleton.sip 2005-04-26 23:12:11.000000000 +0200 @@ -65,47 +65,47 @@ //force %ConvertToSubClassCode - if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemBool)) + if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemBool; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemColor)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemColor; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemDateTime)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemDateTime; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemDouble)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemDouble; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemEnum)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemEnum; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemFont)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemFont; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemInt)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemInt; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemInt64)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemInt64; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemIntList)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemIntList; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemLong)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemLong; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemPassword)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemPassword; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemPath)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemPath; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemPoint)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemPoint; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemProperty)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemProperty; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemRect)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemRect; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemSize)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemSize; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemString)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemString; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemStringList)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemStringList; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemUInt)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemUInt; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemUInt64)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemUInt64; - else if (typeid (sipCpp) == typeid (KConfigSkeleton::ItemULong)) + else if (dynamic_cast(sipCpp)) sipClass = sipClass_KConfigSkeleton_ItemULong; else sipClass = NULL; @@ -233,14 +233,164 @@ KConfigSkeleton::ItemPassword* addItemPassword (const QString&, QString&, const QString& = QString ::fromLatin1 ("" ), const QString& = QString ::null ); KConfigSkeleton::ItemPath* addItemPath (const QString&, QString&, const QString& = QString ::fromLatin1 ("" ), const QString& = QString ::null ); ItemProperty* addItemProperty (const QString&, QVariant&, const QVariant& = QVariant (), const QString& = QString ::null ); - ItemBool* addItemBool (const QString&, bool&, bool = 0, const QString& = QString ::null ); - ItemInt* addItemInt (const QString&, int&, int = 0, const QString& = QString ::null ); - ItemUInt* addItemUInt (const QString&, uint&, uint = 0, const QString& = QString ::null ); - ItemLong* addItemLong (const QString&, long&, long = 0, const QString& = QString ::null ); - ItemULong* addItemULong (const QString&, ulong&, ulong = 0, const QString& = QString ::null ); - KConfigSkeleton::ItemInt64* addItemInt64 (const QString&, longlong&, longlong = 0, const QString& = QString ::null ); - KConfigSkeleton::ItemUInt64* addItemUInt64 (const QString&, ulonglong&, ulonglong = 0, const QString& = QString ::null ); - ItemDouble* addItemDouble (const QString&, double&, double = 0.0, const QString& = QString ::null ); + ItemBool* addItemBool (const QString&, bool = 0, const QString& = QString ::null ) [ItemBool* (const QString&, bool&, bool = 0, const QString& = QString ::null)]; +%MethodCode +//takes name | (QString) | defaultValue | (a bool) | key | (QString = QString::null) + + class PyItemBool : public KConfigSkeleton::ItemBool + { + public: + PyItemBool(const QString &group, const QString &key, bool defaultValue=false) : + KConfigSkeleton::ItemBool(group, key, this->value, defaultValue) {}; + + private: + bool value; + }; + + Py_BEGIN_ALLOW_THREADS + sipRes = new PyItemBool(sipCpp->currentGroup(), a2->isNull() ? *a0 : *a2, a1); + sipCpp->addItem(sipRes, *a0); + Py_END_ALLOW_THREADS +%End + + ItemInt* addItemInt (const QString&, int = 0, const QString& = QString ::null ) [ItemInt* (const QString&, int&, int = 0, const QString& = QString ::null)]; +%MethodCode +//takes name | (QString) | defaultValue | (an int) | key | (QString = QString::null) + + class PyItemInt : public KConfigSkeleton::ItemInt + { + public: + PyItemInt(const QString &group, const QString &key, unsigned int defaultValue=0) : + KConfigSkeleton::ItemInt(group, key, this->value, defaultValue) {}; + + private: + int value; + }; + + Py_BEGIN_ALLOW_THREADS + sipRes = new PyItemInt(sipCpp->currentGroup(), a2->isNull() ? *a0 : *a2, a1); + sipCpp->addItem(sipRes, *a0); + Py_END_ALLOW_THREADS +%End + + ItemUInt* addItemUInt (const QString&, uint = 0, const QString& = QString ::null ) [ItemUInt* (const QString&, uint&, uint = 0, const QString& = QString ::null)]; +%MethodCode +//takes name | (QString) | defaultValue | (an unsigned int) | key | (QString = QString::null) + + class PyItemUInt : public KConfigSkeleton::ItemUInt + { + public: + PyItemUInt(const QString &group, const QString &key, unsigned int defaultValue=0) : + KConfigSkeleton::ItemUInt(group, key, this->value, defaultValue) {}; + + private: + uint value; + }; + + Py_BEGIN_ALLOW_THREADS + sipRes = new PyItemUInt(sipCpp->currentGroup(), a2->isNull() ? *a0 : *a2, a1); + sipCpp->addItem(sipRes, *a0); + Py_END_ALLOW_THREADS +%End + + ItemLong* addItemLong (const QString&, long = 0, const QString& = QString ::null ) [ItemLong* (const QString&, long&, long = 0, const QString& = QString ::null)]; +%MethodCode +//takes name | (QString) | defaultValue | (a long) | key | (QString = QString::null) + + class PyItemLong : public KConfigSkeleton::ItemLong + { + public: + PyItemLong(const QString &group, const QString &key, long defaultValue=0) : + KConfigSkeleton::ItemLong(group, key, this->value, defaultValue) {}; + + private: + long value; + }; + + Py_BEGIN_ALLOW_THREADS + sipRes = new PyItemLong(sipCpp->currentGroup(), a2->isNull() ? *a0 : *a2, a1); + sipCpp->addItem(sipRes, *a0); + Py_END_ALLOW_THREADS +%End + + ItemULong* addItemULong (const QString&, ulong = 0, const QString& = QString ::null ) [ItemULong* (const QString&, ulong&, ulong = 0, const QString& = QString ::null)]; +%MethodCode +//takes name | (QString) | defaultValue | (an unsigned long) | key | (QString = QString::null) + + class PyItemULong : public KConfigSkeleton::ItemULong + { + public: + PyItemULong(const QString &group, const QString &key, ulong defaultValue=0) : + KConfigSkeleton::ItemULong(group, key, this->value, defaultValue) {}; + + private: + ulong value; + }; + + Py_BEGIN_ALLOW_THREADS + sipRes = new PyItemULong(sipCpp->currentGroup(), a2->isNull() ? *a0 : *a2, a1); + sipCpp->addItem(sipRes, *a0); + Py_END_ALLOW_THREADS +%End + KConfigSkeleton::ItemInt64* addItemInt64 (const QString&, longlong = 0, const QString& = QString ::null ) [ItemInt64* (const QString&, longlong&, longlong = 0, const QString& = QString ::null)]; +%MethodCode +//takes name | (QString) | defaultValue | (a Q_INT64) | key | (QString = QString::null) + + class PyItemInt64 : public KConfigSkeleton::ItemInt64 + { + public: + PyItemInt64(const QString &group, const QString &key, Q_INT64 defaultValue=0) : + KConfigSkeleton::ItemInt64(group, key, this->value, defaultValue) {}; + + private: + Q_INT64 value; + }; + + Py_BEGIN_ALLOW_THREADS + sipRes = new PyItemInt64(sipCpp->currentGroup(), a2->isNull() ? *a0 : *a2, *a1); + sipCpp->addItem(sipRes, *a0); + Py_END_ALLOW_THREADS +%End + + KConfigSkeleton::ItemUInt64* addItemUInt64 (const QString&, ulonglong = 0, const QString& = QString ::null ) [ItemUInt64* (const QString&, ulonglong&, ulonglong = 0, const QString& = QString ::null)]; +%MethodCode +//takes name | (QString) | defaultValue | (a Q_UINT64) | key | (QString = QString::null) + + class PyItemUInt64 : public KConfigSkeleton::ItemUInt64 + { + public: + PyItemUInt64(const QString &group, const QString &key, Q_UINT64 defaultValue=0) : + KConfigSkeleton::ItemUInt64(group, key, this->value, defaultValue) {}; + + private: + Q_UINT64 value; + }; + + Py_BEGIN_ALLOW_THREADS + sipRes = new PyItemUInt64(sipCpp->currentGroup(), a2->isNull() ? *a0 : *a2, *a1); + sipCpp->addItem(sipRes, *a0); + Py_END_ALLOW_THREADS +%End + + ItemDouble* addItemDouble (const QString&, double = 0.0, const QString& = QString ::null ) [ItemDouble* (const QString&, double&, double = 0.0, const QString& = QString ::null)]; +%MethodCode +//takes name | (QString) | defaultValue | (a double) | key | (QString = QString::null) + + class PyItemDouble : public KConfigSkeleton::ItemDouble + { + public: + PyItemDouble(const QString &group, const QString &key, double defaultValue=0.0) : + KConfigSkeleton::ItemDouble(group, key, this->value, defaultValue) {}; + + private: + double value; + }; + + Py_BEGIN_ALLOW_THREADS + sipRes = new PyItemDouble(sipCpp->currentGroup(), a2->isNull() ? *a0 : *a2, a1); + sipCpp->addItem(sipRes, *a0); + Py_END_ALLOW_THREADS +%End ItemColor* addItemColor (const QString&, QColor&, const QColor& = QColor (128 ,128 ,128 ), const QString& = QString ::null ); ItemFont* addItemFont (const QString&, QFont&, const QFont& = KGlobalSettings ::generalFont (), const QString& = QString ::null ); ItemRect* addItemRect (const QString&, QRect&, const QRect& = QRect (), const QString& = QString ::null ); @@ -356,11 +506,22 @@ { public: - ItemBool (const QString&, const QString&, bool, bool = 1) [(const QString&, const QString&, bool&, bool = 1)]; + ItemBool (const QString&, const QString&, bool = 1) [(const QString&, const QString&, bool&, bool = 1)]; %MethodCode -//takes group | (QString) | key | (QString) | reference | (bool) | defaultValue | (bool = 1) +//takes group | (QString) | key | (QString) | defaultValue | (bool = 1) + + class PyItemBool : public KConfigSkeleton::ItemBool + { + public: + PyItemBool(const QString &group, const QString &key, bool defaultValue=false) : + KConfigSkeleton::ItemBool(group, key, this->value, defaultValue) {}; + + private: + bool value; + }; + Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemBool *) new KConfigSkeleton::ItemBool (*a0, *a1, a2, a3); + sipCpp = (sipKConfigSkeleton_ItemBool *) new PyItemBool (*a0, *a1, a2); Py_END_ALLOW_THREADS %End @@ -387,11 +548,22 @@ { public: - ItemInt (const QString&, const QString&, int, int = 0) [(const QString&, const QString&, int&, int = 0)]; + ItemInt (const QString&, const QString&, int = 0) [(const QString&, const QString&, int&, int = 0)]; %MethodCode -//takes group | (QString) | key | (QString) | reference | (int) | defaultValue | (int = 0) +//takes group | (QString) | key | (QString) | defaultValue | (int = 0) + + class PyItemInt : public KConfigSkeleton::ItemInt + { + public: + PyItemInt(const QString &group, const QString &key, unsigned int defaultValue=0) : + KConfigSkeleton::ItemInt(group, key, this->value, defaultValue) {}; + + private: + int value; + }; + Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemInt *) new KConfigSkeleton::ItemInt (*a0, *a1, a2, (int)a3); + sipCpp = (sipKConfigSkeleton_ItemInt *) new PyItemInt (*a0, *a1, a2); Py_END_ALLOW_THREADS %End @@ -422,7 +594,25 @@ { public: - ItemInt64 (const QString&, const QString&, longlong&, longlong = 0); + ItemInt64 (const QString&, const QString&, longlong = 0) [(const QString&, const QString&, longlong&, longlong = 0)]; +%MethodCode +//takes group | (QString) | key | (QString) | defaultValue | (longlong = 0) + + class PyItemInt64 : public KConfigSkeleton::ItemInt64 + { + public: + PyItemInt64(const QString &group, const QString &key, Q_INT64 defaultValue=0) : + KConfigSkeleton::ItemInt64(group, key, this->value, defaultValue) {}; + + private: + Q_INT64 value; + }; + + Py_BEGIN_ALLOW_THREADS + sipCpp = (sipKConfigSkeleton_ItemInt64 *) new PyItemInt64 (*a0, *a1, *a2); + Py_END_ALLOW_THREADS +%End + void setValue (const longlong&); longlong& value (); virtual void setDefaultValue (const longlong&); @@ -450,11 +640,22 @@ { public: - ItemUInt (const QString&, const QString&, uint, uint = 0) [(const QString&, const QString&, uint&, uint = 0)]; + ItemUInt (const QString&, const QString&, uint = 0) [(const QString&, const QString&, uint, uint = 0)]; %MethodCode -//takes group | (QString) | key | (QString) | reference | (uint) | defaultValue | (uint = 0) +//takes group | (QString) | key | (QString) | defaultValue | (uint = 0) + + class PyItemUInt : public KConfigSkeleton::ItemUInt + { + public: + PyItemUInt(const QString &group, const QString &key, unsigned int defaultValue=0) : + KConfigSkeleton::ItemUInt(group, key, this->value, defaultValue) {}; + + private: + uint value; + }; + Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemUInt *) new KConfigSkeleton::ItemUInt (*a0, *a1, a2, a3); + sipCpp = (sipKConfigSkeleton_ItemUInt *) new PyItemUInt (*a0, *a1, a2); Py_END_ALLOW_THREADS %End @@ -485,11 +686,22 @@ { public: - ItemLong (const QString&, const QString&, long&, long = 0) [(const QString&, const QString&, long&, long = 0)]; + ItemLong (const QString&, const QString&, long = 0) [(const QString&, const QString&, long&, long = 0)]; %MethodCode -//takes group | (QString) | key | (QString) | reference | (long) | defaultValue | (long = 0) +//takes group | (QString) | key | (QString) | defaultValue | (long = 0) + + class PyItemLong : public KConfigSkeleton::ItemLong + { + public: + PyItemLong(const QString &group, const QString &key, long defaultValue=0) : + KConfigSkeleton::ItemLong(group, key, this->value, defaultValue) {}; + + private: + long value; + }; + Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemLong *) new KConfigSkeleton::ItemLong (*a0, *a1, a2, a3); + sipCpp = (sipKConfigSkeleton_ItemLong *) new PyItemLong (*a0, *a1, a2); Py_END_ALLOW_THREADS %End @@ -520,11 +732,22 @@ { public: - ItemULong (const QString&, const QString&, ulong, ulong = 0) [(const QString&, const QString&, ulong&, ulong = 0)]; + ItemULong (const QString&, const QString&, ulong = 0) [(const QString&, const QString&, ulong&, ulong = 0)]; %MethodCode -//takes group | (QString) | key | (QString) | reference | (ulong) | defaultValue | (ulong = 0) +//takes group | (QString) | key | (QString) | defaultValue | (ulong = 0) + + class PyItemULong : public KConfigSkeleton::ItemULong + { + public: + PyItemULong(const QString &group, const QString &key, ulong defaultValue=0) : + KConfigSkeleton::ItemULong(group, key, this->value, defaultValue) {}; + + private: + ulong value; + }; + Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemULong *) new KConfigSkeleton::ItemULong (*a0, *a1, a2, a3); + sipCpp = (sipKConfigSkeleton_ItemULong *) new PyItemULong (*a0, *a1, a2); Py_END_ALLOW_THREADS %End @@ -555,7 +778,25 @@ { public: - ItemUInt64 (const QString&, const QString&, ulonglong&, ulonglong = 0); + ItemUInt64 (const QString&, const QString&, ulonglong = 0) [(const QString&, const QString&, ulonglong&, ulonglong = 0)]; +%MethodCode +//takes group | (QString) | key | (QString) | defaultValue | (ulonglong = 0) + + class PyItemUInt64 : public KConfigSkeleton::ItemUInt64 + { + public: + PyItemUInt64(const QString &group, const QString &key, Q_UINT64 defaultValue=0) : + KConfigSkeleton::ItemUInt64(group, key, this->value, defaultValue) {}; + + private: + Q_UINT64 value; + }; + + Py_BEGIN_ALLOW_THREADS + sipCpp = (sipKConfigSkeleton_ItemUInt64 *) new PyItemUInt64 (*a0, *a1, *a2); + Py_END_ALLOW_THREADS +%End + void setValue (const ulonglong&); ulonglong value (); virtual void setDefaultValue (const ulonglong&); @@ -583,12 +824,23 @@ { public: - ItemDouble (const QString&, const QString&, double, double = 0) [(const QString&, const QString&, double&, double = 0)]; + ItemDouble (const QString&, const QString&, double = 0) [(const QString&, const QString&, double&, double = 0)]; %MethodCode -//takes group | (QString) | key | (QString) | reference | (doulbe) | defaultValue | (double = 0) +//takes group | (QString) | key | (QString) | defaultValue | (double = 0) + + class PyItemDouble : public KConfigSkeleton::ItemDouble + { + public: + PyItemDouble(const QString &group, const QString &key, double defaultValue=0.0) : + KConfigSkeleton::ItemDouble(group, key, this->value, defaultValue) {}; + + private: + double value; + }; + Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemDouble *) new KConfigSkeleton::ItemDouble (*a0, *a1, a2, a3); + sipCpp = (sipKConfigSkeleton_ItemDouble *) new PyItemDouble (*a0, *a1, a2); Py_END_ALLOW_THREADS %End