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

9 files changed, 18 insertions, 18 deletions

diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
index dc66a77..5d6121f 100644
--- a/kaffeine/src/input/disc/disc.cpp
+++ b/kaffeine/src/input/disc/disc.cpp
@@ -237,7 +237,7 @@ bool Disc::execTarget( const TQString &target )
 	return false;
 }
 
-void Disc::loadConfig( KConfig* config )
+void Disc::loadConfig( TDEConfig* config )
 {
 	TQValueList<int> sl;
 
@@ -248,7 +248,7 @@ void Disc::loadConfig( KConfig* config )
 
 void Disc::saveConfig()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 
 	config->setGroup("Disc");
 	config->writeEntry( "SplitSizes", split->sizes() );
diff --git a/kaffeine/src/input/disc/disc.h b/kaffeine/src/input/disc/disc.h
index 26da1da..8c22ced 100644
--- a/kaffeine/src/input/disc/disc.h
+++ b/kaffeine/src/input/disc/disc.h
@@ -108,8 +108,8 @@ public:
 	TQVBox *playerBox;
 
 private:
-	void loadConfig( KConfig* config );
-	void saveConfig( KConfig* config );
+	void loadConfig( TDEConfig* config );
+	void saveConfig( TDEConfig* config );
 	void setCurrent( int n );
 	void setupActions();
 
diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp
index ee86993..4d444a0 100644
--- a/kaffeine/src/input/disc/paranoia.cpp
+++ b/kaffeine/src/input/disc/paranoia.cpp
@@ -50,7 +50,7 @@
 
 #define DEFAULT_DRIVE "/dev/cdrom"
 
-KiloConfig::KiloConfig( TQWidget *parent, KConfig *confile, const TQStringList &encoders ) : ParanoiaSettings( parent )
+KiloConfig::KiloConfig( TQWidget *parent, TDEConfig *confile, const TQStringList &encoders ) : ParanoiaSettings( parent )
 {
 	int i;
 
diff --git a/kaffeine/src/input/disc/paranoia.h b/kaffeine/src/input/disc/paranoia.h
index 7311d4b..8cf7106 100644
--- a/kaffeine/src/input/disc/paranoia.h
+++ b/kaffeine/src/input/disc/paranoia.h
@@ -43,7 +43,7 @@ class KiloConfig : public ParanoiaSettings
 
 public:
 
-	KiloConfig( TQWidget *parent, KConfig *confile, const TQStringList &encoders );
+	KiloConfig( TQWidget *parent, TDEConfig *confile, const TQStringList &encoders );
 	~KiloConfig();
 
 	TQString getEncoder();
@@ -58,7 +58,7 @@ public slots:
 
 private:
 
-	KConfig *Conf;
+	TDEConfig *Conf;
 };
 
 class Paranoia : public TQThread
diff --git a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
index 74e2ca4..ae2c087 100644
--- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
+++ b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
@@ -40,7 +40,7 @@ public:
 	virtual ~KaffeineAudioEncoder();
 
 	// return false if the user's canceled.
-	virtual bool options( TQWidget*, KConfig* ) {return false;}
+	virtual bool options( TQWidget*, TDEConfig* ) {return false;}
 
 	// your file extension, e.g. ".ogg"
 	virtual TQString getExtension() {return TQString();}
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
index a411a2a..9899e68 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
+++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
@@ -29,7 +29,7 @@
 #include "klameenc.h"
 #include "klameenc.moc"
 
-LameSettings::LameSettings( TQWidget *parent, KConfig *confile ) : LameConfig( parent )
+LameSettings::LameSettings( TQWidget *parent, TDEConfig *confile ) : LameConfig( parent )
 {
 	KIconLoader *icon = new KIconLoader();
 	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
@@ -101,7 +101,7 @@ TQString KLameEnc::getExtension()
 	return TQString(".mp3");
 }
 
-bool KLameEnc::options( TQWidget *parent, KConfig *conf )
+bool KLameEnc::options( TQWidget *parent, TDEConfig *conf )
 {
 	LameSettings dlg( parent, conf );
 	int ret = dlg.exec();
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
index e798d24..7132fe9 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
+++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
@@ -33,7 +33,7 @@ class LameSettings : public LameConfig
 	Q_OBJECT
   
 public:
-	LameSettings( TQWidget *parent, KConfig *confile );
+	LameSettings( TQWidget *parent, TDEConfig *confile );
 	~LameSettings();
 
 	int getBitrate();
@@ -43,7 +43,7 @@ public slots:
 	virtual void accept();
 
 private:
-	KConfig *Conf;
+	TDEConfig *Conf;
 };
 
 class KLameEnc : public KaffeineAudioEncoder
@@ -57,7 +57,7 @@ public:
 	~KLameEnc();
 
 	// Reimplemented from KaffeineAudioEncoder
-	bool options( TQWidget*, KConfig* );
+	bool options( TQWidget*, TDEConfig* );
 	TQString getExtension();
 	void start( TQString title=0, TQString artist=0, TQString album=0, TQString tracknumber=0, TQString genre=0 );
 	char* getHeader( int &len );
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
index 281a48f..8b2ee9e 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
@@ -27,7 +27,7 @@
 #include "koggenc.h"
 #include "koggenc.moc"
 
-OggSettings::OggSettings( TQWidget *parent, KConfig *confile ) : OggConfig( parent )
+OggSettings::OggSettings( TQWidget *parent, TDEConfig *confile ) : OggConfig( parent )
 {
 	KIconLoader *icon = new KIconLoader();
 	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
@@ -81,7 +81,7 @@ TQString KOggEnc::getExtension()
 	return TQString(".ogg");
 }
 
-bool KOggEnc::options( TQWidget *parent, KConfig *conf )
+bool KOggEnc::options( TQWidget *parent, TDEConfig *conf )
 {
 	OggSettings dlg( parent, conf );
 	int ret = dlg.exec();
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
index 9817990..0000179 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
@@ -41,7 +41,7 @@ class OggSettings : public OggConfig
 	Q_OBJECT
   
 public:
-	OggSettings( TQWidget *parent, KConfig *confile );
+	OggSettings( TQWidget *parent, TDEConfig *confile );
 	~OggSettings();
 
 	int getQuality();
@@ -50,7 +50,7 @@ public slots:
 	virtual void accept();
 
 private:
-	KConfig *Conf;
+	TDEConfig *Conf;
 };
 
 class KOggEnc : public KaffeineAudioEncoder
@@ -64,7 +64,7 @@ public:
 	~KOggEnc();
 
 	// Reimplemented from KaffeineAudioEncoder
-	bool options( TQWidget*, KConfig* );
+	bool options( TQWidget*, TDEConfig* );
 	TQString getExtension();
 	void start( TQString title=0, TQString artist=0, TQString album=0, TQString tracknumber=0, TQString genre=0 );
 	char* getHeader( int &len );