summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-04 02:29:16 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-04 02:29:16 -0500
commit8a4eacb6185de3653f6ae401c352aef833a9e72a (patch)
tree4c2f3ed3d149a42025bfe2baa10ada39d0e621c5
parent7446fdb128feb8d941e148f4de341a44256045ef (diff)
downloadtqt3-8a4eacb6185de3653f6ae401c352aef833a9e72a.tar.gz
tqt3-8a4eacb6185de3653f6ae401c352aef833a9e72a.zip
Fix incorrect renaming of RETQUEST
-rw-r--r--src/3rdparty/libmng/libmng_read.c8
-rw-r--r--src/3rdparty/libmng/libmng_types.h2
-rw-r--r--src/kernel/qapplication_x11.cpp6
-rw-r--r--src/kernel/qwidget_x11.cpp4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/3rdparty/libmng/libmng_read.c b/src/3rdparty/libmng/libmng_read.c
index 778e5d0ad..d93da7a19 100644
--- a/src/3rdparty/libmng/libmng_read.c
+++ b/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/src/3rdparty/libmng/libmng_types.h b/src/3rdparty/libmng/libmng_types.h
index aa346d300..a5bd852b1 100644
--- a/src/3rdparty/libmng/libmng_types.h
+++ b/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
/* ************************************************************************** */
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 41abcb20e..e9fee790c 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -2064,8 +2064,8 @@ void tqt_init_internal( int *argcptr, char **argv,
qt_x11_intern_atom( "_SGI_DESKS_MANAGER", &qt_sgi_desks_manager );
#ifndef QT_NO_XSYNC
- qt_x11_intern_atom( "_NET_WM_SYNC_RETQUEST_COUNTER", &qt_net_wm_sync_request_counter );
- qt_x11_intern_atom( "_NET_WM_SYNC_RETQUEST", &qt_net_wm_sync_request );
+ qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST_COUNTER", &qt_net_wm_sync_request_counter );
+ qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST", &qt_net_wm_sync_request );
#endif
qt_xdnd_setup();
@@ -5977,7 +5977,7 @@ bool TQETWidget::translateConfigEvent( const XEvent *event )
++compressed_configs;
}
#ifndef QT_NO_XSYNC
- // _NET_WM_SYNC_RETQUEST compression
+ // _NET_WM_SYNC_REQUEST compression
Window wid = winId();
while ( compressed_configs &&
XCheckIfEvent( x11Display(), &otherEvent,
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index 1479342e9..8e9cc3abc 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -684,7 +684,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
protocols[n++] = tqt_wm_take_focus; // support take focus window protocol
protocols[n++] = qt_net_wm_ping; // support _NET_WM_PING protocol
#ifndef QT_NO_XSYNC
- protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_RETQUEST protocol
+ protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_REQUEST protocol
#endif
if ( testWFlags( WStyle_ContextHelp ) )
protocols[n++] = qt_net_wm_context_help;
@@ -2698,7 +2698,7 @@ void TQWidget::incrementSyncCounter()
}
}
-// handle _NET_WM_SYNC_RETQUEST
+// handle _NET_WM_SYNC_REQUEST
void TQWidget::handleSyncRequest( void* ev )
{
XEvent* xev = (XEvent*)ev;