By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Partyial patch to build python-tqt with recent TQ fixes

python-tqt-TQ-fixes.diff (text/plain), 20.18 KB, created by Darrell on 2012-06-18 19:50:07 CDT

(hide)

Description: Partyial patch to build python-tqt with recent TQ fixes

Filename:

MIME Type:

Creator: Darrell

Created: 2012-06-18 19:50:07 CDT

Size: 20.18 KB

patch

obsolete

>diff -urN python-tqt/doc/PyQt.html python-tqt.new/doc/PyQt.html >--- python-tqt/doc/PyQt.html 2012-05-27 17:58:01.000000000 -0500 >+++ python-tqt.new/doc/PyQt.html 2012-06-18 16:58:49.000000000 -0500 >@@ -3813,7 +3813,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG readBlock</CODE >+>TQ_LONG readBlock</CODE > >(char *data, Q_ULONG len);<P > ></P > ></DIV >@@ -3839,7 +3839,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG readLine</CODE >+>TQ_LONG readLine</CODE > >(char *data, Q_ULONG maxlen);<P > ></P > ></DIV >@@ -3895,7 +3895,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG writeBlock</CODE >+>TQ_LONG writeBlock</CODE > >(const char *data, Q_ULONG len);<P > ></P > ></DIV >@@ -5416,7 +5416,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG toLong</CODE >+>TQ_LONG toLong</CODE > >(bool *ok = 0);<P > ></P > ></DIV >@@ -11069,7 +11069,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG readBlock</CODE >+>TQ_LONG readBlock</CODE > >(char *data, Q_ULONG maxlen);<P > ></P > ></DIV >@@ -11173,7 +11173,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG readBlock</CODE >+>TQ_LONG readBlock</CODE > >(char *data, Q_ULONG maxlen);<P > ></P > ></DIV >@@ -11278,7 +11278,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG readBlock</CODE >+>TQ_LONG readBlock</CODE > >(char *data, Q_ULONG len);<P > ></P > ></DIV >@@ -11304,7 +11304,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG readLine</CODE >+>TQ_LONG readLine</CODE > >(char *data, Q_ULONG maxlen);<P > ></P > ></DIV >@@ -11330,7 +11330,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG writeBlock</CODE >+>TQ_LONG writeBlock</CODE > >(const char *data, Q_ULONG len);<P > ></P > ></DIV >@@ -11361,7 +11361,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG readBlock</CODE >+>TQ_LONG readBlock</CODE > >(char *data, Q_ULONG len);<P > ></P > ></DIV >@@ -11387,7 +11387,7 @@ > ></A > ><CODE > CLASS="FUNCDEF" >->Q_LONG writeBlock</CODE >+>TQ_LONG writeBlock</CODE > >(const char *data, Q_ULONG len);<P > ></P > ></DIV >diff -urN python-tqt/doc/PyQt.sgml python-tqt.new/doc/PyQt.sgml >--- python-tqt/doc/PyQt.sgml 2012-05-27 17:58:01.000000000 -0500 >+++ python-tqt.new/doc/PyQt.sgml 2012-06-18 16:57:36.000000000 -0500 >@@ -1995,7 +1995,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> >@@ -2006,7 +2006,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readLine</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readLine</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef> > </FuncSynopsis> >@@ -2033,7 +2033,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef> > <ParamDef>const char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> >@@ -2699,7 +2699,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>toLong</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>toLong</Function></FuncDef> > <ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef> > </FuncSynopsis> > <Para> >@@ -2708,7 +2708,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_ULONG <Function>toULong</Function></FuncDef> >+ <FuncDef>TQ_ULONG <Function>toULong</Function></FuncDef> > <ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef> > </FuncSynopsis> > <Para> >@@ -5084,7 +5084,7 @@ > </Sect2> > <Sect2><Title>TQFtp (TQt v2.2+)</Title> > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef> > </FuncSynopsis> >@@ -5129,7 +5129,7 @@ > </Sect2> > <Sect2><Title>TQHttp (TQt v3+)</Title> > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef> > </FuncSynopsis> >@@ -5169,7 +5169,7 @@ > </Sect2> > <Sect2><Title>TQSocket (TQt v2.2+)</Title> > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> >@@ -5180,7 +5180,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readLine</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readLine</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef> > </FuncSynopsis> >@@ -5191,7 +5191,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef> > <ParamDef>const char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> >@@ -5202,7 +5202,7 @@ > </Sect2> > <Sect2><Title>TQSocketDevice (TQt v2.2+)</Title> > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> >@@ -5213,7 +5213,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef> > <ParamDef>const char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> >diff -urN python-tqt/sip/qt/qfile.sip python-tqt.new/sip/qt/qfile.sip >--- python-tqt/sip/qt/qfile.sip 2012-05-27 17:58:01.000000000 -0500 >+++ python-tqt.new/sip/qt/qfile.sip 2012-06-18 17:02:07.000000000 -0500 >@@ -32,9 +32,9 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> >- <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> >+ <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> > <Para> > This takes a single <Literal>len</Literal> parameter. The >@@ -43,9 +43,9 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readLine</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readLine</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> >- <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef> >+ <ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef> > </FuncSynopsis> > <Para> > This takes a single <Literal>maxlen</Literal> parameter. The >@@ -70,9 +70,9 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef> > <ParamDef>const char *<Parameter>data</Parameter></ParamDef> >- <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> >+ <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> > <Para> > <Literal>len</Literal> is derived from <Literal>data</Literal> and not passed >@@ -177,7 +177,7 @@ > int writeBlock(const char * /Array/,uint /ArraySize/) /ReleaseGIL/; > %End > %If (TQt_3_0_0 -) >- SIP_PYOBJECT readBlock(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)]; >+ SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; > %MethodCode > char *buf; > >@@ -185,7 +185,7 @@ > sipIsErr = 1; > else > { >- Q_LONG actlen; >+ TQ_LONG actlen; > > Py_BEGIN_ALLOW_THREADS > actlen = sipSelfWasArg ? sipCpp->TQFile::readBlock(buf,a0) : sipCpp->readBlock(buf,a0); >@@ -204,14 +204,14 @@ > %End > > >- Q_LONG writeBlock(const char * /Array/, >- Q_ULONG /ArraySize/) /ReleaseGIL/; >+ TQ_LONG writeBlock(const char * /Array/, >+ TQ_ULONG /ArraySize/) /ReleaseGIL/; > %End > %If (TQt_2_00 - TQt_3_0_0) > int writeBlock(const TQByteArray &) /ReleaseGIL/; > %End > %If (TQt_3_0_0 -) >- Q_LONG writeBlock(const TQByteArray &) /ReleaseGIL/; >+ TQ_LONG writeBlock(const TQByteArray &) /ReleaseGIL/; > %End > > %If (- TQt_3_0_0) >@@ -249,7 +249,7 @@ > %End > %End > %If (TQt_3_0_0 -) >- SIP_PYOBJECT readLine(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)]; >+ SIP_PYOBJECT readLine(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; > %MethodCode > char *buf; > >@@ -257,7 +257,7 @@ > sipIsErr = 1; > else > { >- Q_LONG actlen; >+ TQ_LONG actlen; > > Py_BEGIN_ALLOW_THREADS > actlen = sipSelfWasArg ? sipCpp->TQFile::readLine(buf,a0) : sipCpp->readLine(buf,a0); >@@ -287,7 +287,7 @@ > int readLine(TQString &,uint) /ReleaseGIL/; > %End > %If (TQt_3_0_0 -) >- Q_LONG readLine(TQString &,Q_ULONG) /ReleaseGIL/; >+ TQ_LONG readLine(TQString &,TQ_ULONG) /ReleaseGIL/; > %End > > int getch(); >diff -urN python-tqt/sip/qt/qglobal.sip python-tqt.new/sip/qt/qglobal.sip >--- python-tqt/sip/qt/qglobal.sip 2012-05-27 17:58:01.000000000 -0500 >+++ python-tqt.new/sip/qt/qglobal.sip 2012-06-18 16:59:26.000000000 -0500 >@@ -44,12 +44,12 @@ > typedef unsigned Q_UINT32; > > %If (TQt_Q_LONG_IS_long) >-typedef long Q_LONG; >-typedef unsigned long Q_ULONG; >+typedef long TQ_LONG; >+typedef unsigned long TQ_ULONG; > %End > %If (!TQt_Q_LONG_IS_long) >-typedef long long Q_LONG; >-typedef unsigned long long Q_ULONG; >+typedef long long TQ_LONG; >+typedef unsigned long long TQ_ULONG; > %End > > const char *tqVersion(); >diff -urN python-tqt/sip/qt/qiodevice.sip python-tqt.new/sip/qt/qiodevice.sip >--- python-tqt/sip/qt/qiodevice.sip 2012-05-27 17:58:01.000000000 -0500 >+++ python-tqt.new/sip/qt/qiodevice.sip 2012-06-18 17:04:15.000000000 -0500 >@@ -85,7 +85,7 @@ > > public: > %If (TQt_3_0_0 -) >- typedef Q_ULONG Offset; >+ typedef TQ_ULONG Offset; > %End > > TQIODevice(); >@@ -188,7 +188,7 @@ > %End > %End > %If (TQt_3_0_0 -) >- virtual SIP_PYOBJECT readBlock(Q_ULONG) = 0 /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)]; >+ virtual SIP_PYOBJECT readBlock(TQ_ULONG) = 0 /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; > %MethodCode > char *buf; > >@@ -196,7 +196,7 @@ > sipIsErr = 1; > else > { >- Q_LONG actlen; >+ TQ_LONG actlen; > > Py_BEGIN_ALLOW_THREADS > actlen = sipCpp -> readBlock(buf,a0); >@@ -253,8 +253,8 @@ > uint /ArraySize/) = 0 /ReleaseGIL/; > %End > %If (TQt_3_0_0 -) >- virtual Q_LONG writeBlock(const char * /Array/, >- Q_ULONG /ArraySize/) = 0 /ReleaseGIL/; >+ virtual TQ_LONG writeBlock(const char * /Array/, >+ TQ_ULONG /ArraySize/) = 0 /ReleaseGIL/; > %End > > %If (- TQt_3_0_0) >@@ -318,7 +318,7 @@ > %End > %End > %If (TQt_3_0_0 -) >- virtual SIP_PYOBJECT readLine(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)]; >+ virtual SIP_PYOBJECT readLine(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; > %MethodCode > char *buf; > >@@ -326,7 +326,7 @@ > sipIsErr = 1; > else > { >- Q_LONG actlen; >+ TQ_LONG actlen; > > Py_BEGIN_ALLOW_THREADS > actlen = sipSelfWasArg ? sipCpp->TQIODevice::readLine(buf, a0) : sipCpp->readLine(buf, a0); >@@ -382,7 +382,7 @@ > int writeBlock(const TQByteArray &) /ReleaseGIL/; > %End > %If (TQt_3_0_0 -) >- Q_LONG writeBlock(const TQByteArray &) /ReleaseGIL/; >+ TQ_LONG writeBlock(const TQByteArray &) /ReleaseGIL/; > %End > > %If (TQt_2_00 - TQt_3_0_0) >diff -urN python-tqt/sip/qt/qlocale.sip python-tqt.new/sip/qt/qlocale.sip >--- python-tqt/sip/qt/qlocale.sip 2012-05-27 17:58:01.000000000 -0500 >+++ python-tqt.new/sip/qt/qlocale.sip 2012-06-18 17:02:47.000000000 -0500 >@@ -59,7 +59,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>toLong</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>toLong</Function></FuncDef> > <ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef> > </FuncSynopsis> > <Para> >@@ -68,7 +68,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_ULONG <Function>toULong</Function></FuncDef> >+ <FuncDef>TQ_ULONG <Function>toULong</Function></FuncDef> > <ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef> > </FuncSynopsis> > <Para> >@@ -508,10 +508,10 @@ > ushort toUShort(const TQString &,bool * = 0) const; > int toInt(const TQString &,bool * = 0) const; > uint toUInt(const TQString &,bool * = 0) const; >- Q_LONG toLong(const TQString &,bool * = 0) const; >- Q_ULONG toULong(const TQString &,bool * = 0) const; >- //Q_LLONG toLongLong(const TQString &,bool * = 0) const; >- //Q_ULLONG toULongLong(const TQString &,bool * = 0) const; >+ TQ_LONG toLong(const TQString &,bool * = 0) const; >+ TQ_ULONG toULong(const TQString &,bool * = 0) const; >+ //TQ_LLONG toLongLong(const TQString &,bool * = 0) const; >+ //TQ_ULLONG toULongLong(const TQString &,bool * = 0) const; > float toFloat(const TQString &,bool * = 0) const; > double toDouble(const TQString &,bool * = 0) const; > >@@ -519,10 +519,10 @@ > //TQString toString(ushort) const; > TQString toString(int /Constrained/) const; > //TQString toString(uint) const; >- //TQString toString(Q_LONG) const; >- //TQString toString(Q_ULONG) const; >- //TQString toString(Q_LLONG) const; >- //TQString toString(Q_ULLONG) const; >+ //TQString toString(TQ_LONG) const; >+ //TQString toString(TQ_ULONG) const; >+ //TQString toString(TQ_LLONG) const; >+ //TQString toString(TQ_ULLONG) const; > //TQString toString(float,char = 'g',int = 6) const; > TQString toString(double,char = 'g',int = 6) const; > >diff -urN python-tqt/sip/qt/versions.sip python-tqt.new/sip/qt/versions.sip >--- python-tqt/sip/qt/versions.sip 2012-05-27 17:58:02.000000000 -0500 >+++ python-tqt.new/sip/qt/versions.sip 2012-06-18 17:00:07.000000000 -0500 >@@ -83,7 +83,7 @@ > %Feature TQt_WIZARD > %Feature TQt_WORKSPACE > >-// On Windows64 Q_LONG is defined as __int64 (which SIP doesn't handle) so >+// On Windows64 TQ_LONG is defined as __int64 (which SIP doesn't handle) so > // this feature is disabled. > %Feature TQt_Q_LONG_IS_long > >diff -urN python-tqt/sip/qtnetwork/qftp.sip python-tqt.new/sip/qtnetwork/qftp.sip >--- python-tqt/sip/qtnetwork/qftp.sip 2012-05-27 17:58:02.000000000 -0500 >+++ python-tqt.new/sip/qtnetwork/qftp.sip 2012-06-18 17:07:04.000000000 -0500 >@@ -23,9 +23,9 @@ > %ExportedDoc > <Sect2><Title>TQFtp (TQt v2.2+)</Title> > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> >- <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef> >+ <ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef> > </FuncSynopsis> > <Para> > This takes a single <Literal>maxlen</Literal> parameter. The >@@ -111,7 +111,7 @@ > > unsigned long bytesAvailable() const; > >- SIP_PYOBJECT readBlock(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)]; >+ SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; > %MethodCode > char *buf; > >@@ -119,7 +119,7 @@ > sipIsErr = 1; > else > { >- Q_LONG actlen; >+ TQ_LONG actlen; > > Py_BEGIN_ALLOW_THREADS > actlen = sipCpp -> TQFtp::readBlock(buf,a0); >diff -urN python-tqt/sip/qtnetwork/qhttp.sip python-tqt.new/sip/qtnetwork/qhttp.sip >--- python-tqt/sip/qtnetwork/qhttp.sip 2012-05-27 17:58:02.000000000 -0500 >+++ python-tqt.new/sip/qtnetwork/qhttp.sip 2012-06-18 17:05:07.000000000 -0500 >@@ -24,9 +24,9 @@ > %ExportedDoc > <Sect2><Title>TQHttp (TQt v3+)</Title> > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> >- <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef> >+ <ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef> > </FuncSynopsis> > <Para> > This takes a single <Literal>maxlen</Literal> parameter. The >@@ -207,7 +207,7 @@ > > unsigned long bytesAvailable() const; > >- SIP_PYOBJECT readBlock(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)]; >+ SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; > %MethodCode > char *buf; > >@@ -215,7 +215,7 @@ > sipIsErr = 1; > else > { >- Q_LONG actlen; >+ TQ_LONG actlen; > > Py_BEGIN_ALLOW_THREADS > actlen = sipCpp -> TQHttp::readBlock(buf,a0); >diff -urN python-tqt/sip/qtnetwork/qsocket.sip python-tqt.new/sip/qtnetwork/qsocket.sip >--- python-tqt/sip/qtnetwork/qsocket.sip 2012-05-27 17:58:02.000000000 -0500 >+++ python-tqt.new/sip/qtnetwork/qsocket.sip 2012-06-18 17:06:22.000000000 -0500 >@@ -23,9 +23,9 @@ > %ExportedDoc > <Sect2><Title>TQSocket (TQt v2.2+)</Title> > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> >- <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> >+ <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> > <Para> > This takes a single <Literal>len</Literal> parameter. The >@@ -34,9 +34,9 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readLine</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readLine</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> >- <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef> >+ <ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef> > </FuncSynopsis> > <Para> > This takes a single <Literal>maxlen</Literal> parameter. The >@@ -45,9 +45,9 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef> > <ParamDef>const char *<Parameter>data</Parameter></ParamDef> >- <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> >+ <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> > <Para> > <Literal>len</Literal> is derived from <Literal>data</Literal> and not passed >@@ -156,10 +156,10 @@ > bool atEnd() const; > > %If (TQt_3_0_0 -) >- Q_ULONG bytesAvailable() const; >- Q_ULONG waitForMore(int) const /ReleaseGIL/; >- //Q_ULONG waitForMore(int,bool *) const /ReleaseGIL/; >- Q_ULONG bytesToWrite() const; >+ TQ_ULONG bytesAvailable() const; >+ TQ_ULONG waitForMore(int) const /ReleaseGIL/; >+ //TQ_ULONG waitForMore(int,bool *) const /ReleaseGIL/; >+ TQ_ULONG bytesToWrite() const; > %End > %If (- TQt_3_0_0) > int bytesAvailable() const; >@@ -240,7 +240,7 @@ > %End > %End > %If (TQt_3_0_0 -) >- SIP_PYOBJECT readBlock(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)]; >+ SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; > %MethodCode > char *buf; > >@@ -248,7 +248,7 @@ > sipIsErr = 1; > else > { >- Q_LONG actlen; >+ TQ_LONG actlen; > > Py_BEGIN_ALLOW_THREADS > actlen = sipSelfWasArg ? sipCpp->TQSocket::readBlock(buf, a0) : sipCpp->readBlock(buf, a0); >@@ -273,10 +273,10 @@ > } > %End > >- Q_LONG writeBlock(const char * /Array/, >- Q_ULONG /ArraySize/) /ReleaseGIL/; >+ TQ_LONG writeBlock(const char * /Array/, >+ TQ_ULONG /ArraySize/) /ReleaseGIL/; > >- SIP_PYOBJECT readLine(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)]; >+ SIP_PYOBJECT readLine(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; > %MethodCode > char *buf; > >@@ -284,7 +284,7 @@ > sipIsErr = 1; > else > { >- Q_LONG actlen; >+ TQ_LONG actlen; > > Py_BEGIN_ALLOW_THREADS > actlen = sipCpp -> readLine(buf,a0); >@@ -323,8 +323,8 @@ > TQHostAddress peerAddress() const; > > %If (TQt_3_2_0 -) >- void setReadBufferSize(Q_ULONG); >- Q_ULONG readBufferSize() const; >+ void setReadBufferSize(TQ_ULONG); >+ TQ_ULONG readBufferSize() const; > %End > > signals: >diff -urN python-tqt/sip/qtnetwork/qsocketdevice.sip python-tqt.new/sip/qtnetwork/qsocketdevice.sip >--- python-tqt/sip/qtnetwork/qsocketdevice.sip 2012-05-27 17:58:02.000000000 -0500 >+++ python-tqt.new/sip/qtnetwork/qsocketdevice.sip 2012-06-18 16:57:34.000000000 -0500 >@@ -23,7 +23,7 @@ > %ExportedDoc > <Sect2><Title>TQSocketDevice (TQt v2.2+)</Title> > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef> > <ParamDef>char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> >@@ -34,7 +34,7 @@ > </Para> > > <FuncSynopsis> >- <FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef> >+ <FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef> > <ParamDef>const char *<Parameter>data</Parameter></ParamDef> > <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef> > </FuncSynopsis> View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]