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

16 files changed, 69 insertions, 69 deletions

diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp
index 51e4d6c1..7898be5a 100644
--- a/kioslave/audiocd/audiocd.cpp
+++ b/kioslave/audiocd/audiocd.cpp
@@ -56,7 +56,7 @@ extern "C"
 #include <client.h>
 #include "kcompactdisc.h"
 
-using namespace KIO;
+using namespace TDEIO;
 using namespace KCDDB;
 
 #define TQFL1(x) TQString::fromLatin1(x)
@@ -197,7 +197,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url)
 {
 	if (url.hasHost())
 	{
-		error(KIO::ERR_UNSUPPORTED_ACTION,
+		error(TDEIO::ERR_UNSUPPORTED_ACTION,
 		i18n("You cannot specify a host with this protocol. "
 				 "Please use the audiocd:/ format instead."));
 		return 0;
@@ -426,7 +426,7 @@ void AudioCDProtocol::get(const KURL & url)
 			found = true;
 		}
 		if( !found )
-			error(KIO::ERR_DOES_NOT_EXIST, url.path());
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 		cdda_close(drive);
 		return;
 	}
@@ -434,7 +434,7 @@ void AudioCDProtocol::get(const KURL & url)
 	long firstSector, lastSector;
 	if (!getSectorsForRequest(drive, firstSector, lastSector))
 	{
-		error(KIO::ERR_DOES_NOT_EXIST, url.path());
+		error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 		cdda_close(drive);
 		return;
 	}
@@ -495,7 +495,7 @@ void AudioCDProtocol::stat(const KURL & url)
 		// does this track exist?
 		if (isFile && (trackNumber < 1 || trackNumber > d->tracks))
 		{
-			error(KIO::ERR_DOES_NOT_EXIST, url.path());
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 			return;
 		}
 	}
@@ -503,23 +503,23 @@ void AudioCDProtocol::stat(const KURL & url)
 	UDSEntry entry;
 
 	UDSAtom atom;
-	atom.m_uds = KIO::UDS_NAME;
+	atom.m_uds = TDEIO::UDS_NAME;
 	atom.m_str = url.fileName().replace('/', TQFL1("%2F"));
 	kdDebug(7117) << k_funcinfo << atom.m_str << endl;
 	entry.append(atom);
 
-	atom.m_uds = KIO::UDS_FILE_TYPE;
+	atom.m_uds = TDEIO::UDS_FILE_TYPE;
 	atom.m_long = isFile ? S_IFREG : S_IFDIR;
 	entry.append(atom);
 
 	const mode_t _umask = ::umask(0);
 	::umask(_umask);
 
-	atom.m_uds = KIO::UDS_ACCESS;
+	atom.m_uds = TDEIO::UDS_ACCESS;
 	atom.m_long = 0666 & (~_umask);
 	entry.append(atom);
 
-	atom.m_uds = KIO::UDS_SIZE;
+	atom.m_uds = TDEIO::UDS_SIZE;
 	if (!isFile)
 	{
 		atom.m_long = cdda_tracks(drive);
@@ -560,20 +560,20 @@ static void app_entry(UDSEntry& e, unsigned int uds, long l)
 static void app_dir(UDSEntry& e, const TQString & n, size_t s)
 {
 	e.clear();
-	app_entry(e, KIO::UDS_NAME, TQFile::decodeName(n.local8Bit()));
-	app_entry(e, KIO::UDS_FILE_TYPE, S_IFDIR);
-	app_entry(e, KIO::UDS_ACCESS, 0400);
-	app_entry(e, KIO::UDS_SIZE, s);
-	app_entry(e, KIO::UDS_MIME_TYPE, "inode/directory");
+	app_entry(e, TDEIO::UDS_NAME, TQFile::decodeName(n.local8Bit()));
+	app_entry(e, TDEIO::UDS_FILE_TYPE, S_IFDIR);
+	app_entry(e, TDEIO::UDS_ACCESS, 0400);
+	app_entry(e, TDEIO::UDS_SIZE, s);
+	app_entry(e, TDEIO::UDS_MIME_TYPE, "inode/directory");
 }
 
 static void app_file(UDSEntry& e, const TQString & n, size_t s)
 {
 	e.clear();
-	app_entry(e, KIO::UDS_NAME, TQFile::decodeName(n.local8Bit()));
-	app_entry(e, KIO::UDS_FILE_TYPE, S_IFREG);
-	app_entry(e, KIO::UDS_ACCESS, 0400);
-	app_entry(e, KIO::UDS_SIZE, s);
+	app_entry(e, TDEIO::UDS_NAME, TQFile::decodeName(n.local8Bit()));
+	app_entry(e, TDEIO::UDS_FILE_TYPE, S_IFREG);
+	app_entry(e, TDEIO::UDS_ACCESS, 0400);
+	app_entry(e, TDEIO::UDS_SIZE, s);
 }
 
 void AudioCDProtocol::listDir(const KURL & url)
@@ -585,13 +585,13 @@ void AudioCDProtocol::listDir(const KURL & url)
 		return;
 
 	if (d->which_dir == Unknown){
-		error(KIO::ERR_DOES_NOT_EXIST, url.path());
+		error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 		cdda_close(drive);
 		return;
 	}
 
 	if ( !d->fname.isEmpty() ){
-		error(KIO::ERR_IS_FILE, url.path());
+		error(TDEIO::ERR_IS_FILE, url.path());
 		cdda_close(drive);
 		return;
 	}
@@ -681,7 +681,7 @@ void AudioCDProtocol::listDir(const KURL & url)
 				case Info:
 				case Unknown:
 				default:
-					error(KIO::ERR_INTERNAL, url.path());
+					error(TDEIO::ERR_INTERNAL, url.path());
 					cdda_close(drive);
 					return;
 			}
