Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

2 files changed, 13 insertions, 13 deletions

diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp
index 42a7f053..369b1549 100644
--- a/krfb/kinetd/kinetd.cpp
+++ b/krfb/kinetd/kinetd.cpp
@@ -36,7 +36,7 @@
 #include <fcntl.h>
 
 PortListener::PortListener(KService::Ptr s,
-			   KConfig *config,
+			   TDEConfig *config,
 			   KServiceRegistry *srvreg) :
 	m_port(-1),
 	m_serviceRegistered(false),
@@ -63,7 +63,7 @@ bool PortListener::acquirePort() {
 			delete m_socket;
 	}
 	m_port = m_portBase;
-	m_socket = new KServerSocket(m_port, false);
+	m_socket = new TDEServerSocket(m_port, false);
 	while (!m_socket->bindAndListen()) {
 		m_port++;
 		if (m_port >= (m_portBase+m_autoPortRange)) {
@@ -75,10 +75,10 @@ bool PortListener::acquirePort() {
 			return false;
 		}
 		delete m_socket;
-		m_socket = new KServerSocket(m_port, false);
+		m_socket = new TDEServerSocket(m_port, false);
 	}
-	connect(m_socket, TQT_SIGNAL(accepted(KSocket*)),
-		TQT_SLOT(accepted(KSocket*)));
+	connect(m_socket, TQT_SIGNAL(accepted(TDESocket*)),
+		TQT_SLOT(accepted(TDESocket*)));
 
 	bool s = m_registerService;
 	bool sd =m_dnssdRegister;
@@ -201,9 +201,9 @@ void PortListener::loadConfig(KService::Ptr s) {
 						     m_registerService);
 }
 
-void PortListener::accepted(KSocket *sock) {
+void PortListener::accepted(TDESocket *sock) {
 	TQString host, port;
-	KSocketAddress *ksa = KExtendedSocket::peerAddress(sock->socket());
+	TDESocketAddress *ksa = KExtendedSocket::peerAddress(sock->socket());
 	if ((!ksa) || !ksa->address()) {
 		delete sock;
 		return;
@@ -413,7 +413,7 @@ PortListener::~PortListener() {
 KInetD::KInetD(TQCString &n) :
 	KDEDModule(n)
 {
-	m_config = new KConfig("kinetdrc");
+	m_config = new TDEConfig("kinetdrc");
 	m_srvreg = new KServiceRegistry();
 	if (!m_srvreg->available()) {
 		kdDebug(7021) << "SLP not available"<< endl;
diff --git a/krfb/kinetd/kinetd.h b/krfb/kinetd/kinetd.h
index cb29889d..caae1d2d 100644
--- a/krfb/kinetd/kinetd.h
+++ b/krfb/kinetd/kinetd.h
@@ -56,10 +56,10 @@ private:
 	TQDateTime m_slpLifetimeEnd;
 	TQString m_uuid;
 
-	KServerSocket *m_socket;
+	TDEServerSocket *m_socket;
 	TDEProcess m_process;
 
-	KConfig *m_config;
+	TDEConfig *m_config;
 	KServiceRegistry *m_srvreg;
 	DNSSD::PublicService *m_dnssdreg;
 
@@ -70,7 +70,7 @@ private:
 	void setServiceRegistrationEnabledInternal(bool enabled);
 
 public:
-	PortListener(KService::Ptr s, KConfig *c, KServiceRegistry *srvreg);
+	PortListener(KService::Ptr s, TDEConfig *c, KServiceRegistry *srvreg);
 	~PortListener();
 
 	bool acquirePort();
@@ -89,7 +89,7 @@ public:
 	void refreshRegistration();
 
 private slots:
-	void accepted(KSocket*);
+	void accepted(TDESocket*);
 };
 
 class KInetD : public KDEDModule {
@@ -179,7 +179,7 @@ k_dcop:
 	void setPortRetryTimer(bool retry);
 	void setReregistrationTimer();
 
-	KConfig *m_config;
+	TDEConfig *m_config;
 	KServiceRegistry *m_srvreg;
 	TQPtrList<PortListener> m_portListeners;
 	TQTimer m_expirationTimer;