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

4 files changed, 12 insertions, 12 deletions

diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index 3b9c9f55..db2e4e3d 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -95,13 +95,13 @@ bool ADCalendar::loadFile(bool reset)
 		mTempFileName = tempFile.name();
 		KURL dest;
 		dest.setPath(mTempFileName);
-		KIO::FileCopyJob* job = KIO::file_copy(url, dest, -1, true);
-		connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotDownloadJobResult(KIO::Job*)));
+		TDEIO::FileCopyJob* job = TDEIO::file_copy(url, dest, -1, true);
+		connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotDownloadJobResult(TDEIO::Job*)));
 	}
 	return true;
 }
 
-void ADCalendar::slotDownloadJobResult(KIO::Job *job)
+void ADCalendar::slotDownloadJobResult(TDEIO::Job *job)
 {
 	if (job->error())
 	{
diff --git a/kalarm/kalarmd/adcalendar.h b/kalarm/kalarmd/adcalendar.h
index 965be105..bbc96214 100644
--- a/kalarm/kalarmd/adcalendar.h
+++ b/kalarm/kalarmd/adcalendar.h
@@ -22,7 +22,7 @@
 #define ADCALENDAR_H
 
 #include <libkcal/calendarlocal.h>
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 class ADCalendar;
 
 
@@ -72,7 +72,7 @@ class ADCalendar : public KCal::CalendarLocal
 		ADCalendar(const TQString& url, const TQCString& appname);
 
 	private slots:
-		void            slotDownloadJobResult(KIO::Job*);
+		void            slotDownloadJobResult(TDEIO::Job*);
 
 	private:
 		struct EventKey
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index e6211076..0253e320 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -48,7 +48,7 @@ void ADConfigData::readConfig()
 {
 	kdDebug(5900) << "ADConfigData::readConfig()" << endl;
 	ClientInfo::clear();
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	TQStringList clients = config->groupList().grep(CLIENT_GROUP_SEARCH);
 	for (TQStringList::Iterator cl = clients.begin();  cl != clients.end();  ++cl)
 	{
@@ -101,7 +101,7 @@ void ADConfigData::readConfig()
 */
 void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo)
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
 	config->writeEntry(TITLE_KEY, cinfo->title());
 	config->writeEntry(DCOP_OBJECT_KEY, TQString(TQString::fromLocal8Bit(cinfo->dcopObject())));
@@ -115,7 +115,7 @@ void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo
 */
 void ADConfigData::removeClient(const TQCString& appName)
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->deleteGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
 	config->sync();
 }
@@ -125,7 +125,7 @@ void ADConfigData::removeClient(const TQCString& appName)
 */
 void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal)
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
 	config->writePathEntry(CALENDAR_KEY, cal->urlString());
         config->sync();
@@ -137,7 +137,7 @@ void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal)
 void ADConfigData::enableAutoStart(bool on)
 {
         kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n";
-        KConfig* config = TDEGlobal::config();
+        TDEConfig* config = TDEGlobal::config();
 	config->reparseConfiguration();
         config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
         config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on);
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 8fd34b11..75bb4d2d 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -83,7 +83,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
 		 * come in the wrong order, KAlarm won't know that it is supposed to restore
 		 * itself and instead will simply open a new window.
 		 */
-		KConfig kaconfig(locate("config", "kalarmrc"));
+		TDEConfig kaconfig(locate("config", "kalarmrc"));
 		kaconfig.setGroup(TQString::fromLatin1("General"));
 		autostart = kaconfig.readBoolEntry(AUTOSTART_TRAY, false);
 		if (autostart)
@@ -594,7 +594,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
 */
 void AlarmDaemon::readKAlarmConfig()
 {
-	KConfig config(locate("config", "kalarmrc"));
+	TDEConfig config(locate("config", "kalarmrc"));
 	config.setGroup(TQString::fromLatin1("General"));
 	TQDateTime defTime(TQDate(1900,1,1), TQTime());
 	mStartOfDay = config.readDateTimeEntry(START_OF_DAY, &defTime).time();