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

6 files changed, 11 insertions, 11 deletions

diff --git a/kopete/plugins/webpresence/DESIGN b/kopete/plugins/webpresence/DESIGN
index d62c9c34..e84fca85 100644
--- a/kopete/plugins/webpresence/DESIGN
+++ b/kopete/plugins/webpresence/DESIGN
@@ -6,7 +6,7 @@ Provides a view of the current state of your contact list as a webpage.
 How It Does It
 Every so often, it writes a file containing a snapshot of who is online and who is not in your contactlist to a location you specify.  This can be a local file, an FTP server, a HTTP server, or anywhere else that KIO can access.
 
-Use KIO::NetAccess to upload the files!
+Use TDEIO::NetAccess to upload the files!
 
 Getting Info about Local User's Status
 Goal is to allow ppl who don't have us on their contactlist to see what our current status is and what our UIN/id is for each protocol.  So we need to know (protocol, uin, status).
diff --git a/kopete/plugins/webpresence/kopete_webpresence_config.desktop b/kopete/plugins/webpresence/kopete_webpresence_config.desktop
index cf2791a8..11e33a5a 100644
--- a/kopete/plugins/webpresence/kopete_webpresence_config.desktop
+++ b/kopete/plugins/webpresence/kopete_webpresence_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=html
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_webpresence
diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp
index 59cf8315..82525619 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.cpp
+++ b/kopete/plugins/webpresence/webpresenceplugin.cpp
@@ -73,7 +73,7 @@ WebPresencePlugin::~WebPresencePlugin()
 
 void WebPresencePlugin::loadSettings()
 {
-	KConfig *kconfig = TDEGlobal::config();
+	TDEConfig *kconfig = TDEGlobal::config();
 	kconfig->setGroup( "Web Presence Plugin" );
 
 	frequency = kconfig->readNumEntry("UploadFrequency", 15);
@@ -196,12 +196,12 @@ void WebPresencePlugin::slotWriteFile()
 
 	// upload it to the specified URL
 	KURL src( m_output->name() );
-	KIO::FileCopyJob *job = KIO::file_move( src, dest, -1, true, false, false );
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-			TQT_SLOT(  slotUploadJobResult( KIO::Job * ) ) );
+	TDEIO::FileCopyJob *job = TDEIO::file_move( src, dest, -1, true, false, false );
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+			TQT_SLOT(  slotUploadJobResult( TDEIO::Job * ) ) );
 }
 
-void WebPresencePlugin::slotUploadJobResult( KIO::Job *job )
+void WebPresencePlugin::slotUploadJobResult( TDEIO::Job *job )
 {
 	if ( job->error() ) {
 		kdDebug(14309) << "Error uploading presence info." << endl;
diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h
index c4db2429..d5324a40 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.h
+++ b/kopete/plugins/webpresence/webpresenceplugin.h
@@ -78,7 +78,7 @@ protected slots:
 	/**
 	 * Called when an upload finished, displays error if needed
 	 */
-	 void slotUploadJobResult( KIO::Job * );
+	 void slotUploadJobResult( TDEIO::Job * );
 	/**
 	 * Called to schedule a write, after waiting to see if more changes
 	 * occur (accounts tend to change status together)
diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp
index e62e63bc..711822d4 100644
--- a/kopete/plugins/webpresence/webpresencepreferences.cpp
+++ b/kopete/plugins/webpresence/webpresencepreferences.cpp
@@ -28,7 +28,7 @@ typedef KGenericFactory<WebPresencePreferences> WebPresencePreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_webpresence, WebPresencePreferencesFactory("kcm_kopete_webpresence"))
 
 WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
-		: KCModule(WebPresencePreferencesFactory::instance(), parent, args)
+		: TDECModule(WebPresencePreferencesFactory::instance(), parent, args)
 {
 	// Add actuall widget generated from ui file.
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
@@ -46,7 +46,7 @@ WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*n
 
 void WebPresencePreferences::widgetModified()
 {
-	emit KCModule::changed(kautoconfig->hasChanged());
+	emit TDECModule::changed(kautoconfig->hasChanged());
 }
 
 void WebPresencePreferences::save()
diff --git a/kopete/plugins/webpresence/webpresencepreferences.h b/kopete/plugins/webpresence/webpresencepreferences.h
index 5fd42de5..2ea900c3 100644
--- a/kopete/plugins/webpresence/webpresencepreferences.h
+++ b/kopete/plugins/webpresence/webpresencepreferences.h
@@ -27,7 +27,7 @@ class KAutoConfig;
  * Preference widget for the Now Listening plugin, copied from the Cryptography plugin
  * @author Olivier Goffart
  */
-class WebPresencePreferences : public KCModule  {
+class WebPresencePreferences : public TDECModule  {
    Q_OBJECT