From d8cc8bdfa7fa624a526d5aa1626974e1444cb799 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 27 May 2011 19:21:21 +0000 Subject: TQt4 port k3b This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libk3b/projects/k3bpipebuffer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libk3b/projects/k3bpipebuffer.cpp') diff --git a/libk3b/projects/k3bpipebuffer.cpp b/libk3b/projects/k3bpipebuffer.cpp index 3b61116..4dbfd38 100644 --- a/libk3b/projects/k3bpipebuffer.cpp +++ b/libk3b/projects/k3bpipebuffer.cpp @@ -115,7 +115,7 @@ public: // // wait for data // - int ret = select( QMAX(usedInFd, outFd) + 1, &readFds, &writeFds, NULL, NULL); + int ret = select( TQMAX(usedInFd, outFd) + 1, &readFds, &writeFds, NULL, NULL); // // Do the buffering @@ -128,7 +128,7 @@ public: // Read from the buffer and write to the output // if( FD_ISSET(outFd, &writeFds) ) { - unsigned int maxLen = QMIN(bufSize - bufPos, dataLen); + unsigned int maxLen = TQMIN(bufSize - bufPos, dataLen); ret = ::write( outFd, &buffer[bufPos], maxLen ); @@ -155,7 +155,7 @@ public: // else if( FD_ISSET(usedInFd, &readFds) ) { unsigned int readPos = (bufPos + dataLen) % bufSize; - unsigned int maxLen = QMIN(bufSize - readPos, bufSize - dataLen); + unsigned int maxLen = TQMIN(bufSize - readPos, bufSize - dataLen); // // never read more than xxx bytes // This is some tuning to prevent the reading from blocking the whole thread @@ -221,8 +221,8 @@ public: }; -K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bThreadJob( jh, parent, name ) +K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bThreadJob( jh, tqparent, name ) { m_thread = new WorkThread(); setThread( m_thread ); -- cgit v1.2.3