@@ -752,12 +752,12 @@ struct cdrom_drive *AudioCDProtocol::getDrive()
 
 		TQFileInfo fi(d->device);
 		if(!fi.isReadable())
-			error(KIO::ERR_SLAVE_DEFINED, i18n("Device doesn't have read permissions for this account.  Check the read permissions on the device."));
+			error(TDEIO::ERR_SLAVE_DEFINED, i18n("Device doesn't have read permissions for this account.  Check the read permissions on the device."));
 		else if(!fi.isWritable())
-			error(KIO::ERR_SLAVE_DEFINED, i18n("Device doesn't have write permissions for this account.  Check the write permissions on the device."));
+			error(TDEIO::ERR_SLAVE_DEFINED, i18n("Device doesn't have write permissions for this account.  Check the write permissions on the device."));
 		else if(!fi.exists())
-			error(KIO::ERR_DOES_NOT_EXIST, d->device);
-		else error(KIO::ERR_SLAVE_DEFINED,
+			error(TDEIO::ERR_DOES_NOT_EXIST, d->device);
+		else error(TDEIO::ERR_SLAVE_DEFINED,
 i18n("Unknown error.  If you have a cd in the drive try running cdparanoia -vsQ as yourself (not root). Do you see a track list? If not, make sure you have permission to access the CD device. If you are using SCSI emulation (possible if you have an IDE CD writer) then make sure you check that you have read and write permissions on the generic SCSI device, which is probably /dev/sg0, /dev/sg1, etc.. If it still does not work, try typing audiocd:/?device=/dev/sg0 (or similar) to tell kio_audiocd which device your CD-ROM is."));
 		return 0;
 	}
@@ -765,7 +765,7 @@ i18n("Unknown error.  If you have a cd in the drive try running cdparanoia -vsQ
 	if (0 != cdda_open(drive))
 	{
 		kdDebug(7117) << "cdda_open failed" << endl;
-		error(KIO::ERR_CANNOT_OPEN_FOR_READING, d->device);
+		error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, d->device);
 		cdda_close(drive);
 		return 0;
 	}
