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

11 files changed, 24 insertions, 24 deletions

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;