diff -Nur qgis-1.3.0.old/python/core/conversions.sip qgis-1.3.0/python/core/conversions.sip --- qgis-1.3.0.old/python/core/conversions.sip 2009-05-14 18:58:24.000000000 +0300 +++ qgis-1.3.0/python/core/conversions.sip 2009-10-21 14:15:48.116292334 +0300 @@ -28,6 +28,10 @@ { %TypeHeaderCode #include +#if (SIP_VERSION >= 0x040900) +#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) +#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +#endif %End %ConvertFromTypeCode @@ -104,6 +108,10 @@ { %TypeHeaderCode #include +#if (SIP_VERSION >= 0x040900) +#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) +#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +#endif %End %ConvertFromTypeCode @@ -179,6 +187,10 @@ { %TypeHeaderCode #include +#if (SIP_VERSION >= 0x040900) +#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) +#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +#endif %End %ConvertFromTypeCode @@ -229,6 +241,10 @@ { %TypeHeaderCode #include +#if (SIP_VERSION >= 0x040900) +#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) +#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +#endif %End %ConvertFromTypeCode @@ -301,6 +317,10 @@ { %TypeHeaderCode #include +#if (SIP_VERSION >= 0x040900) +#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) +#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +#endif %End %ConvertFromTypeCode @@ -418,6 +438,10 @@ { %TypeHeaderCode #include +#if (SIP_VERSION >= 0x040900) +#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) +#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +#endif %End %ConvertFromTypeCode @@ -518,7 +542,11 @@ %MappedType QMap { %TypeHeaderCode -#include +#include +#if (SIP_VERSION >= 0x040900) +#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) +#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +#endif %End %ConvertFromTypeCode @@ -626,6 +654,10 @@ { %TypeHeaderCode #include +#if (SIP_VERSION >= 0x040900) +#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) +#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +#endif %End %ConvertFromTypeCode @@ -744,6 +776,10 @@ { %TypeHeaderCode #include +#if (SIP_VERSION >= 0x040900) +#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) +#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +#endif %End %ConvertFromTypeCode