diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-04 02:15:10 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-04 02:15:10 -0500 |
| commit | 1ac5a26fe484542cf7a2825b10ce06695ce275ef (patch) | |
| tree | 4e92d20e4e12074627e57c04503b9b06f829854e | |
| parent | 84de21ab25f6363efff38fbb37940152cfd9a11e (diff) | |
| download | experimental-1ac5a26fe484542cf7a2825b10ce06695ce275ef.tar.gz experimental-1ac5a26fe484542cf7a2825b10ce06695ce275ef.zip | |
Fix incorrect renaming of RETQUEST
| -rwxr-xr-x | qt3-tqt3/convert_qt_itself_qt3_batch4 | 2 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/3rdparty/libmng/libmng_read.c | 8 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/qt3-tqt3/convert_qt_itself_qt3_batch4 b/qt3-tqt3/convert_qt_itself_qt3_batch4 index 638fd3c..f39dc86 100755 --- a/qt3-tqt3/convert_qt_itself_qt3_batch4 +++ b/qt3-tqt3/convert_qt_itself_qt3_batch4 @@ -10,4 +10,6 @@ find ./ -type f -iname "*" -not -iwholename '*.git*' -exec sed -i 's/QT_POINTER_ find ./ -type f -iname "*" -not -iwholename '*.git*' -exec sed -i 's/\([^T]\)Qt3/\1TQt3/g' {} \; find ./ -type f -iname "*" -not -iwholename '*.git*' -exec sed -i 's/qt_main_thread/tqt_main_thread/g' {} \; +find ./ -type f -iname "*" -not -iwholename '*.git*' -exec sed -i 's/RETQUEST/REQUEST/g' {} \; + exit 0 diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_read.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_read.c index e907ad7..eb2cfbf 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_read.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_read.c @@ -183,7 +183,7 @@ mng_retcode read_databuffer (mng_datap pData, { /* not enough space left in buffer ? */ if (pData->iSuspendbufsize - pData->iSuspendbufleft - (mng_uint32)(pData->pSuspendbufnext - pData->pSuspendbuf) < - MNG_SUSPENDRETQUESTSIZE) + MNG_SUSPENDREQUESTSIZE) { if (pData->iSuspendbufleft) /* then lets shift (if there's anything left) */ MNG_COPY (pData->pSuspendbuf, pData->pSuspendbufnext, pData->iSuspendbufleft) @@ -191,12 +191,12 @@ mng_retcode read_databuffer (mng_datap pData, pData->pSuspendbufnext = pData->pSuspendbuf; } /* still not enough room ? */ - if (pData->iSuspendbufsize - pData->iSuspendbufleft < MNG_SUSPENDRETQUESTSIZE) + if (pData->iSuspendbufsize - pData->iSuspendbufleft < MNG_SUSPENDREQUESTSIZE) MNG_ERROR (pData, MNG_INTERNALERROR) /* now read some more data */ pTemp = pData->pSuspendbufnext + pData->iSuspendbufleft; - if (!pData->fReaddata (((mng_handle)pData), pTemp, MNG_SUSPENDRETQUESTSIZE, &iTemp)) + if (!pData->fReaddata (((mng_handle)pData), pTemp, MNG_SUSPENDREQUESTSIZE, &iTemp)) MNG_ERROR (pData, MNG_APPIOERROR); /* adjust fill-counter */ pData->iSuspendbufleft += iTemp; @@ -217,7 +217,7 @@ mng_retcode read_databuffer (mng_datap pData, } else { /* suspension required ? */ - if ((iSize > pData->iSuspendbufleft) && (iTemp < MNG_SUSPENDRETQUESTSIZE)) + if ((iSize > pData->iSuspendbufleft) && (iTemp < MNG_SUSPENDREQUESTSIZE)) pData->bSuspended = MNG_TRUE; } diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h b/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h index 579139a..30e6634 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h @@ -310,7 +310,7 @@ typedef mng_uint32 mng_uint32arr2[2]; #define MNG_NULL 0 #define MNG_SUSPENDBUFFERSIZE 32768 -#define MNG_SUSPENDRETQUESTSIZE 1024 +#define MNG_SUSPENDREQUESTSIZE 1024 /* ************************************************************************** */ |