From 69d87202cb139ffe9e4b3ce92e434523b7b09b64 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Oct 2018 19:46:30 +0900 Subject: QT_NO_* -> TQT_NO_* renaming. Signed-off-by: Michele Calgaro --- src/network/ntqdns.h | 4 ++-- src/network/ntqftp.h | 4 ++-- src/network/ntqhostaddress.h | 10 +++++----- src/network/ntqhttp.h | 2 +- src/network/ntqnetwork.h | 2 +- src/network/ntqserversocket.h | 4 ++-- src/network/ntqsocket.h | 6 +++--- src/network/ntqsocketdevice.h | 4 ++-- src/network/qdns.cpp | 20 ++++++++++---------- src/network/qftp.cpp | 10 +++++----- src/network/qhostaddress.cpp | 8 ++++---- src/network/qhttp.cpp | 2 +- src/network/qnetwork.cpp | 8 ++++---- src/network/qserversocket.cpp | 4 ++-- src/network/qsocket.cpp | 16 ++++++++-------- src/network/qsocketdevice.cpp | 4 ++-- src/network/qsocketdevice_unix.cpp | 24 ++++++++++++------------ 17 files changed, 66 insertions(+), 66 deletions(-) (limited to 'src/network') diff --git a/src/network/ntqdns.h b/src/network/ntqdns.h index c594e3941..76b2d9590 100644 --- a/src/network/ntqdns.h +++ b/src/network/ntqdns.h @@ -54,7 +54,7 @@ #define TQM_EXPORT_DNS Q_EXPORT #endif -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS //#define Q_DNS_SYNCHRONOUS @@ -165,6 +165,6 @@ private slots: virtual void answer(); }; -#endif // QT_NO_DNS +#endif // TQT_NO_DNS #endif // TQDNS_H diff --git a/src/network/ntqftp.h b/src/network/ntqftp.h index e68867ad0..da4a23e88 100644 --- a/src/network/ntqftp.h +++ b/src/network/ntqftp.h @@ -53,7 +53,7 @@ #define TQM_EXPORT_FTP Q_EXPORT #endif -#ifndef QT_NO_NETWORKPROTOCOL_FTP +#ifndef TQT_NO_NETWORKPROTOCOL_FTP class TQSocket; @@ -197,6 +197,6 @@ protected slots: void error( int ); }; -#endif // QT_NO_NETWORKPROTOCOL_FTP +#endif // TQT_NO_NETWORKPROTOCOL_FTP #endif // TQFTP_H diff --git a/src/network/ntqhostaddress.h b/src/network/ntqhostaddress.h index e28e3c206..d8a30af42 100644 --- a/src/network/ntqhostaddress.h +++ b/src/network/ntqhostaddress.h @@ -51,7 +51,7 @@ #define TQM_EXPORT_NETWORK Q_EXPORT #endif -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK class TQHostAddressPrivate; typedef struct { @@ -65,7 +65,7 @@ public: TQHostAddress( TQ_UINT32 ip4Addr ); TQHostAddress( TQ_UINT8 *ip6Addr ); TQHostAddress(const Q_IPV6ADDR &ip6Addr); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST TQHostAddress(const TQString &address); #endif TQHostAddress( const TQHostAddress & ); @@ -75,7 +75,7 @@ public: void setAddress( TQ_UINT32 ip4Addr ); void setAddress( TQ_UINT8 *ip6Addr ); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST bool setAddress( const TQString& address ); #endif bool isIp4Addr() const; // obsolete @@ -86,7 +86,7 @@ public: bool isIPv6Address() const; Q_IPV6ADDR toIPv6Address() const; -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_SPRINTF TQString toString() const; #endif @@ -97,5 +97,5 @@ private: TQHostAddressPrivate* d; }; -#endif //QT_NO_NETWORK +#endif //TQT_NO_NETWORK #endif diff --git a/src/network/ntqhttp.h b/src/network/ntqhttp.h index 98d77bc85..c4c2714a5 100644 --- a/src/network/ntqhttp.h +++ b/src/network/ntqhttp.h @@ -55,7 +55,7 @@ #define TQM_TEMPLATE_EXTERN_HTTP Q_TEMPLATE_EXTERN #endif -#ifndef QT_NO_NETWORKPROTOCOL_HTTP +#ifndef TQT_NO_NETWORKPROTOCOL_HTTP class TQSocket; class TQTimerEvent; diff --git a/src/network/ntqnetwork.h b/src/network/ntqnetwork.h index 800414bf0..b8dabc086 100644 --- a/src/network/ntqnetwork.h +++ b/src/network/ntqnetwork.h @@ -51,7 +51,7 @@ #define TQM_EXPORT_NETWORK Q_EXPORT #endif -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK TQM_EXPORT_NETWORK void tqInitNetworkProtocols(); diff --git a/src/network/ntqserversocket.h b/src/network/ntqserversocket.h index 4da629e67..57ebf341d 100644 --- a/src/network/ntqserversocket.h +++ b/src/network/ntqserversocket.h @@ -46,7 +46,7 @@ #include "ntqhostaddress.h" #include "ntqsocketdevice.h" // ### remove or keep for users' convenience? #endif // QT_H -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK @@ -90,5 +90,5 @@ private: void init( const TQHostAddress & address, TQ_UINT16 port, int backlog ); }; -#endif // QT_NO_NETWORK +#endif // TQT_NO_NETWORK #endif // TQSERVERSOCKET_H diff --git a/src/network/ntqsocket.h b/src/network/ntqsocket.h index e5131926b..3324699fd 100644 --- a/src/network/ntqsocket.h +++ b/src/network/ntqsocket.h @@ -53,7 +53,7 @@ #define TQM_EXPORT_NETWORK Q_EXPORT #endif -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK class TQSocketPrivate; class TQSocketDevice; @@ -82,7 +82,7 @@ public: TQSocketDevice *socketDevice(); virtual void setSocketDevice( TQSocketDevice * ); -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS virtual void connectToHost( const TQString &host, TQ_UINT16 port ); #endif TQString peerName() const; @@ -152,5 +152,5 @@ private: // Disabled copy constructor and operator= #endif }; -#endif //QT_NO_NETWORK +#endif //TQT_NO_NETWORK #endif // TQSOCKET_H diff --git a/src/network/ntqsocketdevice.h b/src/network/ntqsocketdevice.h index bff859343..420cd29ad 100644 --- a/src/network/ntqsocketdevice.h +++ b/src/network/ntqsocketdevice.h @@ -52,7 +52,7 @@ #define TQM_EXPORT_NETWORK Q_EXPORT #endif -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK class TQSocketDevicePrivate; @@ -166,5 +166,5 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_NETWORK +#endif // TQT_NO_NETWORK #endif // TQSOCKETDEVICE_H diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp index 9f370a8ee..780d119ab 100644 --- a/src/network/qdns.cpp +++ b/src/network/qdns.cpp @@ -62,7 +62,7 @@ #include "ntqdns.h" -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS #include "ntqdatetime.h" #include "ntqdict.h" @@ -891,7 +891,7 @@ public: TQPtrVector queries; TQDict cache; TQSocketDevice * ipv4Socket; -#if !defined (QT_NO_IPV6) +#if !defined (TQT_NO_IPV6) TQSocketDevice * ipv6Socket; #endif }; @@ -933,7 +933,7 @@ TQDnsManager::TQDnsManager() queries( TQPtrVector( 0 ) ), cache( TQDict( 83, FALSE ) ), ipv4Socket( new TQSocketDevice( TQSocketDevice::Datagram, TQSocketDevice::IPv4, 0 ) ) -#if !defined (QT_NO_IPV6) +#if !defined (TQT_NO_IPV6) , ipv6Socket( new TQSocketDevice( TQSocketDevice::Datagram, TQSocketDevice::IPv6, 0 ) ) #endif { @@ -952,7 +952,7 @@ TQDnsManager::TQDnsManager() ipv4Socket->setBlocking( FALSE ); connect( rn4, SIGNAL(activated(int)), SLOT(answer()) ); -#if !defined (QT_NO_IPV6) +#if !defined (TQT_NO_IPV6) // Don't connect the IPv6 socket notifier if the host does not // support IPv6. if ( ipv6Socket->socket() != -1 ) { @@ -1028,7 +1028,7 @@ TQDnsManager::~TQDnsManager() queries.setAutoDelete( TRUE ); cache.setAutoDelete( TRUE ); delete ipv4Socket; -#if !defined (QT_NO_IPV6) +#if !defined (TQT_NO_IPV6) delete ipv6Socket; #endif } @@ -1076,7 +1076,7 @@ void TQDnsManager::answer() TQByteArray a( 16383 ); // large enough for anything, one suspects int r; -#if defined (QT_NO_IPV6) +#if defined (TQT_NO_IPV6) r = ipv4Socket->readBlock(a.data(), a.size()); #else if (((TQSocketNotifier *)sender())->socket() == ipv4Socket->socket()) @@ -1085,7 +1085,7 @@ void TQDnsManager::answer() r = ipv6Socket->readBlock(a.data(), a.size()); #endif #if defined(TQDNS_DEBUG) -#if !defined (QT_NO_IPV6) +#if !defined (TQT_NO_IPV6) tqDebug("DNS Manager: answer arrived: %d bytes from %s:%d", r, useIpv4Socket ? ipv4Socket->peerAddress().toString().ascii() : ipv6Socket->peerAddress().toString().ascii(), @@ -1273,7 +1273,7 @@ void TQDnsManager::transmitQuery( int i ) TQHostAddress receiver = *ns->at( q->step % ns->count() ); if (receiver.isIPv4Address()) ipv4Socket->writeBlock( p.data(), pp, receiver, 53 ); -#if !defined (QT_NO_IPV6) +#if !defined (TQT_NO_IPV6) else ipv6Socket->writeBlock( p.data(), pp, receiver, 53 ); #endif @@ -1291,7 +1291,7 @@ void TQDnsManager::transmitQuery( int i ) while( (server=ns->next()) != 0 ) { if (server->isIPv4Address()) ipv4Socket->writeBlock( p.data(), pp, *server, 53 ); -#if !defined (QT_NO_IPV6) +#if !defined (TQT_NO_IPV6) else ipv6Socket->writeBlock( p.data(), pp, *server, 53 ); #endif @@ -2691,4 +2691,4 @@ void TQDns::doResInit() #endif -#endif // QT_NO_DNS +#endif // TQT_NO_DNS diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp index 31f07de30..f31029321 100644 --- a/src/network/qftp.cpp +++ b/src/network/qftp.cpp @@ -40,7 +40,7 @@ #include "ntqftp.h" -#ifndef QT_NO_NETWORKPROTOCOL_FTP +#ifndef TQT_NO_NETWORKPROTOCOL_FTP #include "ntqsocket.h" #include "ntqsocketdevice.h" @@ -52,7 +52,7 @@ #include "ntqfileinfo.h" #include "ntqptrdict.h" // binary compatibility -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC #include "ntqtextcodec.h" #endif @@ -935,7 +935,7 @@ bool TQFtpPI::processReply() return TRUE; } -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC TQM_EXPORT_FTP TQTextCodec *tqt_ftp_filename_codec = 0; #endif @@ -964,7 +964,7 @@ bool TQFtpPI::startNextCmd() tqDebug( "TQFtpPI send: %s", currentCmd.left( currentCmd.length()-2 ).latin1() ); #endif state = Waiting; -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( tqt_ftp_filename_codec ) { int len = 0; TQCString enc = tqt_ftp_filename_codec->fromUnicode(currentCmd,len); @@ -2416,4 +2416,4 @@ void TQFtp::error( int ) #include "qftp.moc" -#endif // QT_NO_NETWORKPROTOCOL_FTP +#endif // TQT_NO_NETWORKPROTOCOL_FTP diff --git a/src/network/qhostaddress.cpp b/src/network/qhostaddress.cpp index fdbc0e395..be6cb3ba6 100644 --- a/src/network/qhostaddress.cpp +++ b/src/network/qhostaddress.cpp @@ -41,7 +41,7 @@ #include "ntqhostaddress.h" #include "ntqstringlist.h" -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK class TQHostAddressPrivate { public: @@ -209,7 +209,7 @@ void TQHostAddress::setAddress( TQ_UINT8 *ip6Addr ) d = new TQHostAddressPrivate( ip6Addr ); } -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static bool parseIp4(const TQString& address, TQ_UINT32 *addr) { TQStringList ipv4 = TQStringList::split(".", address, FALSE); @@ -390,7 +390,7 @@ Q_IPV6ADDR TQHostAddress::toIPv6Address() const return d->a6; } -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_SPRINTF /*! Returns the address as a string. @@ -450,4 +450,4 @@ bool TQHostAddress::isNull() const return TRUE; } -#endif //QT_NO_NETWORK +#endif //TQT_NO_NETWORK diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp index af50e8cef..393cc18c0 100644 --- a/src/network/qhttp.cpp +++ b/src/network/qhttp.cpp @@ -40,7 +40,7 @@ #include "ntqhttp.h" -#ifndef QT_NO_NETWORKPROTOCOL_HTTP +#ifndef TQT_NO_NETWORKPROTOCOL_HTTP #include "ntqsocket.h" #include "ntqtextstream.h" diff --git a/src/network/qnetwork.cpp b/src/network/qnetwork.cpp index 47c1c7ad5..f0af49fef 100644 --- a/src/network/qnetwork.cpp +++ b/src/network/qnetwork.cpp @@ -40,7 +40,7 @@ #include "ntqnetwork.h" -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK #include "ntqnetworkprotocol.h" @@ -60,12 +60,12 @@ */ void tqInitNetworkProtocols() { -#ifndef QT_NO_NETWORKPROTOCOL_FTP +#ifndef TQT_NO_NETWORKPROTOCOL_FTP TQNetworkProtocol::registerNetworkProtocol( "ftp", new TQNetworkProtocolFactory< TQFtp > ); #endif -#ifndef QT_NO_NETWORKPROTOCOL_HTTP +#ifndef TQT_NO_NETWORKPROTOCOL_HTTP TQNetworkProtocol::registerNetworkProtocol( "http", new TQNetworkProtocolFactory< TQHttp > ); #endif } -#endif // QT_NO_NETWORK +#endif // TQT_NO_NETWORK diff --git a/src/network/qserversocket.cpp b/src/network/qserversocket.cpp index 97dd95594..8fd1b7bfb 100644 --- a/src/network/qserversocket.cpp +++ b/src/network/qserversocket.cpp @@ -40,7 +40,7 @@ #include "ntqserversocket.h" -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK #include "ntqsocketnotifier.h" @@ -294,4 +294,4 @@ void TQServerSocket::setSocket( int socket ) this, SLOT(incomingConnection(int)) ); } -#endif //QT_NO_NETWORK +#endif //TQT_NO_NETWORK diff --git a/src/network/qsocket.cpp b/src/network/qsocket.cpp index fe6e0b6c0..a612867be 100644 --- a/src/network/qsocket.cpp +++ b/src/network/qsocket.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqsocket.h" -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK #include "ntqptrlist.h" #include "ntqtimer.h" #include "ntqsocketdevice.h" @@ -133,7 +133,7 @@ public: TQValueList addresses; // alternatives looked up TQIODevice::Offset wsize; // write total buf size TQIODevice::Offset windex; // write index -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS TQDns *dns4; TQDns *dns6; #endif @@ -148,7 +148,7 @@ TQSocketPrivate::TQSocketPrivate() : state(TQSocket::Idle), host(TQString::fromLatin1("")), port(0), socket(0), rsn(0), wsn(0), readBufferSize(0), wsize(0), windex(0) { -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS dns4 = 0; dns6 = 0; #endif @@ -159,7 +159,7 @@ TQSocketPrivate::~TQSocketPrivate() { close(); delete socket; -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS delete dns4; delete dns6; #endif @@ -388,7 +388,7 @@ TQSocket::State TQSocket::state() const } -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS /*! Attempts to make a connection to \a host on the specified \a port @@ -446,7 +446,7 @@ void TQSocket::tryConnecting() #endif // ### this ifdef isn't correct - addresses() also does /etc/hosts and // numeric-address-as-string handling. -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS if ( d->dns4 ) { d->l4 = d->dns4->addresses(); @@ -1430,7 +1430,7 @@ void TQSocket::setSocketIntern( int socket ) // hm... this is not very nice. d->host = TQString::null; d->port = 0; -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS delete d->dns4; d->dns4 = 0; delete d->dns6; @@ -1543,4 +1543,4 @@ TQ_ULONG TQSocket::readBufferSize() const return d->readBufferSize; } -#endif //QT_NO_NETWORK +#endif //TQT_NO_NETWORK diff --git a/src/network/qsocketdevice.cpp b/src/network/qsocketdevice.cpp index a2055899d..803cca84b 100644 --- a/src/network/qsocketdevice.cpp +++ b/src/network/qsocketdevice.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqsocketdevice.h" -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK #include "ntqwindowdefs.h" #include @@ -572,5 +572,5 @@ void TQSocketDevice::setError( Error err ) { e = err; } -#endif //QT_NO_NETWORK +#endif //TQT_NO_NETWORK diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp index 565ab7d3b..9ac0b605e 100644 --- a/src/network/qsocketdevice_unix.cpp +++ b/src/network/qsocketdevice_unix.cpp @@ -82,7 +82,7 @@ static inline int qt_socket_socket(int domain, int type, int protocol) #include "ntqsocketdevice.h" -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK #include "ntqwindowdefs.h" @@ -93,7 +93,7 @@ static inline int qt_socket_socket(int domain, int type, int protocol) static inline void qt_socket_getportaddr( struct sockaddr *sa, TQ_UINT16 *port, TQHostAddress *addr ) { -#if !defined(QT_NO_IPV6) +#if !defined(TQT_NO_IPV6) if ( sa->sa_family == AF_INET6 ) { struct sockaddr_in6 *sa6 = ( struct sockaddr_in6 * )sa; Q_IPV6ADDR tmp; @@ -123,14 +123,14 @@ void TQSocketDevice::init() TQSocketDevice::Protocol TQSocketDevice::getProtocol() const { if ( isValid() ) { -#if !defined (QT_NO_IPV6) +#if !defined (TQT_NO_IPV6) struct sockaddr_storage sa; #else struct sockaddr sa; #endif memset( &sa, 0, sizeof(sa) ); QT_SOCKLEN_T sz = sizeof( sa ); -#if !defined (QT_NO_IPV6) +#if !defined (TQT_NO_IPV6) struct sockaddr *sap = reinterpret_cast(&sa); if ( !::getsockname(fd, sap, &sz) ) { switch ( sap->sa_family ) { @@ -165,7 +165,7 @@ TQSocketDevice::Protocol TQSocketDevice::getProtocol() const int TQSocketDevice::createNewSocket() { -#if !defined(QT_NO_IPV6) +#if !defined(TQT_NO_IPV6) int s = qt_socket_socket( protocol() == IPv6 ? AF_INET6 : AF_INET, t == Datagram ? SOCK_DGRAM : SOCK_STREAM, 0 ); #else @@ -414,7 +414,7 @@ bool TQSocketDevice::connect( const TQHostAddress &addr, TQ_UINT16 port ) struct sockaddr *aa; QT_SOCKLEN_T aalen; -#if !defined(QT_NO_IPV6) +#if !defined(TQT_NO_IPV6) struct sockaddr_in6 a6; if ( addr.isIPv6Address() ) { @@ -499,7 +499,7 @@ bool TQSocketDevice::bind( const TQHostAddress &address, TQ_UINT16 port ) return FALSE; int r; struct sockaddr_in a4; -#if !defined(QT_NO_IPV6) +#if !defined(TQT_NO_IPV6) struct sockaddr_in6 a6; if ( address.isIPv6Address() ) { @@ -593,7 +593,7 @@ int TQSocketDevice::accept() if ( !isValid() ) return -1; -#if !defined (QT_NO_IPV6) +#if !defined (TQT_NO_IPV6) struct sockaddr_storage aa; #else struct sockaddr aa; @@ -781,7 +781,7 @@ TQ_LONG TQSocketDevice::readBlock( char *data, TQ_ULONG maxlen ) int r = 0; while ( done == FALSE ) { if ( t == Datagram ) { -#if !defined(QT_NO_IPV6) +#if !defined(TQT_NO_IPV6) struct sockaddr_storage aa; #else struct sockaddr_in aa; @@ -971,7 +971,7 @@ TQ_LONG TQSocketDevice::writeBlock( const char * data, TQ_ULONG len, struct sockaddr_in a4; struct sockaddr *aa; QT_SOCKLEN_T slen; -#if !defined(QT_NO_IPV6) +#if !defined(TQT_NO_IPV6) struct sockaddr_in6 a6; if ( host.isIPv6Address() ) { memset( &a6, 0, sizeof(a6) ); @@ -1052,7 +1052,7 @@ void TQSocketDevice::fetchConnectionParameters() pa = TQHostAddress(); return; } -#if !defined(QT_NO_IPV6) +#if !defined(TQT_NO_IPV6) struct sockaddr_storage sa; #else struct sockaddr_in sa; @@ -1096,4 +1096,4 @@ TQHostAddress TQSocketDevice::peerAddress() const return pa; } -#endif //QT_NO_NETWORK +#endif //TQT_NO_NETWORK -- cgit v1.2.1