TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Replaced various '#define' with actual strings - part 2

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/241/head
Michele Calgaro 1 year ago
parent 73dba53e4a
commit d42f9ae842
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
30 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File

10
kate/part/test_regression.cpp
Unescape View File

@ -628,7 +628,7 @@ int main(int argc, char *argv[])
link += TQString(" <p style=\"color:green;font-weight:bold\">%1 new passes since %2</p>") link += TQString(" <p style=\"color:green;font-weight:bold\">%1 new passes since %2</p>")
.arg(regressionTest->m_passes_new) .arg(regressionTest->m_passes_new)
.arg(regressionTest->m_failureComp->group()); .arg(regressionTest->m_failureComp->group());
list.tqwriteBlock( link.latin1(), link.length() ); list.writeBlock( link.latin1(), link.length() );
list.close(); list.close();
} }
} }
@ -681,12 +681,12 @@ RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig,
TQString s; TQString s;
f.open( IO_WriteOnly | IO_Truncate ); f.open( IO_WriteOnly | IO_Truncate );
s = "<html><body>Follow the white rabbit"; s = "<html><body>Follow the white rabbit";
f.tqwriteBlock( s.latin1(), s.length() ); f.writeBlock( s.latin1(), s.length() );
f.close(); f.close();
f.setName( m_outputDir + "/index.html" ); f.setName( m_outputDir + "/index.html" );
f.open( IO_WriteOnly | IO_Truncate ); f.open( IO_WriteOnly | IO_Truncate );
s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>"; s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>";
f.tqwriteBlock( s.latin1(), s.length() ); f.writeBlock( s.latin1(), s.length() );
f.close(); f.close();
curr = this; curr = this;
@ -848,7 +848,7 @@ void RegressionTest::createLink( const TQString& test, int failures )
if (failures & NewFailure) if (failures & NewFailure)
link += "</span>"; link += "</span>";
link += "<br>\n"; link += "<br>\n";
list.tqwriteBlock( link.latin1(), link.length() ); list.writeBlock( link.latin1(), link.length() );
list.close(); list.close();
} }
@ -1020,7 +1020,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
cl += "<div id='dom' class='diff'>" + domDiff + "</div>"; cl += "<div id='dom' class='diff'>" + domDiff + "</div>";
cl += "</body></html>"; cl += "</body></html>";
compare.tqwriteBlock( cl.latin1(), cl.length() ); compare.writeBlock( cl.latin1(), cl.length() );
compare.close(); compare.close();
} }

2
tdeabc/sound.h
Unescape View File

