Browse Source

Fix "ANY" macro deprecation

tags/r14.0.0
Slávek Banko 7 years ago
parent
commit
4dd3555f4b
12 changed files with 42 additions and 42 deletions
  1. +1
    -1
      sip/qt/qdatastream.sip
  2. +6
    -6
      sip/qt/qfile.sip
  3. +5
    -5
      sip/qt/qfontmetrics.sip
  4. +2
    -2
      sip/qt/qimage.sip
  5. +8
    -8
      sip/qt/qiodevice.sip
  6. +2
    -2
      sip/qt/qpainter.sip
  7. +2
    -2
      sip/qt/qpixmap.sip
  8. +4
    -4
      sip/qt/qpointarray.sip
  9. +1
    -1
      sip/qtnetwork/qftp.sip
  10. +1
    -1
      sip/qtnetwork/qhttp.sip
  11. +8
    -8
      sip/qtnetwork/qsocket.sip
  12. +2
    -2
      sip/qtnetwork/qsocketdevice.sip

+ 1
- 1
sip/qt/qdatastream.sip View File

@@ -126,7 +126,7 @@ public:

sipRes = sipBuildResult(&sipIsErr,"(Sa)",sipSelf,buf,a0);
sipFree((ANY *)buf);
sipFree((void *)buf);
}
%End



+ 6
- 6
sip/qt/qfile.sip View File

@@ -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;


+ 5
- 5
sip/qt/qfontmetrics.sip View File

@@ -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;
}
}


+ 2
- 2
sip/qt/qimage.sip View File

@@ -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;
}



+ 8
- 8
sip/qt/qiodevice.sip View File

@@ -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;


+ 2
- 2
sip/qt/qpainter.sip View File

@@ -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;
}


+ 2
- 2
sip/qt/qpixmap.sip View File

@@ -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



+ 4
- 4
sip/qt/qpointarray.sip View File

@@ -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



+ 1
- 1
sip/qtnetwork/qftp.sip View File

@@ -133,7 +133,7 @@ public:
else if ((sipRes = PyString_FromStringAndSize(buf,actlen)) == NULL)
sipIsErr = 1;

sipFree((ANY *)buf);
sipFree((void *)buf);
}
%End



+ 1
- 1
sip/qtnetwork/qhttp.sip View File

@@ -229,7 +229,7 @@ public:
else if ((sipRes = PyString_FromStringAndSize(buf,actlen)) == NULL)
sipIsErr = 1;

sipFree((ANY *)buf);
sipFree((void *)buf);
}
%End



+ 8
- 8
sip/qtnetwork/qsocket.sip View File

@@ -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;


+ 2
- 2
sip/qtnetwork/qsocketdevice.sip View File

@@ -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



Loading…
Cancel
Save