@@ -984,7 +984,7 @@ void AudioCDProtocol::parseURLArgs(const KURL & url)
  */
 void AudioCDProtocol::loadSettings()
 {
-	KConfig *config = new KConfig(TQFL1("kcmaudiocdrc"), true /*readonly*/, false /*no kdeglobals*/);
+	TDEConfig *config = new TDEConfig(TQFL1("kcmaudiocdrc"), true /*readonly*/, false /*no kdeglobals*/);
 
 	config->setGroup(TQFL1("CDDA"));
 
@@ -1019,7 +1019,7 @@ void AudioCDProtocol::loadSettings()
 	d->rreplace = config->readEntry("regexp_replace");
 	// if the regular expressions are enclosed in qoutes. remove them
 	// otherwise it is not possible to search for a space " ", since an empty (only spaces) value is not 
-	// supported by KConfig, so the space has to be qouted, but then here the regexp searches really for " "
+	// supported by TDEConfig, so the space has to be qouted, but then here the regexp searches really for " "
 	// instead of just the space. Alex
 	TQRegExp qoutedString("^\".*\"$");
 	if (qoutedString.exactMatch(d->rsearch))
diff --git a/kioslave/audiocd/audiocd.h b/kioslave/audiocd/audiocd.h
index 45271b16..a96000fb 100644
--- a/kioslave/audiocd/audiocd.h
+++ b/kioslave/audiocd/audiocd.h
@@ -38,7 +38,7 @@ namespace AudioCD {
  * It has the iosalve login and the ripping logic. The actual encoding
  * is done by encoders that are seperate objects.
  */
-class AudioCDProtocol : public KIO::SlaveBase
+class AudioCDProtocol : public TDEIO::SlaveBase
 {
 	public:
 
diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
index df27fffb..683d46ab 100644
--- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
+++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AudiocdConfig</class>
-<widget class="KCModule">
+<widget class="TDECModule">
     <property name="name">
         <cstring>AudiocdConfig</cstring>
     </property>
diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
index fbe758ba..adff68f3 100644
--- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
+++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
@@ -41,18 +41,18 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
 				
     setButtons(Default|Apply);
 
-    config = new KConfig("kcmaudiocdrc");
+    config = new TDEConfig("kcmaudiocdrc");
 
     TQPtrList<AudioCDEncoder> encoders;
     AudioCDEncoder::findAllPlugins(0, encoders);
     AudioCDEncoder *encoder;
     for ( encoder = encoders.first(); encoder; encoder = encoders.next() ){
       if (encoder->init()) {
-        KConfigSkeleton *config = NULL;
+        TDEConfigSkeleton *config = NULL;
         TQWidget *widget = encoder->getConfigureWidget(&config);
         if(widget && config){
 	   tabWidget->addTab(widget, i18n("%1 Encoder").arg(encoder->type()));
-             KConfigDialogManager *configManager = new KConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1());
+             TDEConfigDialogManager *configManager = new TDEConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1());
            encoderSettings.append(configManager);
         }
       }
@@ -60,7 +60,7 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
 
     load();
   
-    KConfigDialogManager *widget;
+    TDEConfigDialogManager *widget;
     for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
       connect(widget, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(slotModuleChanged()));
     }
@@ -135,7 +135,7 @@ void KAudiocdModule::save() {
   if (!configChanged ) return;
 
   {
-    KConfigGroupSaver saver(config, "CDDA");
+    TDEConfigGroupSaver saver(config, "CDDA");
 
     // autosearch is the name of the config option, which has the
     // reverse sense of the current text of the configuration option,
@@ -149,7 +149,7 @@ void KAudiocdModule::save() {
   }
   
   {
-    KConfigGroupSaver saver(config, "FileName");
+    TDEConfigGroupSaver saver(config, "FileName");
     config->writeEntry("file_name_template", fileNameLineEdit->text());
     config->writeEntry("album_name_template", albumNameLineEdit->text());
     config->writeEntry("regexp_example", example->text());
@@ -168,7 +168,7 @@ void KAudiocdModule::save() {
     config->writeEntry("regexp_replace", replaceOutput);
   }
 
-  KConfigDialogManager *widget;
+  TDEConfigDialogManager *widget;
   for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
     widget->updateSettings();
   }
@@ -188,7 +188,7 @@ void KAudiocdModule::load(bool useDefaults) {
 	config->setReadDefaults( useDefaults );
 
   {
-    KConfigGroupSaver saver(config, "CDDA");
+    TDEConfigGroupSaver saver(config, "CDDA");
 
 
     // Specify <=> not autosearch, as explained above in ::save()
@@ -200,7 +200,7 @@ void KAudiocdModule::load(bool useDefaults) {
   }
 
   {
-    KConfigGroupSaver saver(config, "FileName");
+    TDEConfigGroupSaver saver(config, "FileName");
     fileNameLineEdit->setText(config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}"));
     albumNameLineEdit->setText(config->readEntry("album_name_template", "%{albumartist} - %{albumtitle}"));
     kcfg_replaceInput->setText(config->readEntry("regexp_search"));
@@ -208,7 +208,7 @@ void KAudiocdModule::load(bool useDefaults) {
     example->setText(config->readEntry("example", i18n("Cool artist - example audio file.wav")));
   }
   
-  KConfigDialogManager *widget;
+  TDEConfigDialogManager *widget;
   for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
     widget->updateWidgets();
   }
@@ -217,7 +217,7 @@ void KAudiocdModule::load(bool useDefaults) {
 }
 
 void KAudiocdModule::slotModuleChanged() {
-	KConfigDialogManager *widget;
+	TDEConfigDialogManager *widget;
 	for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
 		if(widget->hasChanged()){
 			slotConfigChanged();
@@ -259,7 +259,7 @@ TQString KAudiocdModule::quickHelp() const
 
 extern "C"
 {
-    KCModule *create_audiocd(TQWidget *parent, const char */*name*/)
+    TDECModule *create_audiocd(TQWidget *parent, const char */*name*/)
     {
         return new KAudiocdModule(parent, "kcmaudiocd");
     }
diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h
index c12f2e3d..c9ec1bc7 100644
--- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h
+++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h
@@ -26,7 +26,7 @@
 #ifndef KAUDIOCDCONFIG_H
 #define KAUDIOCDCONFIG_H
 
-class KConfigDialogManager;
+class TDEConfigDialogManager;
 
 #include "audiocdconfig.h"
 class KAudiocdModule : public AudiocdConfig
@@ -54,12 +54,12 @@ private slots:
   void slotModuleChanged();
 
 private:
-  KConfig *config;
+  TDEConfig *config;
   bool configChanged;
 
   int getBitrateIndex(int value);
 
-  TQPtrList<KConfigDialogManager> encoderSettings;
+  TQPtrList<TDEConfigDialogManager> encoderSettings;
 };
 
 #endif // KAUDIOCDCONFIG_H
diff --git a/kioslave/audiocd/plugins/audiocdencoder.cpp b/kioslave/audiocd/plugins/audiocdencoder.cpp
index 6dfbec18..26c108b8 100644
--- a/kioslave/audiocd/plugins/audiocdencoder.cpp
+++ b/kioslave/audiocd/plugins/audiocdencoder.cpp
@@ -59,7 +59,7 @@ void *loadPlugin(const TQString &libFileName)
  * but I do know that this does work. :)  Feel free to improve the loading system,
  * there isn't much code anyway.
  */
-void AudioCDEncoder::findAllPlugins(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders){
+void AudioCDEncoder::findAllPlugins(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders){
     TQString foundEncoders;
 
     KStandardDirs standardDirs;
@@ -86,7 +86,7 @@ void AudioCDEncoder::findAllPlugins(KIO::SlaveBase *slave, TQPtrList<AudioCDEnco
             fileName = fileName.mid(0, fileName.find('.'));
             void *function = loadPlugin(fileName);
             if(function){
-                void (*functionPointer)(KIO::SlaveBase *, TQPtrList<AudioCDEncoder> &) = (void (*)(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)) function;
+                void (*functionPointer)(TDEIO::SlaveBase *, TQPtrList<AudioCDEncoder> &) = (void (*)(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)) function;
                 functionPointer(slave, encoders);
             }
         } 
diff --git a/kioslave/audiocd/plugins/audiocdencoder.h b/kioslave/audiocd/plugins/audiocdencoder.h
index 0e8d3144..d582d548 100644
--- a/kioslave/audiocd/plugins/audiocdencoder.h
+++ b/kioslave/audiocd/plugins/audiocdencoder.h
@@ -23,7 +23,7 @@
 #include <kio/slavebase.h>
 #include <cdinfo.h>
 
-class KConfigSkeleton;
+class TDEConfigSkeleton;
 using namespace KCDDB;
 
 class AudioCDEncoder {
@@ -34,7 +34,7 @@ public:
    * @param slave parent that this classes can use to call data() with
    * when finished encoding bits.
    */ 
-  explicit AudioCDEncoder(KIO::SlaveBase *slave) : ioslave(slave) {};
+  explicit AudioCDEncoder(TDEIO::SlaveBase *slave) : ioslave(slave) {};
   
   /**
    * Deconstructor.
@@ -114,7 +114,7 @@ public:
   /**
    * Returns a configure widget for the encoder
    */ 
-  virtual TQWidget* getConfigureWidget(KConfigSkeleton** manager) const
+  virtual TQWidget* getConfigureWidget(TDEConfigSkeleton** manager) const
                    { Q_UNUSED(manager); return NULL; }; 
  
   /**
@@ -130,14 +130,14 @@ public:
    * @param slave ioslave needed if the plugin is going to be used to encode something.
    * @param encoders container for new encoders.
    */
-  static void findAllPlugins(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders);
+  static void findAllPlugins(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders);
 
 protected:
   /**
    * Pointer to the ioslave that is running this encoder.
    * Used (only?) for the data() function to pass back encoded data.
    */
-  KIO::SlaveBase *ioslave;
+  TDEIO::SlaveBase *ioslave;
 
 };
 
diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp
index c208e659..4c1329cd 100644
--- a/kioslave/audiocd/plugins/flac/encoderflac.cpp
+++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp
@@ -37,7 +37,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
+  KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
   {
     encoders.append(new EncoderFLAC(slave));
   }
@@ -48,7 +48,7 @@ class EncoderFLAC::Private {
 public:
     FLAC__StreamEncoder *encoder;
     FLAC__StreamMetadata** metadata;
-    KIO::SlaveBase* ioslave;
+    TDEIO::SlaveBase* ioslave;
     unsigned long data;
 };
 
@@ -86,7 +86,7 @@ static FLAC__SeekableStreamEncoderSeekStatus  SeekCallback(const FLAC__SeekableS
 
 
 
-EncoderFLAC::EncoderFLAC(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {
+EncoderFLAC::EncoderFLAC(TDEIO::SlaveBase *slave) : AudioCDEncoder(slave) {
     d = new Private();
     d->ioslave = slave;
     d->encoder = 0;
diff --git a/kioslave/audiocd/plugins/flac/encoderflac.h b/kioslave/audiocd/plugins/flac/encoderflac.h
index 9bec8bf4..e563e061 100644
--- a/kioslave/audiocd/plugins/flac/encoderflac.h
+++ b/kioslave/audiocd/plugins/flac/encoderflac.h
@@ -35,7 +35,7 @@
 class EncoderFLAC : public AudioCDEncoder {
 
 public:
-  EncoderFLAC(KIO::SlaveBase *slave);
+  EncoderFLAC(TDEIO::SlaveBase *slave);
   ~EncoderFLAC();
   
   virtual TQString type() const { return "FLAC"; };
diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/kioslave/audiocd/plugins/lame/encoderlame.cpp
index 6e3d3ff3..8984bb33 100644
--- a/kioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/kioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -37,7 +37,7 @@
 
 extern "C"
 {
-	KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) {
+	KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) {
 		encoders.append(new EncoderLame(slave));
 	}
 }
@@ -57,7 +57,7 @@ public:
 	KTempFile *tempFile;
 };
 
-EncoderLame::EncoderLame(KIO::SlaveBase *slave) : TQObject(), AudioCDEncoder(slave) {
+EncoderLame::EncoderLame(TDEIO::SlaveBase *slave) : TQObject(), AudioCDEncoder(slave) {
 	d = new Private();
 	d->waitingForWrite = false;
 	d->processHasExited = false;
@@ -69,7 +69,7 @@ EncoderLame::~EncoderLame(){
 	delete d;
 }
 
-TQWidget* EncoderLame::getConfigureWidget(KConfigSkeleton** manager) const {
+TQWidget* EncoderLame::getConfigureWidget(TDEConfigSkeleton** manager) const {
 	(*manager) = Settings::self();
 	TDEGlobal::locale()->insertCatalogue("audiocd_encoder_lame");
 	EncoderLameConfig *config = new EncoderLameConfig();
diff --git a/kioslave/audiocd/plugins/lame/encoderlame.h b/kioslave/audiocd/plugins/lame/encoderlame.h
index 5ef7d761..09c323c3 100644
--- a/kioslave/audiocd/plugins/lame/encoderlame.h
+++ b/kioslave/audiocd/plugins/lame/encoderlame.h
@@ -33,7 +33,7 @@ Q_OBJECT
   
 
 public:
-	EncoderLame(KIO::SlaveBase *slave);
+	EncoderLame(TDEIO::SlaveBase *slave);
 	~EncoderLame();
 
 	virtual TQString type() const { return "MP3"; };
@@ -48,7 +48,7 @@ public:
 	virtual long readCleanup();
 	virtual TQString lastErrorMessage() const;
 
-	virtual TQWidget* getConfigureWidget(KConfigSkeleton** manager) const;
+	virtual TQWidget* getConfigureWidget(TDEConfigSkeleton** manager) const;
 
 protected slots:
 	void wroteStdin(TDEProcess *proc);
diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp
index 1aacbc24..c5340434 100644
--- a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp
+++ b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp
@@ -40,7 +40,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
+  KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
   {
     encoders.append(new EncoderVorbis(slave));
   }
@@ -71,7 +71,7 @@ public:
   int vorbis_bitrate;
 };
 
-EncoderVorbis::EncoderVorbis(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {
+EncoderVorbis::EncoderVorbis(TDEIO::SlaveBase *slave) : AudioCDEncoder(slave) {
   d = new Private();
 }
 
@@ -79,7 +79,7 @@ EncoderVorbis::~EncoderVorbis(){
   delete d;
 }
 
-TQWidget* EncoderVorbis::getConfigureWidget(KConfigSkeleton** manager) const {
+TQWidget* EncoderVorbis::getConfigureWidget(TDEConfigSkeleton** manager) const {
   (*manager) = Settings::self();
   TDEGlobal::locale()->insertCatalogue("audiocd_encoder_vorbis");
   EncoderVorbisConfig *config = new EncoderVorbisConfig();
diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.h b/kioslave/audiocd/plugins/vorbis/encodervorbis.h
index fbf649c7..ea6a0ac3 100644
--- a/kioslave/audiocd/plugins/vorbis/encodervorbis.h
+++ b/kioslave/audiocd/plugins/vorbis/encodervorbis.h
@@ -39,7 +39,7 @@
 class EncoderVorbis : public AudioCDEncoder {
 
 public:
-  EncoderVorbis(KIO::SlaveBase *slave);
+  EncoderVorbis(TDEIO::SlaveBase *slave);
   ~EncoderVorbis();
   
   virtual TQString type() const { return "Ogg Vorbis"; };
@@ -52,7 +52,7 @@ public:
   virtual long readInit(long size);
   virtual long read(int16_t * buf, int frames);
   virtual long readCleanup();
-  virtual TQWidget* getConfigureWidget(KConfigSkeleton** manager) const;
+  virtual TQWidget* getConfigureWidget(TDEConfigSkeleton** manager) const;
 
 private:
   long flush_vorbis();
diff --git a/kioslave/audiocd/plugins/wav/encodercda.h b/kioslave/audiocd/plugins/wav/encodercda.h
index 814432b3..bb1297c7 100644
--- a/kioslave/audiocd/plugins/wav/encodercda.h
+++ b/kioslave/audiocd/plugins/wav/encodercda.h
@@ -38,7 +38,7 @@
 class EncoderCda : public AudioCDEncoder {
 
 public:
-  EncoderCda(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {};
+  EncoderCda(TDEIO::SlaveBase *slave) : AudioCDEncoder(slave) {};
   ~EncoderCda(){};
   virtual bool init(){ return true; };
   virtual void loadSettings(){};
diff --git a/kioslave/audiocd/plugins/wav/encoderwav.cpp b/kioslave/audiocd/plugins/wav/encoderwav.cpp
index 57e455c1..84a8586b 100644
--- a/kioslave/audiocd/plugins/wav/encoderwav.cpp
+++ b/kioslave/audiocd/plugins/wav/encoderwav.cpp
@@ -26,7 +26,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
+  KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
   {
     encoders.append( new EncoderWav(slave));
     encoders.append( new EncoderCda(slave));
diff --git a/kioslave/audiocd/plugins/wav/encoderwav.h b/kioslave/audiocd/plugins/wav/encoderwav.h
index 128faa87..154236f2 100644
--- a/kioslave/audiocd/plugins/wav/encoderwav.h
+++ b/kioslave/audiocd/plugins/wav/encoderwav.h
@@ -37,7 +37,7 @@
 class EncoderWav : public EncoderCda {
 
 public:
-  EncoderWav(KIO::SlaveBase *slave) : EncoderCda(slave) {};
+  EncoderWav(TDEIO::SlaveBase *slave) : EncoderCda(slave) {};
   ~EncoderWav(){};
   virtual bool init(){ return true; };
   virtual unsigned long size(long time_secs) const;