@ -35,7 +35,7 @@ namespace TDEABC {
* \code * \code
* KTempFile tmp; * KTempFile tmp;
* if(sound.isIntern()) { * if(sound.isIntern()) {
* tmp.file()->tqwriteBlock( sound.data() ); * tmp.file()->writeBlock( sound.data() );
* tmp.close(); * tmp.close();
* KAudioPlayer::play( tmp.name() ); * KAudioPlayer::play( tmp.name() );
* } else if(!sound.url().isEmpty()) { * } else if(!sound.url().isEmpty()) {

8
tdecore/kextsock.cpp
Unescape View File

@ -1431,7 +1431,7 @@ void KExtendedSocket::flush()
} }
TQT_TQIO_LONG KExtendedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen)
{ {
cleanError(); cleanError();
if (d->status < connected || d->flags & passiveSocket) if (d->status < connected || d->flags & passiveSocket)
@ -1476,7 +1476,7 @@ TQT_TQIO_LONG KExtendedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
return retval; return retval;
} }
TQT_TQIO_LONG KExtendedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) TQ_LONG KExtendedSocket::writeBlock(const char *data, TQ_ULONG len)
{ {
cleanError(); cleanError();
if (d->status < connected || d->status >= closing || d->flags & passiveSocket) if (d->status < connected || d->status >= closing || d->flags & passiveSocket)
@ -1596,7 +1596,7 @@ int KExtendedSocket::getch()
{ {
unsigned char c; unsigned char c;
int retval; int retval;
retval = tqreadBlock((char*)&c, sizeof(c)); retval = readBlock((char*)&c, sizeof(c));
if (retval < 0) if (retval < 0)
return retval; return retval;
@ -1606,7 +1606,7 @@ int KExtendedSocket::getch()
int KExtendedSocket::putch(int ch) int KExtendedSocket::putch(int ch)
{ {
unsigned char c = (char)ch; unsigned char c = (char)ch;
return tqwriteBlock((char*)&c, sizeof(c)); return writeBlock((char*)&c, sizeof(c));
} }
// sets the emission of the readyRead signal // sets the emission of the readyRead signal

8
tdecore/kextsock.h
Unescape View File

@ -63,7 +63,7 @@ class KExtendedSocketPrivate;
* only difference is that the passiveSocket flag must be passed either to * only difference is that the passiveSocket flag must be passed either to
* the constructor or to setSocketFlags(). If passiveSocket is used, the class will * the constructor or to setSocketFlags(). If passiveSocket is used, the class will
* enable functions listen() and accept() and related signals, and will * enable functions listen() and accept() and related signals, and will
* also disable tqreadBlock() and tqwriteBlock(). * also disable readBlock() and writeBlock().
* *
* To create a Unix socket, one would pass flag unixSocket to the constructor * To create a Unix socket, one would pass flag unixSocket to the constructor
* or setSocketFlags(). The hostname and service/port can be set to whatever is * or setSocketFlags(). The hostname and service/port can be set to whatever is
@ -668,7 +668,7 @@ public:
* ready to receive data, it will block, unless this is a non-blocking socket. * ready to receive data, it will block, unless this is a non-blocking socket.
* *
* This function does not touch the read buffer. You can empty it by calling * This function does not touch the read buffer. You can empty it by calling
* tqreadBlock() with a null destination buffer. * readBlock() with a null destination buffer.
*/ */
virtual void flush(); virtual void flush();
@ -731,7 +731,7 @@ public:
* This function returns 0, if the function detected end-of-file condition * This function returns 0, if the function detected end-of-file condition
* (socket was closed) * (socket was closed)
*/ */
virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
/** /**
* Writes a block of data to the socket. * Writes a block of data to the socket.
@ -756,7 +756,7 @@ public:
* The return value might be less than @p len if the output buffers cannot * The return value might be less than @p len if the output buffers cannot
* accommodate that many bytes and -1 in the case of an errro. * accommodate that many bytes and -1 in the case of an errro.
*/ */
virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
/** /**
* Peeks at a block of data from the socket. * Peeks at a block of data from the socket.

8
tdecore/kglobalaccel_x11.cpp
Unescape View File

@ -423,16 +423,16 @@ void TDEGlobalAccelPrivate::activate( TDEAccelAction* pAction, const KKeySequenc
int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
if( slot_id >= 0 ) { if( slot_id >= 0 ) {
TQUObject o[2]; TQUObject o[2];
static_TQUType_int.set(o+1,n); static_QUType_int.set(o+1,n);
const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o );
} }
} else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) {
int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
if( slot_id >= 0 ) { if( slot_id >= 0 ) {
TQUObject o[4]; TQUObject o[4];
static_TQUType_TQString.set(o+1,pAction->name()); static_QUType_TQString.set(o+1,pAction->name());
static_TQUType_TQString.set(o+2,pAction->label()); static_QUType_TQString.set(o+2,pAction->label());
static_TQUType_ptr.set(o+3,&seq); static_QUType_ptr.set(o+3,&seq);
const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o );
} }
} else { } else {

4
tdecore/kqiodevicegzip_p.cpp
Unescape View File

@ -111,7 +111,7 @@ bool KQIODeviceGZip::reset(void)
return (gzrewind(m_gzfile)>=0); return (gzrewind(m_gzfile)>=0);
} }
TQT_TQIO_LONG KQIODeviceGZip::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen )
{ {
TQ_LONG result=0; TQ_LONG result=0;
if (m_gzfile) if (m_gzfile)
@ -122,7 +122,7 @@ TQT_TQIO_LONG KQIODeviceGZip::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen )
return result; return result;
} }
TQT_TQIO_LONG KQIODeviceGZip::tqwriteBlock( const char *data, TQT_TQIO_ULONG len ) TQ_LONG KQIODeviceGZip::writeBlock( const char *data, TQ_ULONG len )
{ {
TQ_ULONG result=0; TQ_ULONG result=0;
if (m_gzfile) if (m_gzfile)

4
tdecore/kqiodevicegzip_p.h
Unescape View File

@ -48,8 +48,8 @@ public:
bool atEnd(void) const; bool atEnd(void) const;
bool reset (void); bool reset (void);
TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ); TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len ); TQ_LONG writeBlock( const char *data, TQ_ULONG len );
int getch(void); int getch(void);
int putch(int ch); int putch(int ch);

16
tdecore/network/kbufferedsocket.cpp
Unescape View File

@ -113,7 +113,7 @@ TQ_LONG TDEBufferedSocket::waitForMore(int msecs, bool *timeout)
return retval; return retval;
} }
TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) TQ_LONG TDEBufferedSocket::readBlock(char *data, TQ_ULONG maxlen)
{ {
if (d->input) if (d->input)
{ {
@ -126,13 +126,13 @@ TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
resetError(); resetError();
return d->input->consumeBuffer(data, maxlen); return d->input->consumeBuffer(data, maxlen);
} }
return KStreamSocket::tqreadBlock(data, maxlen); return KStreamSocket::readBlock(data, maxlen);
} }
TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) TQ_LONG TDEBufferedSocket::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
{ {
from = peerAddress(); from = peerAddress();
return tqreadBlock(data, maxlen); return readBlock(data, maxlen);
} }
TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
@ -157,7 +157,7 @@ TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddre
return peekBlock(data, maxlen); return peekBlock(data, maxlen);
} }
TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) TQ_LONG TDEBufferedSocket::writeBlock(const char *data, TQ_ULONG len)
{ {
if (state() != Connected) if (state() != Connected)
{ {
@ -184,14 +184,14 @@ TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG l
return d->output->feedBuffer(data, len); return d->output->feedBuffer(data, len);
} }
return KStreamSocket::tqwriteBlock(data, len); return KStreamSocket::writeBlock(data, len);
} }
TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen, TQ_LONG TDEBufferedSocket::writeBlock(const char *data, TQ_ULONG maxlen,
const TDESocketAddress&) const TDESocketAddress&)
{ {
// ignore the third parameter // ignore the third parameter
return tqwriteBlock(data, maxlen); return writeBlock(data, maxlen);
} }
void TDEBufferedSocket::enableRead(bool enable) void TDEBufferedSocket::enableRead(bool enable)

8
tdecore/network/kbufferedsocket.h
Unescape View File

@ -109,7 +109,7 @@ public:
/** /**
* Reads data from the socket. Make use of buffers. * Reads data from the socket. Make use of buffers.
*/ */
virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
/** /**
* @overload * @overload
@ -117,7 +117,7 @@ public:
* *
* The @p from parameter is always set to @ref peerAddress() * The @p from parameter is always set to @ref peerAddress()
*/ */
virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
/** /**
* Peeks data from the socket. * Peeks data from the socket.
@ -135,7 +135,7 @@ public:
/** /**
* Writes data to the socket. * Writes data to the socket.
*/ */
virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
/** /**
* @overload * @overload
@ -143,7 +143,7 @@ public:
* *
* The @p to parameter is discarded. * The @p to parameter is discarded.
*/ */
virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
/** /**
* Catch changes. * Catch changes.

16
tdecore/network/kclientsocketbase.cpp
Unescape View File

@ -298,10 +298,10 @@ TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout)
return retval; return retval;
} }
TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen)
{ {
resetError(); resetError();
TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen); TQ_LONG retval = socketDevice()->readBlock(data, maxlen);
if (retval == -1) if (retval == -1)
{ {
copyError(); copyError();
@ -310,10 +310,10 @@ TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
return retval; return retval;
} }
TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
{ {
resetError(); resetError();
TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen, from); TQ_LONG retval = socketDevice()->readBlock(data, maxlen, from);
if (retval == -1) if (retval == -1)
{ {
copyError(); copyError();
@ -346,10 +346,10 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddre
return retval; return retval;
} }
TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len)
{ {
resetError(); resetError();
TQ_LONG retval = socketDevice()->tqwriteBlock(data, len); TQ_LONG retval = socketDevice()->writeBlock(data, len);
if (retval == -1) if (retval == -1)
{ {
copyError(); copyError();
@ -358,10 +358,10 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l
return retval; return retval;
} }
TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
{ {
resetError(); resetError();
TQ_LONG retval = socketDevice()->tqwriteBlock(data, len, to); TQ_LONG retval = socketDevice()->writeBlock(data, len, to);
if (retval == -1) if (retval == -1)
{ {
copyError(); copyError();

8
tdecore/network/kclientsocketbase.h
Unescape View File

@ -303,13 +303,13 @@ public:
/** /**
* Reads data from a socket. Reimplemented from TDESocketBase. * Reads data from a socket. Reimplemented from TDESocketBase.
*/ */
virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
/** /**
* @overload * @overload
* Reads data from a socket. Reimplemented from TDESocketBase. * Reads data from a socket. Reimplemented from TDESocketBase.
*/ */
virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
/** /**
* Peeks data from the socket. Reimplemented from TDESocketBase. * Peeks data from the socket. Reimplemented from TDESocketBase.
@ -325,13 +325,13 @@ public:
/** /**
* Writes data to the socket. Reimplemented from TDESocketBase. * Writes data to the socket. Reimplemented from TDESocketBase.
*/ */
virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
/** /**
* @overload * @overload
* Writes data to the socket. Reimplemented from TDESocketBase. * Writes data to the socket. Reimplemented from TDESocketBase.
*/ */
virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
/** /**
* Returns the local socket address. Reimplemented from TDESocketBase. * Returns the local socket address. Reimplemented from TDESocketBase.

8
tdecore/network/kdatagramsocket.cpp
Unescape View File

@ -156,7 +156,7 @@ KDatagramPacket KDatagramSocket::receive()
TDESocketAddress address; TDESocketAddress address;
// now do the reading // now do the reading
size = tqreadBlock(data.data(), size, address); size = readBlock(data.data(), size, address);
if (size < 0) if (size < 0)
// error has been set // error has been set
return KDatagramPacket(); return KDatagramPacket();
@ -167,10 +167,10 @@ KDatagramPacket KDatagramSocket::receive()
TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet) TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet)
{ {
return tqwriteBlock(packet.data(), packet.size(), packet.address()); return writeBlock(packet.data(), packet.size(), packet.address());
} }
TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) TQ_LONG KDatagramSocket::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
{ {
if (to.family() != AF_UNSPEC) if (to.family() != AF_UNSPEC)
{ {
@ -179,7 +179,7 @@ TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDES
// error handling will happen below // error handling will happen below
socketDevice()->create(to.family(), SOCK_DGRAM, 0); socketDevice()->create(to.family(), SOCK_DGRAM, 0);
} }
return KClientSocketBase::tqwriteBlock(data, len, to); return KClientSocketBase::writeBlock(data, len, to);
} }
void KDatagramSocket::lookupFinishedLocal() void KDatagramSocket::lookupFinishedLocal()

4
tdecore/network/kdatagramsocket.h
Unescape View File

@ -223,7 +223,7 @@ public:
* *
* Connecting means only to designate the given address as the default * Connecting means only to designate the given address as the default
* destination address for datagrams sent without destination addresses * destination address for datagrams sent without destination addresses
* ( tqwriteBlock(const char *, TQ_ULONG) ). * ( writeBlock(const char *, TQ_ULONG) ).
* *
* @note Calling connect will not cause the socket to be bound. You have * @note Calling connect will not cause the socket to be bound. You have
* to call @ref bind explicitly. * to call @ref bind explicitly.
@ -241,7 +241,7 @@ public:
/** /**
* Writes data to the socket. Reimplemented from KClientSocketBase. * Writes data to the socket. Reimplemented from KClientSocketBase.
*/ */
virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
/** /**
* Receives one datagram from the stream. The reading process is guaranteed * Receives one datagram from the stream. The reading process is guaranteed

6
tdecore/network/khttpproxysocketdevice.cpp
Unescape View File

@ -182,7 +182,7 @@ bool KHttpProxySocketDevice::parseServerReply()
if (!d->request.isEmpty()) if (!d->request.isEmpty())
{ {
// send request // send request
TQ_LONG written = tqwriteBlock(d->request, d->request.length()); TQ_LONG written = writeBlock(d->request, d->request.length());
if (written < 0) if (written < 0)
{ {
tqDebug("KHttpProxySocketDevice: would block writing request!"); tqDebug("KHttpProxySocketDevice: would block writing request!");
@ -230,7 +230,7 @@ bool KHttpProxySocketDevice::parseServerReply()
{ {
// no, headers not yet finished... // no, headers not yet finished...
// consume data from socket // consume data from socket
tqreadBlock(buf.data(), avail); readBlock(buf.data(), avail);
d->reply += buf.data(); d->reply += buf.data();
setError(IO_ConnectError, InProgress); setError(IO_ConnectError, InProgress);
return true; return true;
@ -241,7 +241,7 @@ bool KHttpProxySocketDevice::parseServerReply()
d->reply += fullHeaders.mid(d->reply.length(), index + 4); d->reply += fullHeaders.mid(d->reply.length(), index + 4);
// consume from socket // consume from socket
tqreadBlock(buf.data(), index + 4); readBlock(buf.data(), index + 4);
} }
else else
{ {

10
tdecore/network/ksockssocketdevice.cpp
Unescape View File

@ -214,7 +214,7 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketA
return 0; return 0;
} }
TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen) TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
{ {
resetError(); resetError();
if (m_sockfd == -1) if (m_sockfd == -1)
@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen)
return retval; return retval;
} }
TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from) TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from)
{ {
resetError(); resetError();
if (m_sockfd == -1) if (m_sockfd == -1)
@ -298,12 +298,12 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddr
return retval; return retval;
} }
TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len) TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len)
{ {
return tqwriteBlock(data, len, TDESocketAddress()); return writeBlock(data, len, TDESocketAddress());
} }
TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
{ {
resetError(); resetError();
if (m_sockfd == -1) if (m_sockfd == -1)

8
tdecore/network/ksockssocketdevice.h
Unescape View File

@ -83,8 +83,8 @@ public:
/** /**
* Overrides reading. * Overrides reading.
*/ */
virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen); virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
/** /**
* Overrides peeking. * Overrides peeking.
@ -95,8 +95,8 @@ public:
/** /**
* Overrides writing. * Overrides writing.
*/ */
virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len); virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
/** /**
* Overrides getting socket address. * Overrides getting socket address.

4
tdecore/network/tdesocketbase.cpp
Unescape View File

@ -291,7 +291,7 @@ KActiveSocketBase::~KActiveSocketBase()
int KActiveSocketBase::getch() int KActiveSocketBase::getch()
{ {
unsigned char c; unsigned char c;
if (tqreadBlock((char*)&c, 1) != 1) if (readBlock((char*)&c, 1) != 1)
return -1; return -1;
return c; return c;
@ -300,7 +300,7 @@ int KActiveSocketBase::getch()
int KActiveSocketBase::putch(int ch) int KActiveSocketBase::putch(int ch)
{ {
unsigned char c = (unsigned char)ch; unsigned char c = (unsigned char)ch;
if (tqwriteBlock((char*)&c, 1) != 1) if (writeBlock((char*)&c, 1) != 1)
return -1; return -1;
return c; return c;

8
tdecore/network/tdesocketbase.h
Unescape View File

@ -553,7 +553,7 @@ public:
* Reimplemented from TQIODevice. See TQIODevice::readBlock for * Reimplemented from TQIODevice. See TQIODevice::readBlock for
* more information. * more information.
*/ */
virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG len) = 0; virtual TQ_LONG readBlock(char *data, TQ_ULONG len) = 0;
/** @overload /** @overload
* Receives data and the source address. * Receives data and the source address.
@ -566,7 +566,7 @@ public:
* @param from the address of the sender will be stored here * @param from the address of the sender will be stored here
* @returns the actual number of bytes read * @returns the actual number of bytes read
*/ */
virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) = 0; virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) = 0;
/** /**
* Peeks the data in the socket. * Peeks the data in the socket.
@ -601,7 +601,7 @@ public:
* Reimplemented from TQIODevice. See TQIODevice::writeBlock for * Reimplemented from TQIODevice. See TQIODevice::writeBlock for
* more information. * more information.
*/ */
virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len) = 0; virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len) = 0;
/** @overload /** @overload
* Writes the given data to the destination address. * Writes the given data to the destination address.
@ -614,7 +614,7 @@ public:
* @param to the address to send to * @param to the address to send to
* @returns the number of bytes actually sent * @returns the number of bytes actually sent
*/ */
virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) = 0; virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) = 0;
/** /**
* Reads one character from the socket. * Reads one character from the socket.

4
tdecore/network/tdesocketbuffer.cpp
Unescape View File

@ -274,7 +274,7 @@ TQ_LONG TDESocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
} }
// now try to write those bytes // now try to write those bytes
TQ_LONG wrote = dev->tqwriteBlock(buf, count); TQ_LONG wrote = dev->writeBlock(buf, count);
if (wrote == -1) if (wrote == -1)
// error? // error?
@ -315,7 +315,7 @@ TQ_LONG TDESocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
// now do the reading // now do the reading
TQByteArray a(len); TQByteArray a(len);
len = dev->tqreadBlock(a.data(), len); len = dev->readBlock(a.data(), len);
if (len == -1) if (len == -1)
// error? // error?

10
tdecore/network/tdesocketdevice.cpp
Unescape View File

@ -414,7 +414,7 @@ static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketAddr
return 0; return 0;
} }
TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) TQ_LONG TDESocketDevice::readBlock(char *data, TQ_ULONG maxlen)
{ {
resetError(); resetError();
if (m_sockfd == -1) if (m_sockfd == -1)
@ -435,7 +435,7 @@ TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
return retval; return retval;
} }
TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress &from) TQ_LONG TDESocketDevice::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from)
{ {
resetError(); resetError();
if (m_sockfd == -1) if (m_sockfd == -1)
@ -498,12 +498,12 @@ TQ_LONG TDESocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress
return retval; return retval;
} }
TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) TQ_LONG TDESocketDevice::writeBlock(const char *data, TQ_ULONG len)
{ {
return tqwriteBlock(data, len, TDESocketAddress()); return writeBlock(data, len, TDESocketAddress());
} }
TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) TQ_LONG TDESocketDevice::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
{ {
resetError(); resetError();
if (m_sockfd == -1) if (m_sockfd == -1)

8
tdecore/network/tdesocketdevice.h
Unescape View File

@ -211,12 +211,12 @@ public:
/** /**
* Reads data from this socket. * Reads data from this socket.
*/ */
virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
/** /**
* Reads data and the source address from this socket. * Reads data and the source address from this socket.
*/ */
virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
/** /**
* Peeks data in the socket. * Peeks data in the socket.
@ -231,12 +231,12 @@ public:
/** /**
* Writes data to the socket. * Writes data to the socket.
*/ */
virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
/** /**
* Writes the given data to the given destination address. * Writes the given data to the given destination address.
*/ */
virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
/** /**
* Returns this socket's local address. * Returns this socket's local address.

14
tdehtml/test_regression.cpp
Unescape View File

@ -350,7 +350,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
char buf[1024]; char buf[1024];
int bytesread; int bytesread;
while (!file.atEnd()) { while (!file.atEnd()) {
bytesread = file.tqreadBlock(buf,1024); bytesread = file.readBlock(buf,1024);
stream.writeRawBytes(buf,bytesread); stream.writeRawBytes(buf,bytesread);
} }
file.close(); file.close();
@ -642,7 +642,7 @@ int main(int argc, char *argv[])
link = TQString( "<hr>%1 failures. (%2 expected failures)" ) link = TQString( "<hr>%1 failures. (%2 expected failures)" )
.arg(regressionTest->m_failures_work ) .arg(regressionTest->m_failures_work )
.arg( regressionTest->m_failures_fail ); .arg( regressionTest->m_failures_fail );
list.tqwriteBlock( link.latin1(), link.length() ); list.writeBlock( link.latin1(), link.length() );
list.close(); list.close();
} }
} }
@ -697,12 +697,12 @@ RegressionTest::RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const
TQString s; TQString s;
f.open( IO_WriteOnly | IO_Truncate ); f.open( IO_WriteOnly | IO_Truncate );
s = "<html><body>Follow the white rabbit"; s = "<html><body>Follow the white rabbit";
f.tqwriteBlock( s.latin1(), s.length() ); f.writeBlock( s.latin1(), s.length() );
f.close(); f.close();
f.setName( m_outputDir + "/index.html" ); f.setName( m_outputDir + "/index.html" );
f.open( IO_WriteOnly | IO_Truncate ); f.open( IO_WriteOnly | IO_Truncate );
s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>"; s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>";
f.tqwriteBlock( s.latin1(), s.length() ); f.writeBlock( s.latin1(), s.length() );
f.close(); f.close();
m_paintBuffer = 0; m_paintBuffer = 0;
@ -1032,7 +1032,7 @@ void RegressionTest::createLink( const TQString& test, int failures )
if ( failures & PaintFailure ) if ( failures & PaintFailure )
link += "P"; link += "P";
link += "]<br>\n"; link += "]<br>\n";
list.tqwriteBlock( link.latin1(), link.length() ); list.writeBlock( link.latin1(), link.length() );
list.close(); list.close();
} }
@ -1056,7 +1056,7 @@ void RegressionTest::doJavascriptReport( const TQString &test )
text.replace( '\n', "<br>\n" ); text.replace( '\n', "<br>\n" );
cl += text; cl += text;
cl += "</tt></body></html>"; cl += "</tt></body></html>";
compare.tqwriteBlock( cl.latin1(), cl.length() ); compare.writeBlock( cl.latin1(), cl.length() );
compare.close(); compare.close();
} }
@ -1248,7 +1248,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
cl += "<div id='dom' class='diff'>" + domDiff + "</div>"; cl += "<div id='dom' class='diff'>" + domDiff + "</div>";
cl += "</body></html>"; cl += "</body></html>";
compare.tqwriteBlock( cl.latin1(), cl.length() ); compare.writeBlock( cl.latin1(), cl.length() );
compare.close(); compare.close();
} }

4
tdeio/tdeio/kfilterdev.cpp
Unescape View File

@ -232,7 +232,7 @@ bool KFilterDev::atEnd() const
&& d->ungetchBuffer.isEmpty(); && d->ungetchBuffer.isEmpty();
} }
TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen )
{ {
Q_ASSERT ( filter->mode() == IO_ReadOnly ); Q_ASSERT ( filter->mode() == IO_ReadOnly );
//kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl; //kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl;
@ -351,7 +351,7 @@ TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen )
return dataReceived; return dataReceived;
} }
TQT_TQIO_LONG KFilterDev::tqwriteBlock( const char *data /*0 to finish*/, TQT_TQIO_ULONG len ) TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len )
{ {
Q_ASSERT ( filter->mode() == IO_WriteOnly ); Q_ASSERT ( filter->mode() == IO_WriteOnly );
// If we had an error, return 0. // If we had an error, return 0.

4
tdeio/tdeio/kfilterdev.h
Unescape View File

@ -95,8 +95,8 @@ public:
#ifdef qdoc #ifdef qdoc
#else #else
virtual TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ); virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
virtual TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len ); virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len );
#endif #endif
//int readLine( char *data, uint maxlen ); //int readLine( char *data, uint maxlen );

