Rename ksocket and kcache

pull/16/head
Timothy Pearson 13 years ago
parent a9e58ebc98
commit ee0c55320d

@ -27,7 +27,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <network/ksocketaddress.h> #include <network/tdesocketaddress.h>
#include <kurl.h> #include <kurl.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_DNSSD #ifdef HAVE_DNSSD

@ -39,7 +39,7 @@ TODO:
* More featureful code completion including syntax highlighted entries * More featureful code completion including syntax highlighted entries
* Custom widgets in between lines interface (eg. so kcachegrind could use * Custom widgets in between lines interface (eg. so tdecachegrind could use
katepart to display its cpu usage information etc) katepart to display its cpu usage information etc)
* KateFoldingTree* to use smart cursors * KateFoldingTree* to use smart cursors

@ -261,9 +261,9 @@ int main(int argc, char **argv)
} }
else if (strcmp(argv[1], "socket") == 0) else if (strcmp(argv[1], "socket") == 0)
{ {
tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/ksocket-")+1); tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/tdesocket-")+1);
strcpy(tmp_prefix, tmp ); strcpy(tmp_prefix, tmp );
strcat(tmp_prefix, "/ksocket-" ); strcat(tmp_prefix, "/tdesocket-" );
kde_prefix = "/socket-"; kde_prefix = "/socket-";
} }

@ -58,7 +58,7 @@
#include <kmimemagic.h> #include <kmimemagic.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <ksockaddr.h> #include <ksockaddr.h>
#include <ksocketaddress.h> #include <tdesocketaddress.h>
#include <kio/ioslave_defaults.h> #include <kio/ioslave_defaults.h>
#include <kio/slaveconfig.h> #include <kio/slaveconfig.h>
#include <kremoteencoding.h> #include <kremoteencoding.h>

