--- python/pykde/sip/kdecore/bytearray.sip.py25 2006-12-12 19:53:16.000000000 -0500
+++ python/pykde/sip/kdecore/bytearray.sip 2006-12-12 19:54:46.000000000 -0500
@@ -620,7 +620,7 @@
QMap<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>;
PyObject *aelem, *belem;
- int pos = 0;
+ ssize_t pos = 0;
QCString *acpp;
DCOPRef *bcpp;
@@ -705,7 +705,7 @@
QMap<QString,DCOPRef> *cppmap = new QMap<QString,DCOPRef>;
PyObject *aelem, *belem;
- int pos = 0;
+ ssize_t pos = 0;
QString *acpp;
DCOPRef *bcpp;
--- python/pykde/sip/kdecore/kaccel.sip.py25 2006-12-12 19:55:33.000000000 -0500
+++ python/pykde/sip/kdecore/kaccel.sip 2006-12-12 19:56:15.000000000 -0500
@@ -209,7 +209,7 @@
QMap<int,QString> *map = new QMap<int,QString>;
PyObject *key, *value;
- int pos = 0;
+ ssize_t pos = 0;
int iKey;
QString *sData;
--- python/pykde/sip/kdecore/kcompletion.sip.py25 2006-12-12 19:56:46.000000000 -0500
+++ python/pykde/sip/kdecore/kcompletion.sip 2006-12-12 19:57:05.000000000 -0500
@@ -201,7 +201,7 @@
QMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new QMap<KCompletionBase::KeyBindingType,KShortcut>;
PyObject *key, *value;
- int pos = 0;
+ ssize_t pos = 0;
KShortcut *cValue;
int iserr;
--- python/pykde/sip/kdecore/kconfig.sip.py25 2006-12-12 19:57:54.000000000 -0500
+++ python/pykde/sip/kdecore/kconfig.sip 2006-12-12 19:58:16.000000000 -0500
@@ -158,7 +158,7 @@
QMap<QString,QString> *cppmap = new QMap<QString,QString>;
PyObject *aelem, *belem;
- int pos = 0;
+ ssize_t pos = 0;
QString *acpp;
QString *bcpp;
--- python/pykde/sip/kdecore/kconfigdata.sip.py25 2006-12-12 20:00:03.000000000 -0500
+++ python/pykde/sip/kdecore/kconfigdata.sip 2006-12-12 20:00:21.000000000 -0500
@@ -141,7 +141,7 @@
QMap<KEntryKey,KEntry> *cppmap = new QMap<KEntryKey,KEntry>;
PyObject *aelem, *belem;
- int pos = 0;
+ ssize_t pos = 0;
KEntryKey *acpp;
KEntry *bcpp;
--- python/pykde/sip/kdecore/kmacroexpander.sip.py25 2006-12-12 20:01:32.000000000 -0500
+++ python/pykde/sip/kdecore/kmacroexpander.sip 2006-12-12 20:02:18.000000000 -0500
@@ -169,7 +169,7 @@
QMap<QChar,QString> *map = new QMap<QChar,QString>;
PyObject *key, *value;
- int pos = 0;
+ ssize_t pos = 0;
QChar *cKey;
QString *sData;
@@ -255,7 +255,7 @@
QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
PyObject *key, *value;
- int pos = 0;
+ ssize_t pos = 0;
QString *sKey;
QStringList *slData;
@@ -343,7 +343,7 @@
QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
PyObject *key, *value;
- int pos = 0;
+ ssize_t pos = 0;
QChar *cKey;
QStringList *slData;
--- python/pykde/sip/kdecore/kurl.sip.py25 2006-12-12 20:03:14.000000000 -0500
+++ python/pykde/sip/kdecore/kurl.sip 2006-12-12 20:07:50.000000000 -0500
@@ -234,7 +234,7 @@
void __setitem__ (int, const KURL&);
%MethodCode
//takes index | (int) | value | (KURL)
- int len;
+ ssize_t len;
len = sipCpp -> count();
@@ -248,7 +248,7 @@
%MethodCode
//takes range | (a Python slice) | urlList | (KURL.List)
- int len, start, stop, step, slicelength;
+ ssize_t len, start, stop, step, slicelength;
len = sipCpp -> count();
@@ -278,7 +278,7 @@
void __delitem__ (int);
%MethodCode
//takes index | (int)
- int len;
+ ssize_t len;
len = sipCpp -> count();
@@ -291,7 +291,7 @@
void __delitem__ (SIP_PYSLICE);
%MethodCode
//takes range | (a Python slice)
- int len, start, stop, step, slicelength;
+ ssize_t len, start, stop, step, slicelength;
len = sipCpp -> count();
if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
@@ -308,7 +308,7 @@
%MethodCode
//returns (KURL)
//takes index | (int)
- int len;
+ ssize_t len;
len = sipCpp -> count();
@@ -322,7 +322,7 @@
%MethodCode
//returns (KURL.List)
//takes range | (a Python slice)
- int len, start, stop, step, slicelength;
+ ssize_t len, start, stop, step, slicelength;
len = sipCpp -> count();
--- python/pykde/sip/kdeui/kkeydialog.sip.py25 2006-12-12 20:09:03.000000000 -0500
+++ python/pykde/sip/kdeui/kkeydialog.sip 2006-12-12 20:09:41.000000000 -0500
@@ -231,7 +231,7 @@
QDict<int>* qdict = new QDict<int>;
PyObject *key, *value;
- int pos = 0;
+ ssize_t pos = 0;
QString *a0;
int a1;
--- python/pykde/sip/kio/authinfo.sip.py25 2006-12-12 20:10:05.000000000 -0500
+++ python/pykde/sip/kio/authinfo.sip 2006-12-12 20:10:44.000000000 -0500
@@ -176,7 +176,7 @@
QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
PyObject *key, *value;
- int pos = 0;
+ ssize_t pos = 0;
QString *sKey;
QStringList *sData;
--- python/pykde/sip/kio/global.sip.py25 2006-12-12 20:11:34.000000000 -0500
+++ python/pykde/sip/kio/global.sip 2006-12-12 20:11:54.000000000 -0500
@@ -675,7 +675,7 @@
QMap<QString,QString> *cppmap = new QMap<QString,QString>;
PyObject *aelem, *belem;
- int pos = 0;
+ ssize_t pos = 0;
QString *acpp;
QString *bcpp;
--- python/pykde/sip/kio/kservicetype.sip.py25 2006-12-12 20:12:20.000000000 -0500
+++ python/pykde/sip/kio/kservicetype.sip 2006-12-12 20:12:33.000000000 -0500
@@ -184,7 +184,7 @@
QMap<QString,QVariant::Type> *cppmap = new QMap<QString,QVariant::Type>;
PyObject *aelem, *belem;
- int pos = 0;
+ ssize_t pos = 0;
QString *acpp;
QVariant::Type bcpp;
--- python/pykde/sip/kmdi/kmdichildfrm.sip.py25 2006-12-12 20:13:28.000000000 -0500
+++ python/pykde/sip/kmdi/kmdichildfrm.sip 2006-12-12 20:13:50.000000000 -0500
@@ -245,7 +245,7 @@
QDict<QWidget::FocusPolicy>* qdict = new QDict<QWidget::FocusPolicy>;
PyObject *key, *value;
- int pos = 0;
+ ssize_t pos = 0;
QString *a0;
QWidget::FocusPolicy a1;
--- python/pykde/sip/kparts/browserextension.sip.py25 2006-12-12 20:14:15.000000000 -0500
+++ python/pykde/sip/kparts/browserextension.sip 2006-12-12 20:14:49.000000000 -0500
@@ -404,7 +404,7 @@
QMap<QCString,QCString> *cppmap = new QMap<QCString,QCString>;
PyObject *aelem, *belem;
- int pos = 0;
+ ssize_t pos = 0;
QCString *acpp;
QCString *bcpp;
@@ -487,7 +487,7 @@
QMap<QCString,int> *cppmap = new QMap<QCString,int>;
PyObject *aelem, *belem;
- int pos = 0;
+ ssize_t pos = 0;
QCString *acpp;
int bcpp;
--- python/pyqt/sip/qt/qdir.sip.py25 2006-12-12 20:15:33.000000000 -0500
+++ python/pyqt/sip/qt/qdir.sip 2006-12-12 20:16:03.000000000 -0500
@@ -238,7 +238,7 @@
QString operator[](int) const;
%MethodCode
- int len;
+ ssize_t len;
Py_BEGIN_ALLOW_THREADS
len = sipCpp -> count();
@@ -256,7 +256,7 @@
QStringList operator[](SIP_PYSLICE) const;
%MethodCode
- int len, start, stop, step, slicelength;
+ ssize_t len, start, stop, step, slicelength;
Py_BEGIN_ALLOW_THREADS
len = sipCpp -> count();
--- python/pyqt/sip/qt/qstringlist.sip.py25 2006-12-12 20:16:36.000000000 -0500
+++ python/pyqt/sip/qt/qstringlist.sip 2006-12-12 20:17:18.000000000 -0500
@@ -99,7 +99,7 @@
void __setitem__(int,const QString &);
%MethodCode
- int len;
+ ssize_t len;
len = sipCpp -> count();
@@ -111,7 +111,7 @@
void __setitem__(SIP_PYSLICE,const QStringList &);
%MethodCode
- int len, start, stop, step, slicelength;
+ ssize_t len, start, stop, step, slicelength;
len = sipCpp -> count();
@@ -142,7 +142,7 @@
void __delitem__(int);
%MethodCode
- int len;
+ ssize_t len;
len = sipCpp -> count();
@@ -154,7 +154,7 @@
void __delitem__(SIP_PYSLICE);
%MethodCode
- int len, start, stop, step, slicelength;
+ ssize_t len, start, stop, step, slicelength;
len = sipCpp -> count();
@@ -170,7 +170,7 @@
QString operator[](int);
%MethodCode
- int len;
+ ssize_t len;
len = sipCpp -> count();
@@ -182,7 +182,7 @@
QStringList operator[](SIP_PYSLICE);
%MethodCode
- int len, start, stop, step, slicelength;
+ ssize_t len, start, stop, step, slicelength;
len = sipCpp -> count();
--- python/sip/sipgen/gencode.c.py25 2006-12-12 20:17:56.000000000 -0500
+++ python/sip/sipgen/gencode.c 2006-12-12 20:18:47.000000000 -0500
@@ -3053,7 +3053,7 @@
" return Py_NotImplemented;\n"
" }\n"
"\n"
- ,classFQCName(cd));
+ ,classFQCName(cd),classFQCName(cd));
prcode(fp,
" %S *sipCpp = reinterpret_cast<%S *>(sipGetCppPtr((sipWrapper *)sipSelf,sipClass_%C));\n"
--- python/Makefile.am.py25 2006-12-12 20:29:38.000000000 -0500
+++ python/Makefile.am 2006-12-12 20:30:13.000000000 -0500
@@ -26,7 +26,7 @@
cd $(srcdir)/sip ; \
export QTDIR=${qt_dir} ; \
export PYTHONPATH=$$builddir/sip:$$PYTHONPATH ; \
- @PYTHON@ configure.py -b @bindir@ -d ${site_packages} -e ${python_inc_dir} -l qt-mt -v ${sip_dir} -t "$$builddir/sip" INCDIR_QT=@qt_includes@
+ @PYTHON@ configure.py -b @bindir@ -d ${site_packages} -e ${python_inc_dir} -l qt-mt -v ${sip_dir} -t "$$builddir/sip" INCDIR_QT=@qt_includes@ CXXFLAGS_WARN_OFF='' CFLAGS_WARN_OFF=''
@(cd sip ; $(MAKE))
echo "" > sipdone
--- dcoppython/shell/marshaller.cpp-- 2006-12-13 08:52:02.000000000 +0100
+++ dcoppython/shell/marshaller.cpp 2006-12-13 08:52:16.000000000 +0100
@@ -124,7 +124,7 @@
if (!PyDict_Check(obj)) return false;
- int c=0;
+ ssize_t c=0;
PyObject *key, *val;
while (PyDict_Next(obj, &c, &key, &val)==1)
if (!key_type.isMarshallable(key) ||
--- python/pyqt/sip/qt/qstring.sip-- 2006-12-13 09:17:54.000000000 +0100
+++ python/pyqt/sip/qt/qstring.sip 2006-12-13 09:18:07.000000000 +0100
@@ -746,7 +746,7 @@
QString operator[](SIP_PYSLICE) const;
%MethodCode
- int len, start, stop, step, slicelength;
+ ssize_t len, start, stop, step, slicelength;
len = sipCpp -> length();