6
tdeio/tdeio/klimitediodevice.h
Unescape View File

@ -69,17 +69,17 @@ public:
virtual Offset size() const { return m_length; } virtual Offset size() const { return m_length; }
virtual TQT_TQIO_LONG tqreadBlock ( char * data, TQT_TQIO_ULONG maxlen ) virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen )
{ {
maxlen = TQMIN( maxlen, m_length - at() ); // Apply upper limit maxlen = TQMIN( maxlen, m_length - at() ); // Apply upper limit
return m_dev->readBlock( data, maxlen ); return m_dev->readBlock( data, maxlen );
} }
virtual TQT_TQIO_LONG tqwriteBlock ( const char *, TQT_TQIO_ULONG ) { return -1; } // unsupported virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported
virtual int putch( int ) { return -1; } // unsupported virtual int putch( int ) { return -1; } // unsupported
virtual int getch() { virtual int getch() {
char c[2]; char c[2];
if ( tqreadBlock(c, 1) == -1) if ( readBlock(c, 1) == -1)
return -1; return -1;
else else
return c[0]; return c[0];

2
tdeio/tests/jobtest.cpp
Unescape View File

@ -160,7 +160,7 @@ static void createTestFile( const TQString& path )
TQFile f( path ); TQFile f( path );
if ( !f.open( IO_WriteOnly ) ) if ( !f.open( IO_WriteOnly ) )
kdFatal() << "Can't create " << path << endl; kdFatal() << "Can't create " << path << endl;
f.tqwriteBlock( "Hello world", 11 ); f.writeBlock( "Hello world", 11 );
f.close(); f.close();
setTimeStamp( path ); setTimeStamp( path );
} }

