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

9 files changed, 40 insertions, 40 deletions

diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index ade2fe95..dfa8acf1 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -54,7 +54,7 @@ extern "C" {
 
 
 KcmKRfb::KcmKRfb(TQWidget *p, const char *name, const TQStringList &) :
-	KCModule(KcmKRfbFactory::instance(), p, name),
+	TDECModule(KcmKRfbFactory::instance(), p, name),
 	m_configuration(KRFB_CONFIGURATION_MODE) {
 
         m_confWidget = new ConfigurationWidget(this);
diff --git a/krfb/kcm_krfb/kcm_krfb.h b/krfb/kcm_krfb/kcm_krfb.h
index 966ff900..ff7ffc8d 100644
--- a/krfb/kcm_krfb/kcm_krfb.h
+++ b/krfb/kcm_krfb/kcm_krfb.h
@@ -25,7 +25,7 @@
 #include "configurationwidget.h"
 #include "../krfb/configuration.h"
 
-class KcmKRfb : public KCModule {
+class KcmKRfb : public TDECModule {
 	Q_OBJECT
   
 private:
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;
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index a5c78c42..40812960 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -52,12 +52,12 @@ Configuration::Configuration(krfb_mode mode) :
 	kinetdRef("kded", "kinetd")
 {
 	kinetdRef.setDCOPClient(TDEApplication::dcopClient());
-	loadFromKConfig();
+	loadFromTDEConfig();
 	saveToDialogs();
 	doKinetdConf();
 
     connectDCOPSignal( 0, "KRFB::ConfigChanged", "KRFB_ConfigChanged()",
-						"updateKConfig()", false );
+						"updateTDEConfig()", false );
 	connect(invMngDlg.newPersonalInvitationButton, TQT_SIGNAL(clicked()),
 		TQT_SLOT(showPersonalInvitationDialog()));
 	connect(invMngDlg.newEmailInvitationButton, TQT_SIGNAL(clicked()), TQT_SLOT(inviteEmail()));
@@ -88,9 +88,9 @@ Configuration::~Configuration() {
         save();
 }
 
-void Configuration::updateKConfig()
+void Configuration::updateTDEConfig()
 {
-    loadFromKConfig();
+    loadFromTDEConfig();
 }
 
 void Configuration::setKInetdEnabled(bool enabled) {
@@ -159,9 +159,9 @@ void Configuration::doKinetdConf() {
 	}
 }
 
-void Configuration::loadFromKConfig() {
+void Configuration::loadFromTDEConfig() {
 
-	KConfig c("krfbrc");
+	TDEConfig c("krfbrc");
 	allowUninvitedFlag = c.readBoolEntry("allowUninvited", false);
 	enableSLPFlag = c.readBoolEntry("enableSLP", true);
 	askOnConnectFlag = c.readBoolEntry("confirmUninvitedConnection", true);
@@ -187,9 +187,9 @@ void Configuration::loadFromKConfig() {
 
 }
 
-void Configuration::saveToKConfig() {
+void Configuration::saveToTDEConfig() {
 
-	KConfig c("krfbrc");
+	TDEConfig c("krfbrc");
 	c.writeEntry("confirmUninvitedConnection", askOnConnectFlag);
 	c.writeEntry("allowDesktopControl", allowDesktopControlFlag);
 	c.writeEntry("allowUninvited", allowUninvitedFlag);
@@ -225,13 +225,13 @@ void Configuration::saveToDialogs() {
 }
 
 void Configuration::save() {
-	saveToKConfig();
+	saveToTDEConfig();
 	saveToDialogs();
 	doKinetdConf();
 }
 
 void Configuration::update() {
-	loadFromKConfig();
+	loadFromTDEConfig();
 	saveToDialogs();
 }
 
@@ -253,7 +253,7 @@ void Configuration::invalidateOldInvitations() {
 
 void Configuration::refreshTimeout() {
 	unsigned int invNum = invitationList.size();
-	loadFromKConfig();
+	loadFromTDEConfig();
 	saveToDialogs();
 	if (invNum != invitationList.size())
 		emit invitationNumChanged(invitationList.size());
@@ -363,7 +363,7 @@ void Configuration::setDisableXShm(bool disable) {
 ////////////// invitation manage dialog //////////////////////////
 
 void Configuration::showManageInvitationsDialog() {
-        loadFromKConfig();
+        loadFromTDEConfig();
 	saveToDialogs();
 	invMngDlg.exec();
 }
@@ -378,14 +378,14 @@ void Configuration::invMngDlgDeleteOnePressed() {
 		else
 			it++;
 	}
-	saveToKConfig();
+	saveToTDEConfig();
 	doKinetdConf();
 	emit invitationNumChanged(invitationList.size());
 }
 
 void Configuration::invMngDlgDeleteAllPressed() {
 	invitationList.clear();
-	saveToKConfig();
+	saveToTDEConfig();
 	doKinetdConf();
 	emit invitationNumChanged(invitationList.size());
 }
@@ -395,13 +395,13 @@ void Configuration::invMngDlgDeleteAllPressed() {
 void Configuration::showInvitationDialog() {
 	invDlg.exec();
 	emit invitationFinished();
-	saveToKConfig();
+	saveToTDEConfig();
 }
 
 ////////////// personal invitation dialog //////////////////////////
 
 void Configuration::showPersonalInvitationDialog() {
-	loadFromKConfig();
+	loadFromTDEConfig();
 	Invitation inv = createInvitation();
 	save();
 	emit invitationNumChanged(invitationList.size());
@@ -433,7 +433,7 @@ void Configuration::inviteEmail() {
 	if (r == KMessageBox::Cancel)
 		return;
 
-	loadFromKConfig();
+	loadFromTDEConfig();
 	Invitation inv = createInvitation();
 	save();
 	emit invitationNumChanged(invitationList.size());
diff --git a/krfb/krfb/configuration.h b/krfb/krfb/configuration.h
index 1f9c8ab5..f405ea11 100644
--- a/krfb/krfb/configuration.h
+++ b/krfb/krfb/configuration.h
@@ -91,9 +91,9 @@ public slots:
 	void inviteEmail();
 
 private:
-        void loadFromKConfig();
+        void loadFromTDEConfig();
         void loadFromDialogs();
-        void saveToKConfig();
+        void saveToTDEConfig();
         void saveToDialogs();
 	Invitation createInvitation();
 	void closeInvDlg();
@@ -129,7 +129,7 @@ private:
 
 k_dcop:
     // Connected to the DCOP signal
-    void updateKConfig();	
+    void updateTDEConfig();	
 private slots:
         void refreshTimeout();
 
diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc
index a41f9808..480ab771 100644
--- a/krfb/krfb/invitation.cc
+++ b/krfb/krfb/invitation.cc
@@ -70,7 +70,7 @@ Invitation::Invitation(const Invitation &x) :
 	m_viewItem(0) {
 }
 
-Invitation::Invitation(KConfig* config, int num) {
+Invitation::Invitation(TDEConfig* config, int num) {
 	m_password = cryptStr(config->readEntry(TQString("password%1").arg(num), ""));
 	m_creationTime = config->readDateTimeEntry(TQString("creation%1").arg(num));
 	m_expirationTime = config->readDateTimeEntry(TQString("expiration%1").arg(num));
@@ -92,7 +92,7 @@ Invitation &Invitation::operator= (const Invitation&x) {
 	return *this;
 }
 
-void Invitation::save(KConfig *config, int num) const {
+void Invitation::save(TDEConfig *config, int num) const {
 	config->writeEntry(TQString("password%1").arg(num), cryptStr(m_password));
 	config->writeEntry(TQString("creation%1").arg(num), m_creationTime);
 	config->writeEntry(TQString("expiration%1").arg(num), m_expirationTime);
diff --git a/krfb/krfb/invitation.h b/krfb/krfb/invitation.h
index fe928d7f..2f7dbcd5 100644
--- a/krfb/krfb/invitation.h
+++ b/krfb/krfb/invitation.h
@@ -34,7 +34,7 @@ class Invitation {
 public:
 	Invitation();
 	~Invitation();
-	Invitation(KConfig* config, int num);
+	Invitation(TDEConfig* config, int num);
 	Invitation(const Invitation &x);
 	Invitation &operator= (const Invitation&x);
 
@@ -45,7 +45,7 @@ public:
 
 	void setViewItem(KListViewItem*);
 	KListViewItem* getViewItem() const;
-	void save(KConfig *config, int num) const;
+	void save(TDEConfig *config, int num) const;
 private:
 	TQString m_password;
 	TQDateTime m_creationTime;
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
index be384118..3e6afcbc 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cc
@@ -720,7 +720,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
 	cl->negotiationFinishedHook = negotiationFinishedHook;
 
 	TQString host, port;
-	KSocketAddress *ksa = KExtendedSocket::peerAddress(socket);
+	TDESocketAddress *ksa = KExtendedSocket::peerAddress(socket);
 	if (ksa) {
 		hostent *he = 0;
 		KInetSocketAddress *kisa = (KInetSocketAddress*) ksa;