@ -21,8 +21,8 @@ include_directories(
##### headers ################################### ##### headers ###################################
install( FILES install( FILES
kresolver.h kreverseresolver.h ksocketaddress.h kresolver.h kreverseresolver.h tdesocketaddress.h
ksocketbase.h ksocketdevice.h kclientsocketbase.h tdesocketbase.h tdesocketdevice.h kclientsocketbase.h
kstreamsocket.h kserversocket.h kdatagramsocket.h kstreamsocket.h kserversocket.h kdatagramsocket.h
kmulticastsocketdevice.h kmulticastsocket.h kmulticastsocketdevice.h kmulticastsocket.h
knetworkinterface.h khttpproxysocketdevice.h knetworkinterface.h khttpproxysocketdevice.h
@ -41,11 +41,11 @@ set( target tdecorenetwork )
set( ${target}_SRCS set( ${target}_SRCS
kresolver.cpp kresolvermanager.cpp kresolverworkerbase.cpp kresolver.cpp kresolvermanager.cpp kresolverworkerbase.cpp
ksocketaddress.cpp kresolverstandardworkers.cpp tdesocketaddress.cpp kresolverstandardworkers.cpp
kreverseresolver.cpp ksocketdevice.cpp ksocketbase.cpp kreverseresolver.cpp tdesocketdevice.cpp tdesocketbase.cpp
kclientsocketbase.cpp kstreamsocket.cpp kserversocket.cpp kclientsocketbase.cpp kstreamsocket.cpp kserversocket.cpp
kdatagramsocket.cpp khttpproxysocketdevice.cpp kdatagramsocket.cpp khttpproxysocketdevice.cpp
ksockssocketdevice.cpp kbufferedsocket.cpp ksocketbuffer.cpp ksockssocketdevice.cpp kbufferedsocket.cpp tdesocketbuffer.cpp
ksrvresolverworker.cpp ksrvresolverworker.cpp
) )

@ -10,15 +10,15 @@ INCLUDES = $(all_includes)
# the library search path. # the library search path.
# convenience lib - no LDFLAGS or LIBADD ! # convenience lib - no LDFLAGS or LIBADD !
# Note: # 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 \ libtdecorenetwork_la_SOURCES = kresolver.cpp \
kresolvermanager.cpp \ kresolvermanager.cpp \
kresolverworkerbase.cpp \ kresolverworkerbase.cpp \
ksocketaddress.cpp \ tdesocketaddress.cpp \
kresolverstandardworkers.cpp \ kresolverstandardworkers.cpp \
kreverseresolver.cpp \ kreverseresolver.cpp \
ksocketdevice.cpp \ tdesocketdevice.cpp \
ksocketbase.cpp \ tdesocketbase.cpp \
kclientsocketbase.cpp \ kclientsocketbase.cpp \
kstreamsocket.cpp \ kstreamsocket.cpp \
kserversocket.cpp \ kserversocket.cpp \
@ -26,14 +26,14 @@ libtdecorenetwork_la_SOURCES = kresolver.cpp \
khttpproxysocketdevice.cpp \ khttpproxysocketdevice.cpp \
ksockssocketdevice.cpp \ ksockssocketdevice.cpp \
kbufferedsocket.cpp \ kbufferedsocket.cpp \
ksocketbuffer.cpp \ tdesocketbuffer.cpp \
ksrvresolverworker.cpp ksrvresolverworker.cpp
include_HEADERS = kresolver.h \ include_HEADERS = kresolver.h \
kreverseresolver.h \ kreverseresolver.h \
ksocketaddress.h \ tdesocketaddress.h \
ksocketbase.h \ tdesocketbase.h \
ksocketdevice.h \ tdesocketdevice.h \
kclientsocketbase.h \ kclientsocketbase.h \
kstreamsocket.h \ kstreamsocket.h \
kserversocket.h \ kserversocket.h \
@ -48,7 +48,7 @@ include_HEADERS = kresolver.h \
noinst_HEADERS = kresolver_p.h \ noinst_HEADERS = kresolver_p.h \
kresolverworkerbase.h \ kresolverworkerbase.h \
kresolverstandardworkers_p.h \ kresolverstandardworkers_p.h \
ksocketbuffer_p.h \ tdesocketbuffer_p.h \
ksrvresolverworker_p.h \ ksrvresolverworker_p.h \
syssocket.h syssocket.h

@ -27,9 +27,9 @@
#include <tqmutex.h> #include <tqmutex.h>
#include <tqtimer.h> #include <tqtimer.h>
#include "ksocketdevice.h" #include "tdesocketdevice.h"
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "ksocketbuffer_p.h" #include "tdesocketbuffer_p.h"
#include "kbufferedsocket.h" #include "kbufferedsocket.h"
using namespace KNetwork; using namespace KNetwork;

@ -28,10 +28,10 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqmutex.h> #include <tqmutex.h>
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "kresolver.h" #include "kresolver.h"
#include "ksocketbase.h" #include "tdesocketbase.h"
#include "ksocketdevice.h" #include "tdesocketdevice.h"
#include "kclientsocketbase.h" #include "kclientsocketbase.h"
using namespace KNetwork; using namespace KNetwork;

@ -28,7 +28,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <tqstring.h> #include <tqstring.h>
#include "ksocketbase.h" #include "tdesocketbase.h"
#include "kresolver.h" #include "kresolver.h"
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -27,9 +27,9 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "kresolver.h" #include "kresolver.h"
#include "ksocketdevice.h" #include "tdesocketdevice.h"
#include "kdatagramsocket.h" #include "kdatagramsocket.h"
using namespace KNetwork; using namespace KNetwork;

@ -27,7 +27,7 @@
#include <tqcstring.h> #include <tqcstring.h>
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "kclientsocketbase.h" #include "kclientsocketbase.h"
namespace KNetwork { namespace KNetwork {

@ -31,8 +31,8 @@
#include <tqcstring.h> #include <tqcstring.h>
#include "kresolver.h" #include "kresolver.h"
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "ksocketdevice.h" #include "tdesocketdevice.h"
#include "khttpproxysocketdevice.h" #include "khttpproxysocketdevice.h"
using namespace KNetwork; using namespace KNetwork;

@ -25,7 +25,7 @@
#ifndef KHTTPPROXYSOCKETDEVICE_H #ifndef KHTTPPROXYSOCKETDEVICE_H
#define KHTTPPROXYSOCKETDEVICE_H #define KHTTPPROXYSOCKETDEVICE_H
#include "ksocketdevice.h" #include "tdesocketdevice.h"
namespace KNetwork { namespace KNetwork {

@ -25,9 +25,9 @@
#ifndef KMULTICASTSOCKETDEVICE_H #ifndef KMULTICASTSOCKETDEVICE_H
#define KMULTICASTSOCKETDEVICE_H #define KMULTICASTSOCKETDEVICE_H
#include "ksocketdevice.h" #include "tdesocketdevice.h"
#include "knetworkinterface.h" #include "knetworkinterface.h"
#include "ksocketaddress.h" #include "tdesocketaddress.h"
namespace KNetwork { namespace KNetwork {

@ -59,7 +59,7 @@
// Us // Us
#include "kresolver.h" #include "kresolver.h"
#include "kresolver_p.h" #include "kresolver_p.h"
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#ifdef NEED_MUTEX #ifdef NEED_MUTEX
#warning "mutex" #warning "mutex"

@ -29,7 +29,7 @@
// Needed includes // Needed includes
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <tqobject.h> #include <tqobject.h>
#include "ksocketaddress.h" #include "tdesocketaddress.h"
//////////////////////// ////////////////////////

@ -49,7 +49,7 @@
#include "kapplication.h" #include "kapplication.h"
#include "kresolver.h" #include "kresolver.h"
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "kresolverstandardworkers_p.h" #include "kresolverstandardworkers_p.h"
struct hostent; struct hostent;

@ -39,7 +39,7 @@
#include "kreverseresolver.h" #include "kreverseresolver.h"
#include "kresolver_p.h" #include "kresolver_p.h"
#include "kresolverworkerbase.h" #include "kresolverworkerbase.h"
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#ifndef HAVE_GETNAMEINFO #ifndef HAVE_GETNAMEINFO
// FIXME KDE4: // FIXME KDE4:

@ -30,7 +30,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <tqstring.h> #include <tqstring.h>
#include "ksocketaddress.h" #include "tdesocketaddress.h"
namespace KNetwork { namespace KNetwork {

@ -27,10 +27,10 @@
#include <tqsocketnotifier.h> #include <tqsocketnotifier.h>
#include <tqmutex.h> #include <tqmutex.h>
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "kresolver.h" #include "kresolver.h"
#include "ksocketbase.h" #include "tdesocketbase.h"
#include "ksocketdevice.h" #include "tdesocketdevice.h"
#include "kstreamsocket.h" #include "kstreamsocket.h"
#include "kbufferedsocket.h" #include "kbufferedsocket.h"
#include "kserversocket.h" #include "kserversocket.h"

@ -26,7 +26,7 @@
#define KSERVERSOCKET_H #define KSERVERSOCKET_H
#include <tqobject.h> #include <tqobject.h>
#include "ksocketbase.h" #include "tdesocketbase.h"
namespace KNetwork { namespace KNetwork {

@ -37,7 +37,7 @@
#include <tqobject.h> #include <tqobject.h>
#include "klocale.h" #include "klocale.h"
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "netsupp.h" #include "netsupp.h"

@ -22,8 +22,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef KSOCKETADDRESS_H #ifndef TDESOCKETADDRESS_H
#define KSOCKETADDRESS_H #define TDESOCKETADDRESS_H
#include <tqstring.h> #include <tqstring.h>
#include <tqcstring.h> #include <tqcstring.h>
@ -42,7 +42,7 @@ class KSocketAddress;
class KInetSocketAddress; class KInetSocketAddress;
class KUnixSocketAddress; class KUnixSocketAddress;
/** @class KIpAddress ksocketaddress.h ksocketaddress.h /** @class KIpAddress tdesocketaddress.h tdesocketaddress.h
* @brief An IP address. * @brief An IP address.
* *
* This class represents one IP address, version 4 or 6. This is only * This class represents one IP address, version 4 or 6. This is only
@ -413,7 +413,7 @@ public:
class KSocketAddressData; class KSocketAddressData;
/** @class KSocketAddress ksocketaddress.h ksocketaddress.h /** @class KSocketAddress tdesocketaddress.h tdesocketaddress.h
* @brief A generic socket address. * @brief A generic socket address.
* *
* This class holds one 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 * @brief an Internet socket address
* *
* An Inet (IPv4 or IPv6) socket address * An Inet (IPv4 or IPv6) socket address
@ -827,7 +827,7 @@ private:
* External definition * External definition
*/ */
/** @class KUnixSocketAddress ksocketaddress.h ksocketaddress.h /** @class KUnixSocketAddress tdesocketaddress.h tdesocketaddress.h
* @brief A Unix (local) socket address. * @brief A Unix (local) socket address.
* *
* This is a Unix socket address. * This is a Unix socket address.

@ -26,8 +26,8 @@
#include <tqmutex.h> #include <tqmutex.h>
#include "klocale.h" #include "klocale.h"
#include "ksocketbase.h" #include "tdesocketbase.h"
#include "ksocketdevice.h" #include "tdesocketdevice.h"
using namespace KNetwork; using namespace KNetwork;

@ -53,13 +53,13 @@
#undef getsockname #undef getsockname
#endif #endif
#ifndef KSOCKETBASE_H #ifndef TDESOCKETBASE_H
#define KSOCKETBASE_H #define TDESOCKETBASE_H
#include <tqiodevice.h> #include <tqiodevice.h>
#include <tqstring.h> #include <tqstring.h>
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include <tdelibs_export.h> #include <tdelibs_export.h>
/* /*
@ -83,7 +83,7 @@ class KResolverEntry;
class KSocketDevice; class KSocketDevice;
class KSocketBasePrivate; class KSocketBasePrivate;
/** @class KSocketBase ksocketbase.h ksocketbase.h /** @class KSocketBase tdesocketbase.h tdesocketbase.h
* @brief Basic socket functionality. * @brief Basic socket functionality.
* *
* This class provides the basic socket functionlity for descended classes. * 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 * @brief Abstract class for active sockets
* *
* This class provides the standard interfaces for active sockets, i.e., * 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. * @brief Abstract base class for passive sockets.
* *
* This socket provides the initial functionality for passive sockets, * This socket provides the initial functionality for passive sockets,

@ -27,8 +27,8 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ksocketbase.h" #include "tdesocketbase.h"
#include "ksocketbuffer_p.h" #include "tdesocketbuffer_p.h"
using namespace KNetwork; using namespace KNetwork;
using namespace KNetwork::Internal; using namespace KNetwork::Internal;

@ -22,8 +22,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef KSOCKETBUFFER_P_H #ifndef TDESOCKETBUFFER_P_H
#define KSOCKETBUFFER_P_H #define TDESOCKETBUFFER_P_H
#include <tqmutex.h> #include <tqmutex.h>
#include <tqcstring.h> #include <tqcstring.h>
@ -38,7 +38,7 @@ class KActiveSocketBase;
/** /**
* @internal * @internal
* @class KSocketBuffer ksocketbuffer_p.h ksocketbuffer_p.h * @class KSocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h
* @brief generic socket buffering code * @brief generic socket buffering code
* *
* This class implements generic buffering used by @ref KBufferedSocket. * This class implements generic buffering used by @ref KBufferedSocket.

@ -53,9 +53,9 @@
#include <tqsocketnotifier.h> #include <tqsocketnotifier.h>
#include "kresolver.h" #include "kresolver.h"
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "ksocketbase.h" #include "tdesocketbase.h"
#include "ksocketdevice.h" #include "tdesocketdevice.h"
#include "ksockssocketdevice.h" #include "ksockssocketdevice.h"
using namespace KNetwork; using namespace KNetwork;

@ -22,11 +22,11 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef KSOCKETDEVICE_H #ifndef TDESOCKETDEVICE_H
#define KSOCKETDEVICE_H #define TDESOCKETDEVICE_H
#include <tqsocketnotifier.h> #include <tqsocketnotifier.h>
#include "ksocketbase.h" #include "tdesocketbase.h"
namespace KNetwork { namespace KNetwork {
@ -34,7 +34,7 @@ class KSocketDevice;
class KSocketDeviceFactoryBase; class KSocketDeviceFactoryBase;
class KSocketDevicePrivate; class KSocketDevicePrivate;
/** @class KSocketDevice ksocketdevice.h ksocketdevice.h /** @class KSocketDevice tdesocketdevice.h tdesocketdevice.h
* @brief Low-level socket functionality. * @brief Low-level socket functionality.
* *
* This class provides low-level socket functionality. * This class provides low-level socket functionality.

@ -35,7 +35,7 @@
#include "kapplication.h" #include "kapplication.h"
#include "ksocks.h" #include "ksocks.h"
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "kresolver.h" #include "kresolver.h"
#include "ksockssocketdevice.h" #include "ksockssocketdevice.h"

@ -20,7 +20,7 @@
#ifndef KSOCKSSOCKETDEVICE_H #ifndef KSOCKSSOCKETDEVICE_H
#define KSOCKSSOCKETDEVICE_H #define KSOCKSSOCKETDEVICE_H
#include "ksocketdevice.h" #include "tdesocketdevice.h"
namespace KNetwork { namespace KNetwork {

@ -29,9 +29,9 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqguardedptr.h> #include <tqguardedptr.h>
#include "ksocketaddress.h" #include "tdesocketaddress.h"
#include "kresolver.h" #include "kresolver.h"
#include "ksocketdevice.h" #include "tdesocketdevice.h"
#include "kstreamsocket.h" #include "kstreamsocket.h"
using namespace KNetwork; using namespace KNetwork;

@ -25,8 +25,8 @@
#ifndef KDE_SYSSOCKET_H #ifndef KDE_SYSSOCKET_H
#define KDE_SYSSOCKET_H #define KDE_SYSSOCKET_H
#ifdef KSOCKETBASE_H #ifdef TDESOCKETBASE_H
#error syssocket.h must be included before ksocketbase.h! #error syssocket.h must be included before tdesocketbase.h!
#endif #endif
#include <sys/types.h> #include <sys/types.h>

@ -45,7 +45,7 @@
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <kconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ksocketbase.h> #include <tdesocketbase.h>
#include <klibloader.h> #include <klibloader.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kaction.h> #include <kaction.h>

@ -297,7 +297,7 @@ const char * const packages[] = {
"kbreakout", "kbreakout",
"kbruch", "kbruch",
"kbugbuster", "kbugbuster",
"kcachegrind", "tdecachegrind",
"kcalc", "kcalc",
"kcanvas", "kcanvas",
"kcharselect", "kcharselect",

@ -115,9 +115,9 @@ kqiodevicegzip_p.cpp
#network/kresolver.cpp \ #network/kresolver.cpp \
#network/kresolvermanager.cpp \ #network/kresolvermanager.cpp \
#network/kreverseresolver.cpp \ #network/kreverseresolver.cpp \
#network/ksocketaddress.cpp \ #network/tdesocketaddress.cpp \
#network/ksocketbase.cpp \ #network/tdesocketbase.cpp \
#network/ksocketdevice.cpp \ #network/tdesocketdevice.cpp \
#network/ksockssocketdevice.cpp #network/ksockssocketdevice.cpp
#kstartupinfo.cpp \ #kstartupinfo.cpp \

Loading…
Cancel
Save