6
tdeio/tests/kfiltertest.cpp
Unescape View File

@ -35,7 +35,7 @@ void test_block( const TQString & fileName )
TQByteArray array(1024); TQByteArray array(1024);
int n; int n;
while ( ( n = dev->tqreadBlock( array.data(), array.size() ) ) ) while ( ( n = dev->readBlock( array.data(), array.size() ) ) )
{ {
kdDebug() << "readBlock returned " << n << endl << endl; kdDebug() << "readBlock returned " << n << endl << endl;
// TQCString s(array,n+1); // Terminate with 0 before printing // TQCString s(array,n+1); // Terminate with 0 before printing
@ -55,9 +55,9 @@ void test_block_write( const TQString & fileName )
if ( !dev->open( IO_WriteOnly ) ) { kdWarning() << "open failed " << endl; return; } if ( !dev->open( IO_WriteOnly ) ) { kdWarning() << "open failed " << endl; return; }
TQCString s("hello\n"); TQCString s("hello\n");
int ret = dev->tqwriteBlock( s, s.size()-1 ); int ret = dev->writeBlock( s, s.size()-1 );
kdDebug() << "writeBlock ret=" << ret << endl; kdDebug() << "writeBlock ret=" << ret << endl;
//ret = dev->tqwriteBlock( s, s.size()-1 ); //ret = dev->writeBlock( s, s.size()-1 );
//kdDebug() << "writeBlock ret=" << ret << endl; //kdDebug() << "writeBlock ret=" << ret << endl;
dev->close(); dev->close();
delete dev; delete dev;

2
tdemdi/test/mainwidget.cpp
Unescape View File

@ -90,7 +90,7 @@ MainWidget::~MainWidget()
TQString s = doc.toString(); TQString s = doc.toString();
TQFile f("/tmp/dc.txt"); TQFile f("/tmp/dc.txt");
f.open(IO_ReadWrite); f.open(IO_ReadWrite);
f.tqwriteBlock(s.latin1(), s.length()); f.writeBlock(s.latin1(), s.length());
f.close(); f.close();
} }

