diff options
Diffstat (limited to 'tdecore')
29 files changed, 71 insertions, 71 deletions
diff --git a/tdecore/network/CMakeLists.txt b/tdecore/network/CMakeLists.txt index 101da4843..addc3633b 100644 --- a/tdecore/network/CMakeLists.txt +++ b/tdecore/network/CMakeLists.txt @@ -21,8 +21,8 @@ include_directories( ##### headers ################################### install( FILES - kresolver.h kreverseresolver.h ksocketaddress.h - ksocketbase.h ksocketdevice.h kclientsocketbase.h + kresolver.h kreverseresolver.h tdesocketaddress.h + tdesocketbase.h tdesocketdevice.h kclientsocketbase.h kstreamsocket.h kserversocket.h kdatagramsocket.h kmulticastsocketdevice.h kmulticastsocket.h knetworkinterface.h khttpproxysocketdevice.h @@ -41,11 +41,11 @@ set( target tdecorenetwork ) set( ${target}_SRCS kresolver.cpp kresolvermanager.cpp kresolverworkerbase.cpp - ksocketaddress.cpp kresolverstandardworkers.cpp - kreverseresolver.cpp ksocketdevice.cpp ksocketbase.cpp + tdesocketaddress.cpp kresolverstandardworkers.cpp + kreverseresolver.cpp tdesocketdevice.cpp tdesocketbase.cpp kclientsocketbase.cpp kstreamsocket.cpp kserversocket.cpp kdatagramsocket.cpp khttpproxysocketdevice.cpp - ksockssocketdevice.cpp kbufferedsocket.cpp ksocketbuffer.cpp + ksockssocketdevice.cpp kbufferedsocket.cpp tdesocketbuffer.cpp ksrvresolverworker.cpp ) diff --git a/tdecore/network/Makefile.am b/tdecore/network/Makefile.am index f686a50ca..768180d1b 100644 --- a/tdecore/network/Makefile.am +++ b/tdecore/network/Makefile.am @@ -10,15 +10,15 @@ INCLUDES = $(all_includes) # the library search path. # convenience lib - no LDFLAGS or LIBADD ! # Note: -# ksocketdevice.cpp must appear before any inclusion of ksocketdevice.h +# tdesocketdevice.cpp must appear before any inclusion of tdesocketdevice.h libtdecorenetwork_la_SOURCES = kresolver.cpp \ kresolvermanager.cpp \ kresolverworkerbase.cpp \ - ksocketaddress.cpp \ + tdesocketaddress.cpp \ kresolverstandardworkers.cpp \ kreverseresolver.cpp \ - ksocketdevice.cpp \ - ksocketbase.cpp \ + tdesocketdevice.cpp \ + tdesocketbase.cpp \ kclientsocketbase.cpp \ kstreamsocket.cpp \ kserversocket.cpp \ @@ -26,14 +26,14 @@ libtdecorenetwork_la_SOURCES = kresolver.cpp \ khttpproxysocketdevice.cpp \ ksockssocketdevice.cpp \ kbufferedsocket.cpp \ - ksocketbuffer.cpp \ + tdesocketbuffer.cpp \ ksrvresolverworker.cpp include_HEADERS = kresolver.h \ kreverseresolver.h \ - ksocketaddress.h \ - ksocketbase.h \ - ksocketdevice.h \ + tdesocketaddress.h \ + tdesocketbase.h \ + tdesocketdevice.h \ kclientsocketbase.h \ kstreamsocket.h \ kserversocket.h \ @@ -48,7 +48,7 @@ include_HEADERS = kresolver.h \ noinst_HEADERS = kresolver_p.h \ kresolverworkerbase.h \ kresolverstandardworkers_p.h \ - ksocketbuffer_p.h \ + tdesocketbuffer_p.h \ ksrvresolverworker_p.h \ syssocket.h diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp index ffac2e98b..3566bde93 100644 --- a/tdecore/network/kbufferedsocket.cpp +++ b/tdecore/network/kbufferedsocket.cpp @@ -27,9 +27,9 @@ #include <tqmutex.h> #include <tqtimer.h> -#include "ksocketdevice.h" -#include "ksocketaddress.h" -#include "ksocketbuffer_p.h" +#include "tdesocketdevice.h" +#include "tdesocketaddress.h" +#include "tdesocketbuffer_p.h" #include "kbufferedsocket.h" using namespace KNetwork; diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp index f8f993a08..780a5ec71 100644 --- a/tdecore/network/kclientsocketbase.cpp +++ b/tdecore/network/kclientsocketbase.cpp @@ -28,10 +28,10 @@ #include <tqtimer.h> #include <tqmutex.h> -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #include "kresolver.h" -#include "ksocketbase.h" -#include "ksocketdevice.h" +#include "tdesocketbase.h" +#include "tdesocketdevice.h" #include "kclientsocketbase.h" using namespace KNetwork; diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h index 55f12a99c..ceb5cf118 100644 --- a/tdecore/network/kclientsocketbase.h +++ b/tdecore/network/kclientsocketbase.h @@ -28,7 +28,7 @@ #include <tqobject.h> #include <tqstring.h> -#include "ksocketbase.h" +#include "tdesocketbase.h" #include "kresolver.h" #include <tdelibs_export.h> diff --git a/tdecore/network/kdatagramsocket.cpp b/tdecore/network/kdatagramsocket.cpp index d4bddc543..c5a1562a4 100644 --- a/tdecore/network/kdatagramsocket.cpp +++ b/tdecore/network/kdatagramsocket.cpp @@ -27,9 +27,9 @@ #include <sys/types.h> #include <sys/socket.h> -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #include "kresolver.h" -#include "ksocketdevice.h" +#include "tdesocketdevice.h" #include "kdatagramsocket.h" using namespace KNetwork; diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h index 62b17a0c3..e68119276 100644 --- a/tdecore/network/kdatagramsocket.h +++ b/tdecore/network/kdatagramsocket.h @@ -27,7 +27,7 @@ #include <tqcstring.h> -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #include "kclientsocketbase.h" namespace KNetwork { diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp index f61559bfb..15a7482ad 100644 --- a/tdecore/network/khttpproxysocketdevice.cpp +++ b/tdecore/network/khttpproxysocketdevice.cpp @@ -31,8 +31,8 @@ #include <tqcstring.h> #include "kresolver.h" -#include "ksocketaddress.h" -#include "ksocketdevice.h" +#include "tdesocketaddress.h" +#include "tdesocketdevice.h" #include "khttpproxysocketdevice.h" using namespace KNetwork; diff --git a/tdecore/network/khttpproxysocketdevice.h b/tdecore/network/khttpproxysocketdevice.h index 65c2a8f4f..903d7aa6f 100644 --- a/tdecore/network/khttpproxysocketdevice.h +++ b/tdecore/network/khttpproxysocketdevice.h @@ -25,7 +25,7 @@ #ifndef KHTTPPROXYSOCKETDEVICE_H #define KHTTPPROXYSOCKETDEVICE_H -#include "ksocketdevice.h" +#include "tdesocketdevice.h" namespace KNetwork { diff --git a/tdecore/network/kmulticastsocketdevice.h b/tdecore/network/kmulticastsocketdevice.h index 7710fe5c1..ffb567ff1 100644 --- a/tdecore/network/kmulticastsocketdevice.h +++ b/tdecore/network/kmulticastsocketdevice.h @@ -25,9 +25,9 @@ #ifndef KMULTICASTSOCKETDEVICE_H #define KMULTICASTSOCKETDEVICE_H -#include "ksocketdevice.h" +#include "tdesocketdevice.h" #include "knetworkinterface.h" -#include "ksocketaddress.h" +#include "tdesocketaddress.h" namespace KNetwork { diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp index 672edb5af..cb2e21996 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -59,7 +59,7 @@ // Us #include "kresolver.h" #include "kresolver_p.h" -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #ifdef NEED_MUTEX #warning "mutex" diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h index e2e08623b..6ae6a26c4 100644 --- a/tdecore/network/kresolver.h +++ b/tdecore/network/kresolver.h @@ -29,7 +29,7 @@ // Needed includes #include <tqvaluelist.h> #include <tqobject.h> -#include "ksocketaddress.h" +#include "tdesocketaddress.h" //////////////////////// diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp index a6f4e4ec0..a295335b5 100644 --- a/tdecore/network/kresolverstandardworkers.cpp +++ b/tdecore/network/kresolverstandardworkers.cpp @@ -49,7 +49,7 @@ #include "kapplication.h" #include "kresolver.h" -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #include "kresolverstandardworkers_p.h" struct hostent; diff --git a/tdecore/network/kreverseresolver.cpp b/tdecore/network/kreverseresolver.cpp index 5c602458c..20ec41b1d 100644 --- a/tdecore/network/kreverseresolver.cpp +++ b/tdecore/network/kreverseresolver.cpp @@ -39,7 +39,7 @@ #include "kreverseresolver.h" #include "kresolver_p.h" #include "kresolverworkerbase.h" -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #ifndef HAVE_GETNAMEINFO // FIXME KDE4: diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h index 044606a63..5c9e95779 100644 --- a/tdecore/network/kreverseresolver.h +++ b/tdecore/network/kreverseresolver.h @@ -30,7 +30,7 @@ #include <tqobject.h> #include <tqstring.h> -#include "ksocketaddress.h" +#include "tdesocketaddress.h" namespace KNetwork { diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index 49facb12c..007258f6b 100644 --- a/tdecore/network/kserversocket.cpp +++ b/tdecore/network/kserversocket.cpp @@ -27,10 +27,10 @@ #include <tqsocketnotifier.h> #include <tqmutex.h> -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #include "kresolver.h" -#include "ksocketbase.h" -#include "ksocketdevice.h" +#include "tdesocketbase.h" +#include "tdesocketdevice.h" #include "kstreamsocket.h" #include "kbufferedsocket.h" #include "kserversocket.h" diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h index c8cef3db3..448fed270 100644 --- a/tdecore/network/kserversocket.h +++ b/tdecore/network/kserversocket.h @@ -26,7 +26,7 @@ #define KSERVERSOCKET_H #include <tqobject.h> -#include "ksocketbase.h" +#include "tdesocketbase.h" namespace KNetwork { diff --git a/tdecore/network/ksocketaddress.cpp b/tdecore/network/ksocketaddress.cpp index 7ceeba99d..d1234044b 100644 --- a/tdecore/network/ksocketaddress.cpp +++ b/tdecore/network/ksocketaddress.cpp @@ -37,7 +37,7 @@ #include <tqobject.h> #include "klocale.h" -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #include "netsupp.h" diff --git a/tdecore/network/ksocketaddress.h b/tdecore/network/ksocketaddress.h index a57d11e82..885bb77cb 100644 --- a/tdecore/network/ksocketaddress.h +++ b/tdecore/network/ksocketaddress.h @@ -22,8 +22,8 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef KSOCKETADDRESS_H -#define KSOCKETADDRESS_H +#ifndef TDESOCKETADDRESS_H +#define TDESOCKETADDRESS_H #include <tqstring.h> #include <tqcstring.h> @@ -42,7 +42,7 @@ class KSocketAddress; class KInetSocketAddress; class KUnixSocketAddress; -/** @class KIpAddress ksocketaddress.h ksocketaddress.h +/** @class KIpAddress tdesocketaddress.h tdesocketaddress.h * @brief An IP address. * * This class represents one IP address, version 4 or 6. This is only @@ -413,7 +413,7 @@ public: class KSocketAddressData; -/** @class KSocketAddress ksocketaddress.h ksocketaddress.h +/** @class KSocketAddress tdesocketaddress.h tdesocketaddress.h * @brief A generic socket address. * * This class holds one generic socket address. @@ -639,7 +639,7 @@ public: // static }; -/** @class KInetSocketAddress ksocketaddress.h ksocketaddress.h +/** @class KInetSocketAddress tdesocketaddress.h tdesocketaddress.h * @brief an Internet socket address * * An Inet (IPv4 or IPv6) socket address @@ -827,7 +827,7 @@ private: * External definition */ -/** @class KUnixSocketAddress ksocketaddress.h ksocketaddress.h +/** @class KUnixSocketAddress tdesocketaddress.h tdesocketaddress.h * @brief A Unix (local) socket address. * * This is a Unix socket address. diff --git a/tdecore/network/ksocketbase.cpp b/tdecore/network/ksocketbase.cpp index ca4725a9f..9be0d6e52 100644 --- a/tdecore/network/ksocketbase.cpp +++ b/tdecore/network/ksocketbase.cpp @@ -26,8 +26,8 @@ #include <tqmutex.h> #include "klocale.h" -#include "ksocketbase.h" -#include "ksocketdevice.h" +#include "tdesocketbase.h" +#include "tdesocketdevice.h" using namespace KNetwork; diff --git a/tdecore/network/ksocketbase.h b/tdecore/network/ksocketbase.h index ef1d061d8..48ae15e05 100644 --- a/tdecore/network/ksocketbase.h +++ b/tdecore/network/ksocketbase.h @@ -53,13 +53,13 @@ #undef getsockname #endif -#ifndef KSOCKETBASE_H -#define KSOCKETBASE_H +#ifndef TDESOCKETBASE_H +#define TDESOCKETBASE_H #include <tqiodevice.h> #include <tqstring.h> -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #include <tdelibs_export.h> /* @@ -83,7 +83,7 @@ class KResolverEntry; class KSocketDevice; class KSocketBasePrivate; -/** @class KSocketBase ksocketbase.h ksocketbase.h +/** @class KSocketBase tdesocketbase.h tdesocketbase.h * @brief Basic socket functionality. * * This class provides the basic socket functionlity for descended classes. @@ -432,7 +432,7 @@ private: }; /** - * @class KActiveSocketBase ksocketbase.h ksocketbase.h + * @class KActiveSocketBase tdesocketbase.h tdesocketbase.h * @brief Abstract class for active sockets * * This class provides the standard interfaces for active sockets, i.e., @@ -681,7 +681,7 @@ protected: }; /** - * @class KPassiveSocketBase ksocketbase.h ksocketbase.h + * @class KPassiveSocketBase tdesocketbase.h tdesocketbase.h * @brief Abstract base class for passive sockets. * * This socket provides the initial functionality for passive sockets, diff --git a/tdecore/network/ksocketbuffer.cpp b/tdecore/network/ksocketbuffer.cpp index aacffde45..0ba18b77b 100644 --- a/tdecore/network/ksocketbuffer.cpp +++ b/tdecore/network/ksocketbuffer.cpp @@ -27,8 +27,8 @@ #include <assert.h> #include <string.h> -#include "ksocketbase.h" -#include "ksocketbuffer_p.h" +#include "tdesocketbase.h" +#include "tdesocketbuffer_p.h" using namespace KNetwork; using namespace KNetwork::Internal; diff --git a/tdecore/network/ksocketbuffer_p.h b/tdecore/network/ksocketbuffer_p.h index 0b8e96205..b2c5dc6b2 100644 --- a/tdecore/network/ksocketbuffer_p.h +++ b/tdecore/network/ksocketbuffer_p.h @@ -22,8 +22,8 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef KSOCKETBUFFER_P_H -#define KSOCKETBUFFER_P_H +#ifndef TDESOCKETBUFFER_P_H +#define TDESOCKETBUFFER_P_H #include <tqmutex.h> #include <tqcstring.h> @@ -38,7 +38,7 @@ class KActiveSocketBase; /** * @internal - * @class KSocketBuffer ksocketbuffer_p.h ksocketbuffer_p.h + * @class KSocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h * @brief generic socket buffering code * * This class implements generic buffering used by @ref KBufferedSocket. diff --git a/tdecore/network/ksocketdevice.cpp b/tdecore/network/ksocketdevice.cpp index 68651b8e2..064b66b08 100644 --- a/tdecore/network/ksocketdevice.cpp +++ b/tdecore/network/ksocketdevice.cpp @@ -53,9 +53,9 @@ #include <tqsocketnotifier.h> #include "kresolver.h" -#include "ksocketaddress.h" -#include "ksocketbase.h" -#include "ksocketdevice.h" +#include "tdesocketaddress.h" +#include "tdesocketbase.h" +#include "tdesocketdevice.h" #include "ksockssocketdevice.h" using namespace KNetwork; diff --git a/tdecore/network/ksocketdevice.h b/tdecore/network/ksocketdevice.h index 8b972c2cc..10856716d 100644 --- a/tdecore/network/ksocketdevice.h +++ b/tdecore/network/ksocketdevice.h @@ -22,11 +22,11 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef KSOCKETDEVICE_H -#define KSOCKETDEVICE_H +#ifndef TDESOCKETDEVICE_H +#define TDESOCKETDEVICE_H #include <tqsocketnotifier.h> -#include "ksocketbase.h" +#include "tdesocketbase.h" namespace KNetwork { @@ -34,7 +34,7 @@ class KSocketDevice; class KSocketDeviceFactoryBase; class KSocketDevicePrivate; -/** @class KSocketDevice ksocketdevice.h ksocketdevice.h +/** @class KSocketDevice tdesocketdevice.h tdesocketdevice.h * @brief Low-level socket functionality. * * This class provides low-level socket functionality. diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp index 3432ef84f..a3c975d94 100644 --- a/tdecore/network/ksockssocketdevice.cpp +++ b/tdecore/network/ksockssocketdevice.cpp @@ -35,7 +35,7 @@ #include "kapplication.h" #include "ksocks.h" -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #include "kresolver.h" #include "ksockssocketdevice.h" diff --git a/tdecore/network/ksockssocketdevice.h b/tdecore/network/ksockssocketdevice.h index e622b3abc..5c93b6d8c 100644 --- a/tdecore/network/ksockssocketdevice.h +++ b/tdecore/network/ksockssocketdevice.h @@ -20,7 +20,7 @@ #ifndef KSOCKSSOCKETDEVICE_H #define KSOCKSSOCKETDEVICE_H -#include "ksocketdevice.h" +#include "tdesocketdevice.h" namespace KNetwork { diff --git a/tdecore/network/kstreamsocket.cpp b/tdecore/network/kstreamsocket.cpp index 3861a4e09..700f9f53f 100644 --- a/tdecore/network/kstreamsocket.cpp +++ b/tdecore/network/kstreamsocket.cpp @@ -29,9 +29,9 @@ #include <tqtimer.h> #include <tqguardedptr.h> -#include "ksocketaddress.h" +#include "tdesocketaddress.h" #include "kresolver.h" -#include "ksocketdevice.h" +#include "tdesocketdevice.h" #include "kstreamsocket.h" using namespace KNetwork; diff --git a/tdecore/network/syssocket.h b/tdecore/network/syssocket.h index e34db1bd1..03e069940 100644 --- a/tdecore/network/syssocket.h +++ b/tdecore/network/syssocket.h @@ -25,8 +25,8 @@ #ifndef KDE_SYSSOCKET_H #define KDE_SYSSOCKET_H -#ifdef KSOCKETBASE_H -#error syssocket.h must be included before ksocketbase.h! +#ifdef TDESOCKETBASE_H +#error syssocket.h must be included before tdesocketbase.h! #endif #include <sys/types.h> |