summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2013-03-31 03:20:28 +0200
committerSlávek Banko <[email protected]>2013-03-31 03:20:28 +0200
commit4dd3555f4b1ba66f692a36ac05c8e8ccd5e4eec0 (patch)
tree5e6d7c940f5f6c1d1649ada0f0807b8bfc931501
parent4ce840182d803dde742908b6ab3d7bbcf56823c6 (diff)
downloadpytqt-4dd3555f4b1ba66f692a36ac05c8e8ccd5e4eec0.tar.gz
pytqt-4dd3555f4b1ba66f692a36ac05c8e8ccd5e4eec0.zip
Fix "ANY" macro deprecation
-rw-r--r--sip/qt/qdatastream.sip2
-rw-r--r--sip/qt/qfile.sip12
-rw-r--r--sip/qt/qfontmetrics.sip10
-rw-r--r--sip/qt/qimage.sip4
-rw-r--r--sip/qt/qiodevice.sip16
-rw-r--r--sip/qt/qpainter.sip4
-rw-r--r--sip/qt/qpixmap.sip4
-rw-r--r--sip/qt/qpointarray.sip8
-rw-r--r--sip/qtnetwork/qftp.sip2
-rw-r--r--sip/qtnetwork/qhttp.sip2
-rw-r--r--sip/qtnetwork/qsocket.sip16
-rw-r--r--sip/qtnetwork/qsocketdevice.sip4
12 files changed, 42 insertions, 42 deletions
diff --git a/sip/qt/qdatastream.sip b/sip/qt/qdatastream.sip
index 003ba8c..2c988d6 100644
--- a/sip/qt/qdatastream.sip
+++ b/sip/qt/qdatastream.sip
@@ -126,7 +126,7 @@ public:
sipRes = sipBuildResult(&sipIsErr,"(Sa)",sipSelf,buf,a0);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
}
%End
diff --git a/sip/qt/qfile.sip b/sip/qt/qfile.sip
index 7f57ce6..f11da7f 100644
--- a/sip/qt/qfile.sip
+++ b/sip/qt/qfile.sip
@@ -170,7 +170,7 @@ public:
else if ((sipRes = PyString_FromStringAndSize(buf,actlen)) == NULL)
sipIsErr = 1;
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
}
%End
@@ -199,7 +199,7 @@ public:
else if ((sipRes = PyString_FromStringAndSize(buf,actlen)) == NULL)
sipIsErr = 1;
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
}
%End
@@ -231,7 +231,7 @@ public:
if (actlen < 0)
{
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
Py_INCREF(Py_None);
sipRes = Py_None;
@@ -240,7 +240,7 @@ public:
{
sipRes = PyString_FromStringAndSize(buf,actlen);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
if (sipRes == NULL)
sipIsErr = 1;
@@ -265,7 +265,7 @@ public:
if (actlen < 0)
{
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
Py_INCREF(Py_None);
sipRes = Py_None;
@@ -274,7 +274,7 @@ public:
{
sipRes = PyString_FromStringAndSize(buf,actlen);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
if (sipRes == NULL)
sipIsErr = 1;
diff --git a/sip/qt/qfontmetrics.sip b/sip/qt/qfontmetrics.sip
index 28f89a1..294aedb 100644
--- a/sip/qt/qfontmetrics.sip
+++ b/sip/qt/qfontmetrics.sip
@@ -97,7 +97,7 @@ public:
Py_END_ALLOW_THREADS
if (tabarray)
- sipFree((ANY *)tabarray);
+ sipFree((void *)tabarray);
}
%End
@@ -115,7 +115,7 @@ public:
Py_END_ALLOW_THREADS
if (tabarray)
- sipFree((ANY *)tabarray);
+ sipFree((void *)tabarray);
}
%End
%End
@@ -145,7 +145,7 @@ public:
Py_END_ALLOW_THREADS
if (tabarray)
- sipFree((ANY *)tabarray);
+ sipFree((void *)tabarray);
}
%End
@@ -163,7 +163,7 @@ public:
Py_END_ALLOW_THREADS
if (tabarray)
- sipFree((ANY *)tabarray);
+ sipFree((void *)tabarray);
}
%End
%End
@@ -205,7 +205,7 @@ static int intListToArray(PyObject *pl,int **ap)
if (PyErr_Occurred())
{
- sipFree((ANY *)*ap);
+ sipFree((void *)*ap);
return -1;
}
}
diff --git a/sip/qt/qimage.sip b/sip/qt/qimage.sip
index e0d99ed..dc2c85a 100644
--- a/sip/qt/qimage.sip
+++ b/sip/qt/qimage.sip
@@ -173,7 +173,7 @@ public:
sipCpp = new TQImage(str);
Py_END_ALLOW_THREADS
- sipFree((ANY *)str);
+ sipFree((void *)str);
}
%End
@@ -532,7 +532,7 @@ const char **PyTQt_qt_ListToArray(PyObject *lst)
if ((s = PyString_AsString(PyList_GetItem(lst,i))) == NULL)
{
- sipFree((ANY *)str);
+ sipFree((void *)str);
return NULL;
}
diff --git a/sip/qt/qiodevice.sip b/sip/qt/qiodevice.sip
index 232cd94..2f1f491 100644
--- a/sip/qt/qiodevice.sip
+++ b/sip/qt/qiodevice.sip
@@ -144,7 +144,7 @@ public:
if (actlen < 0)
{
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
Py_INCREF(Py_None);
sipRes = Py_None;
@@ -153,7 +153,7 @@ public:
{
sipRes = PyString_FromStringAndSize(buf,actlen);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
if (sipRes == NULL)
sipIsErr = 1;
@@ -204,7 +204,7 @@ public:
if (actlen < 0)
{
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
Py_INCREF(Py_None);
sipRes = Py_None;
@@ -213,7 +213,7 @@ public:
{
sipRes = PyString_FromStringAndSize(buf,actlen);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
if (sipRes == NULL)
sipIsErr = 1;
@@ -274,7 +274,7 @@ public:
if (actlen < 0)
{
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
Py_INCREF(Py_None);
sipRes = Py_None;
@@ -283,7 +283,7 @@ public:
{
sipRes = PyString_FromStringAndSize(buf,actlen);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
if (sipRes == NULL)
sipIsErr = 1;
@@ -334,7 +334,7 @@ public:
if (actlen < 0)
{
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
Py_INCREF(Py_None);
sipRes = Py_None;
@@ -343,7 +343,7 @@ public:
{
sipRes = PyString_FromStringAndSize(buf,actlen);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
if (sipRes == NULL)
sipIsErr = 1;
diff --git a/sip/qt/qpainter.sip b/sip/qt/qpainter.sip
index b959e2a..e325520 100644
--- a/sip/qt/qpainter.sip
+++ b/sip/qt/qpainter.sip
@@ -324,7 +324,7 @@ public:
if (PyErr_Occurred() != NULL)
{
- sipFree((ANY *)tabs);
+ sipFree((void *)tabs);
sipIsErr = 1;
break;
}
@@ -647,7 +647,7 @@ public:
if (PyErr_Occurred() != NULL)
{
- sipFree((ANY *)tabs);
+ sipFree((void *)tabs);
sipIsErr = 1;
break;
}
diff --git a/sip/qt/qpixmap.sip b/sip/qt/qpixmap.sip
index a84b673..ce409fd 100644
--- a/sip/qt/qpixmap.sip
+++ b/sip/qt/qpixmap.sip
@@ -93,7 +93,7 @@ public:
sipCpp = new sipTQPixmap(str);
Py_END_ALLOW_THREADS
- sipFree((ANY *)str);
+ sipFree((void *)str);
}
%End
@@ -200,7 +200,7 @@ public:
sipCpp = new sipTQPixmap(str);
Py_END_ALLOW_THREADS
- sipFree((ANY *)str);
+ sipFree((void *)str);
}
%End
diff --git a/sip/qt/qpointarray.sip b/sip/qt/qpointarray.sip
index dcffb19..959963a 100644
--- a/sip/qt/qpointarray.sip
+++ b/sip/qt/qpointarray.sip
@@ -113,7 +113,7 @@ static TQCOORD *getPoints(int nrpnts,PyObject *pntlist)
if (PyErr_Occurred() != NULL)
{
- sipFree((ANY *)pnts);
+ sipFree((void *)pnts);
return NULL;
}
}
@@ -147,7 +147,7 @@ public:
sipCpp = new TQPointArray(nrpnts / 2,pnts);
Py_END_ALLOW_THREADS
- sipFree((ANY *)pnts);
+ sipFree((void *)pnts);
}
%End
@@ -177,7 +177,7 @@ public:
sipRes = sipCpp -> setPoints(nrpnts / 2,pnts);
Py_END_ALLOW_THREADS
- sipFree((ANY *)pnts);
+ sipFree((void *)pnts);
}
%End
@@ -198,7 +198,7 @@ public:
sipRes = sipCpp -> putPoints(a0,nrpnts / 2,pnts);
Py_END_ALLOW_THREADS
- sipFree((ANY *)pnts);
+ sipFree((void *)pnts);
}
%End
diff --git a/sip/qtnetwork/qftp.sip b/sip/qtnetwork/qftp.sip
index 14dc455..f3f053e 100644
--- a/sip/qtnetwork/qftp.sip
+++ b/sip/qtnetwork/qftp.sip
@@ -133,7 +133,7 @@ public:
else if ((sipRes = PyString_FromStringAndSize(buf,actlen)) == NULL)
sipIsErr = 1;
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
}
%End
diff --git a/sip/qtnetwork/qhttp.sip b/sip/qtnetwork/qhttp.sip
index ba3a251..8fbeae7 100644
--- a/sip/qtnetwork/qhttp.sip
+++ b/sip/qtnetwork/qhttp.sip
@@ -229,7 +229,7 @@ public:
else if ((sipRes = PyString_FromStringAndSize(buf,actlen)) == NULL)
sipIsErr = 1;
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
}
%End
diff --git a/sip/qtnetwork/qsocket.sip b/sip/qtnetwork/qsocket.sip
index 17dcd87..077443e 100644
--- a/sip/qtnetwork/qsocket.sip
+++ b/sip/qtnetwork/qsocket.sip
@@ -187,7 +187,7 @@ public:
if (actlen < 0)
{
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
Py_INCREF(Py_None);
sipRes = Py_None;
@@ -196,7 +196,7 @@ public:
{
sipRes = PyString_FromStringAndSize(buf,actlen);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
if (sipRes == NULL)
sipIsErr = 1;
@@ -222,7 +222,7 @@ public:
if (actlen < 0)
{
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
Py_INCREF(Py_None);
sipRes = Py_None;
@@ -231,7 +231,7 @@ public:
{
sipRes = PyString_FromStringAndSize(buf,actlen);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
if (sipRes == NULL)
sipIsErr = 1;
@@ -256,7 +256,7 @@ public:
if (actlen < 0)
{
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
Py_INCREF(Py_None);
sipRes = Py_None;
@@ -265,7 +265,7 @@ public:
{
sipRes = PyString_FromStringAndSize(buf,actlen);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
if (sipRes == NULL)
sipIsErr = 1;
@@ -292,7 +292,7 @@ public:
if (actlen < 0)
{
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
Py_INCREF(Py_None);
sipRes = Py_None;
@@ -301,7 +301,7 @@ public:
{
sipRes = PyString_FromStringAndSize(buf,actlen);
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
if (sipRes == NULL)
sipIsErr = 1;
diff --git a/sip/qtnetwork/qsocketdevice.sip b/sip/qtnetwork/qsocketdevice.sip
index c74b3f8..41da2f5 100644
--- a/sip/qtnetwork/qsocketdevice.sip
+++ b/sip/qtnetwork/qsocketdevice.sip
@@ -148,7 +148,7 @@ public:
else if ((sipRes = PyString_FromStringAndSize(buf,actlen)) == NULL)
sipIsErr = 1;
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
}
%End
@@ -179,7 +179,7 @@ public:
else if ((sipRes = PyString_FromStringAndSize(buf,actlen)) == NULL)
sipIsErr = 1;
- sipFree((ANY *)buf);
+ sipFree((void *)buf);
}
%End