summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
Diffstat (limited to 'src/network')
-rw-r--r--src/network/qt_network.pri36
-rw-r--r--src/network/tqdns.cpp (renamed from src/network/qdns.cpp)18
-rw-r--r--src/network/tqdns.h (renamed from src/network/ntqdns.h)4
-rw-r--r--src/network/tqftp.cpp (renamed from src/network/qftp.cpp)16
-rw-r--r--src/network/tqftp.h (renamed from src/network/ntqftp.h)4
-rw-r--r--src/network/tqhostaddress.cpp (renamed from src/network/qhostaddress.cpp)4
-rw-r--r--src/network/tqhostaddress.h (renamed from src/network/ntqhostaddress.h)0
-rw-r--r--src/network/tqhttp.cpp (renamed from src/network/qhttp.cpp)16
-rw-r--r--src/network/tqhttp.h (renamed from src/network/ntqhttp.h)2
-rw-r--r--src/network/tqnetwork.cpp (renamed from src/network/qnetwork.cpp)12
-rw-r--r--src/network/tqnetwork.h (renamed from src/network/ntqnetwork.h)0
-rw-r--r--src/network/tqserversocket.cpp (renamed from src/network/qserversocket.cpp)6
-rw-r--r--src/network/tqserversocket.h (renamed from src/network/ntqserversocket.h)4
-rw-r--r--src/network/tqsocket.cpp (renamed from src/network/qsocket.cpp)8
-rw-r--r--src/network/tqsocket.h (renamed from src/network/ntqsocket.h)4
-rw-r--r--src/network/tqsocketdevice.cpp (renamed from src/network/qsocketdevice.cpp)4
-rw-r--r--src/network/tqsocketdevice.h (renamed from src/network/ntqsocketdevice.h)4
-rw-r--r--src/network/tqsocketdevice_unix.cpp (renamed from src/network/qsocketdevice_unix.cpp)2
18 files changed, 72 insertions, 72 deletions
diff --git a/src/network/qt_network.pri b/src/network/qt_network.pri
index e5f17a996..72b7642af 100644
--- a/src/network/qt_network.pri
+++ b/src/network/qt_network.pri
@@ -1,23 +1,23 @@
# TQt network module
network {
- HEADERS += $$NETWORK_H/ntqdns.h \
- $$NETWORK_H/ntqftp.h \
- $$NETWORK_H/ntqhttp.h \
- $$NETWORK_H/ntqhostaddress.h \
- $$NETWORK_H/ntqnetwork.h \
- $$NETWORK_H/ntqserversocket.h \
- $$NETWORK_H/ntqsocket.h \
- $$NETWORK_H/ntqsocketdevice.h
- NETWORK_SOURCES = $$NETWORK_CPP/qdns.cpp \
- $$NETWORK_CPP/qftp.cpp \
- $$NETWORK_CPP/qhttp.cpp \
- $$NETWORK_CPP/qhostaddress.cpp \
- $$NETWORK_CPP/qnetwork.cpp \
- $$NETWORK_CPP/qserversocket.cpp \
- $$NETWORK_CPP/qsocket.cpp \
- $$NETWORK_CPP/qsocketdevice.cpp
- unix:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_unix.cpp
- win32:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_win.cpp
+ HEADERS += $$NETWORK_H/tqdns.h \
+ $$NETWORK_H/tqftp.h \
+ $$NETWORK_H/tqhttp.h \
+ $$NETWORK_H/tqhostaddress.h \
+ $$NETWORK_H/tqnetwork.h \
+ $$NETWORK_H/tqserversocket.h \
+ $$NETWORK_H/tqsocket.h \
+ $$NETWORK_H/tqsocketdevice.h
+ NETWORK_SOURCES = $$NETWORK_CPP/tqdns.cpp \
+ $$NETWORK_CPP/tqftp.cpp \
+ $$NETWORK_CPP/tqhttp.cpp \
+ $$NETWORK_CPP/tqhostaddress.cpp \
+ $$NETWORK_CPP/tqnetwork.cpp \
+ $$NETWORK_CPP/tqserversocket.cpp \
+ $$NETWORK_CPP/tqsocket.cpp \
+ $$NETWORK_CPP/tqsocketdevice.cpp
+ unix:NETWORK_SOURCES += $$NETWORK_CPP/tqsocketdevice_unix.cpp
+ win32:NETWORK_SOURCES += $$NETWORK_CPP/tqsocketdevice_win.cpp
SOURCES += $$NETWORK_SOURCES
}
diff --git a/src/network/qdns.cpp b/src/network/tqdns.cpp
index 7ae3a53f4..4b215eb1d 100644
--- a/src/network/qdns.cpp
+++ b/src/network/tqdns.cpp
@@ -60,7 +60,7 @@
# undef socket
#endif
-#include "ntqdns.h"
+#include "tqdns.h"
#ifndef TQT_NO_DNS
@@ -73,9 +73,9 @@
#include "tqptrvector.h"
#include "tqstrlist.h"
#include "tqptrdict.h"
-#include "ntqfile.h"
+#include "tqfile.h"
#include "tqtextstream.h"
-#include "ntqsocketdevice.h"
+#include "tqsocketdevice.h"
#include "ntqcleanuphandler.h"
#include <limits.h>
#ifdef Q_OS_MAC
@@ -89,7 +89,7 @@ static TQ_UINT16 id; // ### seeded started by now()
static TQDateTime * originOfTime = 0;
-static TQCleanupHandler<TQDateTime> qdns_cleanup_time;
+static TQCleanupHandler<TQDateTime> tqdns_cleanup_time;
static TQ_UINT32 now()
{
@@ -98,7 +98,7 @@ static TQ_UINT32 now()
originOfTime = new TQDateTime( TQDateTime::currentDateTime() );
::id = originOfTime->time().msec() * 60 + originOfTime->time().second();
- qdns_cleanup_time.add( &originOfTime );
+ tqdns_cleanup_time.add( &originOfTime );
return 0;
}
@@ -113,7 +113,7 @@ static bool ipv6support = FALSE;
#if defined(Q_MODERN_RES_API)
#else
-static int qdns_res_init()
+static int tqdns_res_init()
{
#ifdef Q_OS_MAC
typedef int (*PtrRes_init)();
@@ -1605,7 +1605,7 @@ void TQDnsSocket::answer()
/*!
- \class TQDns ntqdns.h
+ \class TQDns tqdns.h
\brief The TQDns class provides asynchronous DNS lookups.
\if defined(commercial)
It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -2321,7 +2321,7 @@ typedef struct {
#endif
typedef DWORD (WINAPI *GNP)( PFIXED_INFO, PULONG );
-// ### FIXME: this code is duplicated in qfiledialog.cpp
+// ### FIXME: this code is duplicated in tqfiledialog.cpp
static TQString getWindowsRegString( HKEY key, const TQString &subKey )
{
TQString s;
@@ -2612,7 +2612,7 @@ void TQDns::doResInit()
if ( *res.defdname )
domains->append( TQString::fromLatin1( res.defdname ).lower() );
#else
- qdns_res_init();
+ tqdns_res_init();
int i;
// find the name servers to use
for( i=0; i < MAXNS && i < _res.nscount; i++ )
diff --git a/src/network/ntqdns.h b/src/network/tqdns.h
index 491b6fce5..703edb229 100644
--- a/src/network/ntqdns.h
+++ b/src/network/tqdns.h
@@ -43,8 +43,8 @@
#ifndef QT_H
#include "tqobject.h"
-#include "ntqhostaddress.h"
-#include "ntqsocketnotifier.h"
+#include "tqhostaddress.h"
+#include "tqsocketnotifier.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/src/network/qftp.cpp b/src/network/tqftp.cpp
index 259e7826a..8c7dbb184 100644
--- a/src/network/qftp.cpp
+++ b/src/network/tqftp.cpp
@@ -38,18 +38,18 @@
**
**********************************************************************/
-#include "ntqftp.h"
+#include "tqftp.h"
#ifndef TQT_NO_NETWORKPROTOCOL_FTP
-#include "ntqsocket.h"
-#include "ntqsocketdevice.h"
-#include "ntqurlinfo.h"
-#include "ntqurloperator.h"
+#include "tqsocket.h"
+#include "tqsocketdevice.h"
+#include "tqurlinfo.h"
+#include "tqurloperator.h"
#include "tqstringlist.h"
#include "tqregexp.h"
#include "tqtimer.h"
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
#include "tqptrdict.h" // binary compatibility
#ifndef TQT_NO_TEXTCODEC
@@ -1062,7 +1062,7 @@ static void delete_d( const TQFtp* foo )
*
*********************************************************************/
/*!
- \class TQFtp ntqftp.h
+ \class TQFtp tqftp.h
\brief The TQFtp class provides an implementation of the FTP protocol.
\if defined(commercial)
It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -2412,6 +2412,6 @@ void TQFtp::error( int )
{
}
-#include "qftp.moc"
+#include "tqftp.moc"
#endif // TQT_NO_NETWORKPROTOCOL_FTP
diff --git a/src/network/ntqftp.h b/src/network/tqftp.h
index 91100e39d..593b21fc0 100644
--- a/src/network/ntqftp.h
+++ b/src/network/tqftp.h
@@ -43,8 +43,8 @@
#ifndef QT_H
#include "tqstring.h" // char*->TQString conversion
-#include "ntqurlinfo.h"
-#include "ntqnetworkprotocol.h"
+#include "tqurlinfo.h"
+#include "tqnetworkprotocol.h"
#endif // QT_H
#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qhostaddress.cpp b/src/network/tqhostaddress.cpp
index 5ea478175..07d08c492 100644
--- a/src/network/qhostaddress.cpp
+++ b/src/network/tqhostaddress.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqhostaddress.h"
+#include "tqhostaddress.h"
#include "tqstringlist.h"
#ifndef TQT_NO_NETWORK
@@ -83,7 +83,7 @@ TQHostAddressPrivate::TQHostAddressPrivate(const Q_IPV6ADDR &a_) : a(0), isIp4(F
}
/*!
- \class TQHostAddress ntqhostaddress.h
+ \class TQHostAddress tqhostaddress.h
\brief The TQHostAddress class provides an IP address.
\if defined(commercial)
It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/ntqhostaddress.h b/src/network/tqhostaddress.h
index 0d5a884df..0d5a884df 100644
--- a/src/network/ntqhostaddress.h
+++ b/src/network/tqhostaddress.h
diff --git a/src/network/qhttp.cpp b/src/network/tqhttp.cpp
index 9569b2080..6bf6f1740 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/tqhttp.cpp
@@ -38,18 +38,18 @@
**
**********************************************************************/
-#include "ntqhttp.h"
+#include "tqhttp.h"
#ifndef TQT_NO_NETWORKPROTOCOL_HTTP
-#include "ntqsocket.h"
+#include "tqsocket.h"
#include "tqtextstream.h"
#include "tqmap.h"
#include "tqstring.h"
#include "tqstringlist.h"
#include "tqcstring.h"
-#include "ntqbuffer.h"
-#include "ntqurloperator.h"
+#include "tqbuffer.h"
+#include "tqurloperator.h"
#include "tqtimer.h"
#include "private/qinternal_p.h"
@@ -332,7 +332,7 @@ void TQHttpCloseRequest::start( TQHttp *http )
****************************************************/
/*!
- \class TQHttpHeader ntqhttp.h
+ \class TQHttpHeader tqhttp.h
\brief The TQHttpHeader class contains header information for HTTP.
\if defined(commercial)
It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -674,7 +674,7 @@ void TQHttpHeader::setContentType( const TQString& type )
****************************************************/
/*!
- \class TQHttpResponseHeader ntqhttp.h
+ \class TQHttpResponseHeader tqhttp.h
\brief The TQHttpResponseHeader class contains response header information for HTTP.
\if defined(commercial)
It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -837,7 +837,7 @@ TQString TQHttpResponseHeader::toString() const
****************************************************/
/*!
- \class TQHttpRequestHeader ntqhttp.h
+ \class TQHttpRequestHeader tqhttp.h
\brief The TQHttpRequestHeader class contains request header information for
\if defined(commercial)
It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -1011,7 +1011,7 @@ TQString TQHttpRequestHeader::toString() const
*
****************************************************/
/*!
- \class TQHttp ntqhttp.h
+ \class TQHttp tqhttp.h
\brief The TQHttp class provides an implementation of the HTTP protocol.
\if defined(commercial)
It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/ntqhttp.h b/src/network/tqhttp.h
index 9a2667d7b..f1e68454f 100644
--- a/src/network/ntqhttp.h
+++ b/src/network/tqhttp.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "tqobject.h"
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/src/network/qnetwork.cpp b/src/network/tqnetwork.cpp
index f0af49fef..8da37cb6c 100644
--- a/src/network/qnetwork.cpp
+++ b/src/network/tqnetwork.cpp
@@ -38,17 +38,17 @@
**
**********************************************************************/
-#include "ntqnetwork.h"
+#include "tqnetwork.h"
#ifndef TQT_NO_NETWORK
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
// protocols
-#include "ntqftp.h"
-#include "ntqhttp.h"
+#include "tqftp.h"
+#include "tqhttp.h"
-/*! \file ntqnetwork.h */
+/*! \file tqnetwork.h */
/*!
\relates TQUrlOperator
@@ -56,7 +56,7 @@
You must call this function before you use TQUrlOperator for
these protocols.
- This function is declared in \l ntqnetwork.h.
+ This function is declared in \l tqnetwork.h.
*/
void tqInitNetworkProtocols()
{
diff --git a/src/network/ntqnetwork.h b/src/network/tqnetwork.h
index 7f6de06d3..7f6de06d3 100644
--- a/src/network/ntqnetwork.h
+++ b/src/network/tqnetwork.h
diff --git a/src/network/qserversocket.cpp b/src/network/tqserversocket.cpp
index 44728d742..456add216 100644
--- a/src/network/qserversocket.cpp
+++ b/src/network/tqserversocket.cpp
@@ -38,11 +38,11 @@
**
**********************************************************************/
-#include "ntqserversocket.h"
+#include "tqserversocket.h"
#ifndef TQT_NO_NETWORK
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
class TQServerSocketPrivate {
public:
@@ -54,7 +54,7 @@ public:
/*!
- \class TQServerSocket ntqserversocket.h
+ \class TQServerSocket tqserversocket.h
\brief The TQServerSocket class provides a TCP-based server.
\if defined(commercial)
It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/ntqserversocket.h b/src/network/tqserversocket.h
index ab9c242ed..2ceefb41e 100644
--- a/src/network/ntqserversocket.h
+++ b/src/network/tqserversocket.h
@@ -43,8 +43,8 @@
#ifndef QT_H
#include "tqobject.h"
-#include "ntqhostaddress.h"
-#include "ntqsocketdevice.h" // ### remove or keep for users' convenience?
+#include "tqhostaddress.h"
+#include "tqsocketdevice.h" // ### remove or keep for users' convenience?
#endif // QT_H
#ifndef TQT_NO_NETWORK
diff --git a/src/network/qsocket.cpp b/src/network/tqsocket.cpp
index 17050c9c1..3a088c514 100644
--- a/src/network/qsocket.cpp
+++ b/src/network/tqsocket.cpp
@@ -38,12 +38,12 @@
**
**********************************************************************/
-#include "ntqsocket.h"
+#include "tqsocket.h"
#ifndef TQT_NO_NETWORK
#include "tqptrlist.h"
#include "tqtimer.h"
-#include "ntqsocketdevice.h"
-#include "ntqdns.h"
+#include "tqsocketdevice.h"
+#include "tqdns.h"
#include "private/qinternal_p.h"
#include <string.h>
@@ -224,7 +224,7 @@ void TQSocketPrivate::setSocketDevice( TQSocket *q, TQSocketDevice *device )
}
/*!
- \class TQSocket ntqsocket.h
+ \class TQSocket tqsocket.h
\brief The TQSocket class provides a buffered TCP connection.
\if defined(commercial)
It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/ntqsocket.h b/src/network/tqsocket.h
index 4946e81f5..5af4a21ab 100644
--- a/src/network/ntqsocket.h
+++ b/src/network/tqsocket.h
@@ -43,8 +43,8 @@
#ifndef QT_H
#include "tqobject.h"
-#include "ntqiodevice.h"
-#include "ntqhostaddress.h" // int->TQHostAddress conversion
+#include "tqiodevice.h"
+#include "tqhostaddress.h" // int->TQHostAddress conversion
#endif // QT_H
#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qsocketdevice.cpp b/src/network/tqsocketdevice.cpp
index 803cca84b..1c6ce552f 100644
--- a/src/network/qsocketdevice.cpp
+++ b/src/network/tqsocketdevice.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqsocketdevice.h"
+#include "tqsocketdevice.h"
#ifndef TQT_NO_NETWORK
#include "ntqwindowdefs.h"
@@ -60,7 +60,7 @@ public:
/*!
- \class TQSocketDevice ntqsocketdevice.h
+ \class TQSocketDevice tqsocketdevice.h
\brief The TQSocketDevice class provides a platform-independent low-level socket API.
\if defined(commercial)
It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/ntqsocketdevice.h b/src/network/tqsocketdevice.h
index cad469017..b87dbc07d 100644
--- a/src/network/ntqsocketdevice.h
+++ b/src/network/tqsocketdevice.h
@@ -42,8 +42,8 @@
#define TQSOCKETDEVICE_H
#ifndef QT_H
-#include "ntqiodevice.h"
-#include "ntqhostaddress.h" // int->TQHostAddress conversion
+#include "tqiodevice.h"
+#include "tqhostaddress.h" // int->TQHostAddress conversion
#endif // QT_H
#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/tqsocketdevice_unix.cpp
index 9ac0b605e..0727f6a14 100644
--- a/src/network/qsocketdevice_unix.cpp
+++ b/src/network/tqsocketdevice_unix.cpp
@@ -80,7 +80,7 @@ static inline int qt_socket_socket(int domain, int type, int protocol)
# undef socket
#endif
-#include "ntqsocketdevice.h"
+#include "tqsocketdevice.h"
#ifndef TQT_NO_NETWORK