diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /tdecore/network | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/network')
| -rw-r--r-- | tdecore/network/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdecore/network/Makefile.am | 4 | ||||
| -rw-r--r-- | tdecore/network/tdemulticastsocket.h (renamed from tdecore/network/kmulticastsocket.h) | 4 | ||||
| -rw-r--r-- | tdecore/network/tdemulticastsocketdevice.h (renamed from tdecore/network/kmulticastsocketdevice.h) | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tdecore/network/CMakeLists.txt b/tdecore/network/CMakeLists.txt index addc3633b..5c213a752 100644 --- a/tdecore/network/CMakeLists.txt +++ b/tdecore/network/CMakeLists.txt @@ -24,7 +24,7 @@ install( FILES kresolver.h kreverseresolver.h tdesocketaddress.h tdesocketbase.h tdesocketdevice.h kclientsocketbase.h kstreamsocket.h kserversocket.h kdatagramsocket.h - kmulticastsocketdevice.h kmulticastsocket.h + tdemulticastsocketdevice.h tdemulticastsocket.h knetworkinterface.h khttpproxysocketdevice.h ksockssocketdevice.h kbufferedsocket.h kiobuffer.h DESTINATION ${INCLUDE_INSTALL_DIR} ) diff --git a/tdecore/network/Makefile.am b/tdecore/network/Makefile.am index 768180d1b..793b6d96d 100644 --- a/tdecore/network/Makefile.am +++ b/tdecore/network/Makefile.am @@ -38,8 +38,8 @@ include_HEADERS = kresolver.h \ kstreamsocket.h \ kserversocket.h \ kdatagramsocket.h \ - kmulticastsocketdevice.h \ - kmulticastsocket.h \ + tdemulticastsocketdevice.h \ + tdemulticastsocket.h \ knetworkinterface.h \ khttpproxysocketdevice.h \ ksockssocketdevice.h \ diff --git a/tdecore/network/kmulticastsocket.h b/tdecore/network/tdemulticastsocket.h index 8fe413283..15d3a28ea 100644 --- a/tdecore/network/kmulticastsocket.h +++ b/tdecore/network/tdemulticastsocket.h @@ -26,13 +26,13 @@ #define KMULTICASTSOCKET_H #include "kdatagramsocket.h" -#include "kmulticastsocketdevice.h" +#include "tdemulticastsocketdevice.h" namespace KNetwork { class KMulticastSocketPrivate; /** - * @class KMulticastSocket kmulticastsocket.h kmulticastsocket.h + * @class KMulticastSocket tdemulticastsocket.h tdemulticastsocket.h * @brief A multicast-capable datagram socket class * * This class derives from @ref KDatagramSocket adding methods to it to diff --git a/tdecore/network/kmulticastsocketdevice.h b/tdecore/network/tdemulticastsocketdevice.h index a24ba326a..bddb048a8 100644 --- a/tdecore/network/kmulticastsocketdevice.h +++ b/tdecore/network/tdemulticastsocketdevice.h @@ -34,7 +34,7 @@ namespace KNetwork { class KMulticastSocketImplPrivate; /** - * @class KMulticastSocketImpl kmulticastsocketdevice.h kmulticastsocketdevice.h + * @class KMulticastSocketImpl tdemulticastsocketdevice.h tdemulticastsocketdevice.h * @brief The low-level backend for multicasting sockets. * * This class is an interface providing methods for handling multicast |