10
tdeparts/browserinterface.cpp
Unescape View File

@ -33,21 +33,21 @@ void BrowserInterface::callMethod( const char *name, const TQVariant &argument )
case TQVariant::Invalid: case TQVariant::Invalid:
break; break;
case TQVariant::String: case TQVariant::String:
static_TQUType_TQString.set( o + 1, argument.toString() ); static_QUType_TQString.set( o + 1, argument.toString() );
break; break;
case TQVariant::StringList: case TQVariant::StringList:
strLst = argument.toStringList(); strLst = argument.toStringList();
static_TQUType_ptr.set( o + 1, &strLst ); static_QUType_ptr.set( o + 1, &strLst );
break; break;
case TQVariant::Int: case TQVariant::Int:
static_TQUType_int.set( o + 1, argument.toInt() ); static_QUType_int.set( o + 1, argument.toInt() );
break; break;
case TQVariant::UInt: case TQVariant::UInt:
i = argument.toUInt(); i = argument.toUInt();
static_TQUType_ptr.set( o + 1, &i ); static_QUType_ptr.set( o + 1, &i );
break; break;
case TQVariant::Bool: case TQVariant::Bool:
static_TQUType_bool.set( o + 1, argument.toBool() ); static_QUType_bool.set( o + 1, argument.toBool() );
break; break;
default: return; default: return;
} }

4
tdeprint/management/kmwlpd.cpp
Unescape View File

@ -81,12 +81,12 @@ bool checkLpdQueue(const char *host, const char *queue)
char res[64] = {0}; char res[64] = {0};
snprintf(res,64,"%c%s\n",(char)4,queue); snprintf(res,64,"%c%s\n",(char)4,queue);
if (sock.tqwriteBlock(res, strlen(res)) != (TQ_LONG)(strlen(res))) if (sock.writeBlock(res, strlen(res)) != (TQ_LONG)(strlen(res)))
return false; return false;
char buf[1024] = {0}; char buf[1024] = {0};
int n, tot(1); int n, tot(1);
while ((n = sock.tqreadBlock(res, 63)) > 0) while ((n = sock.readBlock(res, 63)) > 0)
{ {
res[n] = 0; res[n] = 0;
tot += n; tot += n;

Write Preview
Loading…
Cancel
Save