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

26 files changed, 87 insertions, 87 deletions

diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
index 0e76b88..7ced835 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
@@ -185,7 +185,7 @@ TQImage GoogleFetcher::galleryNext( bool &end )
         	}
     	}
     	else {
-		if(KIO::NetAccess::download( m_imageList[galleryImage].imageURL(), file, 0))
+		if(TDEIO::NetAccess::download( m_imageList[galleryImage].imageURL(), file, 0))
         		image = TQImage(file);
         	else
         		image = TQImage();
@@ -195,7 +195,7 @@ TQImage GoogleFetcher::galleryNext( bool &end )
         		galleryImage = 0;
         		++galleryPage;
         	}
-        	KIO::NetAccess::removeTempFile(file);
+        	TDEIO::NetAccess::removeTempFile(file);
         	return image;
     	}
     }
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
index ccfea35..d211864 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
@@ -190,12 +190,12 @@ TQPixmap GoogleFetcherDialog::pixmapFromURL(const KURL &url) const
 {
     TQString file;
 
-    if(KIO::NetAccess::download(url, file, 0)) {
+    if(TDEIO::NetAccess::download(url, file, 0)) {
         TQPixmap pixmap = TQPixmap(file);
-        KIO::NetAccess::removeTempFile(file);
+        TDEIO::NetAccess::removeTempFile(file);
         return pixmap;
     }
-    KIO::NetAccess::removeTempFile(file);
+    TDEIO::NetAccess::removeTempFile(file);
     return TQPixmap();
 }
 
@@ -215,10 +215,10 @@ CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const GoogleImage &imag
 
     // Start downloading the image.
 
-    m_job = KIO::get(image.thumbURL(), false, false);
-    connect(m_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(imageResult(KIO::Job *)));
-    connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-            this, TQT_SLOT(imageData(KIO::Job *, const TQByteArray &)));
+    m_job = TDEIO::get(image.thumbURL(), false, false);
+    connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(imageResult(TDEIO::Job *)));
+    connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+            this, TQT_SLOT(imageData(TDEIO::Job *, const TQByteArray &)));
 }
 
 CoverIconViewItem::~CoverIconViewItem()
@@ -234,14 +234,14 @@ CoverIconViewItem::~CoverIconViewItem()
     }
 }
 
-void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data)
+void CoverIconViewItem::imageData(TDEIO::Job *, const TQByteArray &data)
 {
     int currentSize = m_buffer.size();
     m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim);
     memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
 }
 
-void CoverIconViewItem::imageResult(KIO::Job *job)
+void CoverIconViewItem::imageResult(TDEIO::Job *job)
 {
     if(job->error())
         return;
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
index 6d1c0c6..211cbca 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
@@ -74,7 +74,7 @@ private:
     TQString m_artist, m_album;
 };
 
-namespace KIO
+namespace TDEIO
 {
     class TransferJob;
 }
@@ -89,12 +89,12 @@ public:
     ~CoverIconViewItem();
 
 private slots:
-    void imageData(KIO::Job *job, const TQByteArray &data);
-    void imageResult(KIO::Job* job);
+    void imageData(TDEIO::Job *job, const TQByteArray &data);
+    void imageResult(TDEIO::Job* job);
 
 private:
     TQByteArray m_buffer;
-    TQGuardedPtr<KIO::TransferJob> m_job;
+    TQGuardedPtr<TDEIO::TransferJob> m_job;
 };
 
 #endif /* GOOGLEFETCHERDIALOG_H */
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index 2d3ad9a..0383782 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -339,7 +339,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 
 	m_playlistDirectory = locateLocal("appdata", "playlists");
 	m_playlistDirectory.append("/");
-	KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget);
+	TDEIO::NetAccess::mkdir(m_playlistDirectory, mainWidget);
 	kdDebug() << "PLAYLIST" << endl;
 
 	TQGridLayout* layout = new TQGridLayout( playlist, 4, 2, 3 );
@@ -364,7 +364,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	m_list->setColumnWidthMode(TRACK_COLUMN, TQListView::Manual);
 	m_list->setColumnWidthMode(LENGTH_COLUMN, TQListView::Manual);
 	m_list->setResizeMode(TQListView::NoColumn);
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 	m_list->restoreLayout(config, "Playlist Layout");
 	m_list->setFullWidth(true);
 	m_list->setSorting(-1);
@@ -590,7 +590,7 @@ TQWidget* PlayList::inputMainWidget()
 	return mainWidget;
 }
 
-void PlayList::loadConfig(KConfig* config)
+void PlayList::loadConfig(TDEConfig* config)
 {
 	TQValueList<int> sl;
 	bool b;
@@ -649,7 +649,7 @@ void PlayList::saveConfig()
 	saveConfig( TDEGlobal::config() );
 }
 
-void PlayList::saveConfig(KConfig* config)
+void PlayList::saveConfig(TDEConfig* config)
 {
 	saveCurrentPlaylist();
 	config->setGroup("Playlist");
@@ -1710,7 +1710,7 @@ void PlayList::setCover( TQString s1, TQString s2, bool forceFetch )
 			TQString path = locate("appdata", "nocover.png");
 			if ( !path )
 				path = locate("data", "kaffeine/nocover.png");
-			KIO::file_copy( KURL::fromPathOrURL( path ), KURL::fromPathOrURL( fname ), -1, true );
+			TDEIO::file_copy( KURL::fromPathOrURL( path ), KURL::fromPathOrURL( fname ), -1, true );
 		}
 	}
 }
@@ -1862,8 +1862,8 @@ void PlayList::slotNewPlaylistName(const TQString& text)
 	}
 	TQString oldPl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine";
 	kdDebug() << "Playlist: removing file: " << oldPl << endl;
-	if (!KIO::NetAccess::del(oldPl, mainWidget))
-		kdError() << "Playlist: " << KIO::NetAccess::lastErrorString() << endl;
+	if (!TDEIO::NetAccess::del(oldPl, mainWidget))
+		kdError() << "Playlist: " << TDEIO::NetAccess::lastErrorString() << endl;
 
 	kdDebug() << "PlayList: Set playlist name to: " << text << endl;
 	m_playlistSelector->changeItem(text, m_currentPlaylist);
@@ -1890,8 +1890,8 @@ void PlayList::removeCurrentPlaylist()
 	if (code == KMessageBox::Continue)
 	{
 		TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine";
-		if (!KIO::NetAccess::del(pl, mainWidget))
-			kdError() << "Playlist: " << KIO::NetAccess::lastErrorString() << endl;
+		if (!TDEIO::NetAccess::del(pl, mainWidget))
+			kdError() << "Playlist: " << TDEIO::NetAccess::lastErrorString() << endl;
 
 		m_playlistSelector->removeItem(m_currentPlaylist);
 		m_currentPlaylist = m_playlistSelector->currentItem();
diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h
index 75ccf88..24a02ca 100644
--- a/kaffeine/src/input/audiobrowser/playlist.h
+++ b/kaffeine/src/input/audiobrowser/playlist.h
@@ -50,7 +50,7 @@ class TQPixmap;
 class KLineEdit;
 class KComboBox;
 class KURLComboBox;
-class KConfig;
+class TDEConfig;
 class KPushButton;
 class GoogleFetcher;
 
@@ -173,8 +173,8 @@ public:
 	void removeCurrentPlaylist();
 	void saveCurrentPlaylist();
 	TQString queryCurrentPlaylist();
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 	void clearList();
 
 	void setEndless(bool);
diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp
index a58fad5..b9cbcd6 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.cpp
+++ b/kaffeine/src/input/audiobrowser/urllistview.cpp
@@ -274,11 +274,11 @@ void UrlListView::slotAddSubtitle()
 
         openSubJobBuf = TQByteArray();
 
-        openSubJob = KIO::http_post( "http://test.opensubtitles.org/xml-rpc", postData, false );
+        openSubJob = TDEIO::http_post( "http://test.opensubtitles.org/xml-rpc", postData, false );
         openSubJob->addMetaData( "content-type", "Content-Type: text/xml" );
 
-        connect( openSubJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(openSubResult(KIO::Job*)) );
-        connect( openSubJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&) ), this, TQT_SLOT(openSubData(KIO::Job*,
+        connect( openSubJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(openSubResult(TDEIO::Job*)) );
+        connect( openSubJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&) ), this, TQT_SLOT(openSubData(TDEIO::Job*,
         	const TQByteArray&)) );
 
         kdDebug() << "\n\n" << xmlRequest << "\n\n" << endl;*/
@@ -299,7 +299,7 @@ void UrlListView::slotAddSubtitle()
 
 }
 
-void UrlListView::openSubResult( KIO::Job* job )
+void UrlListView::openSubResult( TDEIO::Job* job )
 {
 	if ( openSubJob!=job )
 		return;
@@ -317,7 +317,7 @@ void UrlListView::openSubResult( KIO::Job* job )
 	openSubJob = 0;
 }
 
-void UrlListView::openSubData( KIO::Job* job, const TQByteArray& data )
+void UrlListView::openSubData( TDEIO::Job* job, const TQByteArray& data )
 {
 	if ( openSubJob != job )
 		return;
diff --git a/kaffeine/src/input/audiobrowser/urllistview.h b/kaffeine/src/input/audiobrowser/urllistview.h
index 68cb6ed..526f752 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.h
+++ b/kaffeine/src/input/audiobrowser/urllistview.h
@@ -32,7 +32,7 @@ class TQWidget;
 class TQDragObject;
 class PlaylistItem;
 class MRL;
-class KIO::Job;
+class TDEIO::Job;
 
 class UrlListView : public KListView
 {
@@ -66,8 +66,8 @@ private slots:
   void slotPlayItem();
   void slotClicked(TQListViewItem*, const TQPoint&, int);
   void slotPlayNext();
-  void openSubResult( KIO::Job* );
-  void openSubData( KIO::Job*, const TQByteArray& );
+  void openSubResult( TDEIO::Job* );
+  void openSubData( TDEIO::Job*, const TQByteArray& );
 
 protected:
   virtual bool acceptDrag(TQDropEvent* event) const;
@@ -85,7 +85,7 @@ private:
 
   PlaylistItem* m_itemOfContextMenu;
   KPopupMenu* m_contextMenu;
-  KIO::Job *openSubJob;
+  TDEIO::Job *openSubJob;
   TQByteArray openSubJobBuf;
 
 };
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 );
diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
index b1b69bb..13b3eb5 100644
--- a/kaffeine/src/input/dvb/dvbconfig.cpp
+++ b/kaffeine/src/input/dvb/dvbconfig.cpp
@@ -151,7 +151,7 @@ DVBconfig::DVBconfig( const TQString &dvbConf )
 	dir.setPath( dvbConfigIconsDir );
 	if ( !dir.exists() )
 		dir.mkdir( dvbConfigIconsDir );
-	config = new KConfig( dvbConfigDir+"dvbrc" );
+	config = new TDEConfig( dvbConfigDir+"dvbrc" );
 	downProgress = 0;
 	sizeFile = 0;
 	categories.setAutoDelete( true );
@@ -286,11 +286,11 @@ bool DVBconfig::loadDvbData( TQWidget *parent )
 	downProgress->progressBar()->setTotalSteps( 100 );
 	//job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false );
 	job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false );
-	connect( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(setDownloadResult(KIO::Job*)) );
-	connect( job, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(KIO::Job*,unsigned long)) );
+	connect( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(setDownloadResult(TDEIO::Job*)) );
+	connect( job, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(TDEIO::Job*,unsigned long)) );
 	downProgress->exec();
-	disconnect( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(setDownloadResult(KIO::Job*)) );
-	disconnect( job, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(KIO::Job*,unsigned long)) );
+	disconnect( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(setDownloadResult(TDEIO::Job*)) );
+	disconnect( job, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(TDEIO::Job*,unsigned long)) );
 	if ( downProgress ) {
 		delete downProgress;
 		downProgress = 0;
diff --git a/kaffeine/src/input/dvb/dvbconfig.h b/kaffeine/src/input/dvb/dvbconfig.h
index 84110bf..87f00c1 100644
--- a/kaffeine/src/input/dvb/dvbconfig.h
+++ b/kaffeine/src/input/dvb/dvbconfig.h
@@ -40,7 +40,7 @@
 
 #define MAX_DEVICES 8
 
-using namespace KIO;
+using namespace TDEIO;
 
 class MSpinBox : public TQSpinBox
 {
@@ -183,7 +183,7 @@ public:
 	void removeCategory( const TQString &name );
 	void changeIconCategory( const TQString &name, const TQString &icon );
 
-	KConfig *config;
+	TDEConfig *config;
 	TQString recordDir, shiftDir, filenameFormat;
 	int beginMargin, endMargin, instantDuration, sizeFile;
 	TQSize epgSize, scanSize, timerSize;
@@ -208,8 +208,8 @@ private:
 
 private slots:
 
-	void setDownloadResult( KIO::Job *job );
-	void setDownloadPercent( KIO::Job *job, unsigned long percent );
+	void setDownloadResult( TDEIO::Job *job );
+	void setDownloadPercent( TDEIO::Job *job, unsigned long percent );
 };
 
 
diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp
index c0c7ad7..e9e79d3 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.cpp
+++ b/kaffeine/src/input/dvbclient/cdwidget.cpp
@@ -140,7 +140,7 @@ CdWidget::~CdWidget()
 
 
 
-void CdWidget::loadConfig( KConfig* config )
+void CdWidget::loadConfig( TDEConfig* config )
 {
 	TQValueList<int> sl;
 
@@ -157,7 +157,7 @@ void CdWidget::loadConfig( KConfig* config )
 
 void CdWidget::saveConfig()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup("DVBClient");
 	config->writeEntry( "SplitSizes", split->sizes() );
 }
diff --git a/kaffeine/src/input/dvbclient/cdwidget.h b/kaffeine/src/input/dvbclient/cdwidget.h
index 4a48d9f..7506aad 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.h
+++ b/kaffeine/src/input/dvbclient/cdwidget.h
@@ -76,8 +76,8 @@ public slots:
 	void pauseLiveTV();
 
 private:
-	void loadConfig( KConfig* config );
-	void saveConfig( KConfig* config );
+	void loadConfig( TDEConfig* config );
+	void saveConfig( TDEConfig* config );
 
 	TQSplitter *split;
 	CdDump *dump;
diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index a4630d6..70885ad 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -294,7 +294,7 @@ void Kaffeine::updateArgs()
 		if ((url.left(1) != "/") && (!url.contains("://")) && (url.lower() != "dvd") && (url.lower() != "vcd")
 			&& (url.lower() != "audiocd") && (url.lower() != "cdda") && (url.lower() != "dvb")) {
 #if KDE_IS_VERSION(3,5,0)
-			KURL u = KIO::NetAccess::mostLocalURL(args->url(i), 0);
+			KURL u = TDEIO::NetAccess::mostLocalURL(args->url(i), 0);
 			if (u.isLocalFile())
 				url = path.absFilePath(u.path());
 			else
@@ -751,7 +751,7 @@ void Kaffeine::slotDVBNextBack(int dir)
 
 void Kaffeine::loadConfig()
 {
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 	bool b;
 
 	config->setGroup("General Options");
@@ -818,7 +818,7 @@ void Kaffeine::loadConfig()
 
 void Kaffeine::saveConfig()
 {
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 
 	if (!m_fullscreen->isChecked())
 	{
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
index 4893a32..86f9e09 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
@@ -193,7 +193,7 @@ bool GStreamerPart::openURL(const MRL& mrl)
 	{
 		kdDebug() << "GStreamerPart: Check for kaffeine/noatun/m3u/pls/asx playlist\n";
 		TQString localFile;
-		if ( KIO::NetAccess::download(m_mrl.kurl(), localFile, widget()) ) {
+		if ( TDEIO::NetAccess::download(m_mrl.kurl(), localFile, widget()) ) {
 			TQFile file( localFile );
 			file.open( IO_ReadOnly );
 			TQTextStream stream( &file );
@@ -223,7 +223,7 @@ bool GStreamerPart::openURL(const MRL& mrl)
 			}
 		}
 		else
-			kdError() << "GStreamerPart: " << KIO::NetAccess::lastErrorString() << endl;
+			kdError() << "GStreamerPart: " << TDEIO::NetAccess::lastErrorString() << endl;
 	}
 	/* check for ram playlist */
 	if ( (ext == "ra") || (ext == "rm") || (ext == "ram") || (ext == "lsc") || (ext == "pl") ) {
@@ -652,7 +652,7 @@ void GStreamerPart::slotContextMenu( const TQPoint& pos )
 void GStreamerPart::loadConfig()
 {
 	kdDebug() << "GStreamerPart: Load config" << endl;
-	KConfig* config = instance()->config();
+	TDEConfig* config = instance()->config();
 	config->setGroup("General Options");
 
 	m_audioSinkName = config->readEntry("Audio Sink", "alsasink");
@@ -668,7 +668,7 @@ void GStreamerPart::saveConfig()
 {
 	kdDebug() << "GStreamerPart: Save config" << endl;
 
-	KConfig* config = instance()->config();
+	TDEConfig* config = instance()->config();
 	config->setGroup("General Options");
 
 	config->writeEntry( "Audio Sink", m_audioSinkName );
diff --git a/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp b/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
index c6b3a16..9ae2b3b 100644
--- a/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
+++ b/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
@@ -449,12 +449,12 @@ bool PlaylistImport::ram(const MRL& playlist, TQValueList<MRL>& mrls, TQWidget*
 	kdDebug() << "PlaylistImport: Seems to be a ram playlist!" << endl;
 
 	TQString localFile, url;
-	if (KIO::NetAccess::mimetype(playlist.kurl(), parent) == "application/vnd.rn-realmedia") {
+	if (TDEIO::NetAccess::mimetype(playlist.kurl(), parent) == "application/vnd.rn-realmedia") {
 		kdDebug() << "PlaylistImport: Seems to be a real media file" << endl;
 		return false;
 	}
 
-	if (KIO::NetAccess::download(playlist.kurl(), localFile, parent))
+	if (TDEIO::NetAccess::download(playlist.kurl(), localFile, parent))
 	{
 		TQFile plFile(localFile);
 		if (!plFile.open(IO_ReadOnly)) return false;
@@ -475,7 +475,7 @@ bool PlaylistImport::ram(const MRL& playlist, TQValueList<MRL>& mrls, TQWidget*
 		}
 	}
 	else {
-		kdError() << "PlaylistImport: " << KIO::NetAccess::lastErrorString() << endl;
+		kdError() << "PlaylistImport: " << TDEIO::NetAccess::lastErrorString() << endl;
                 return false;
         }
 
diff --git a/kaffeine/src/player-parts/xine-part/equalizer.cpp b/kaffeine/src/player-parts/xine-part/equalizer.cpp
index 9834a17..5a23ecf 100644
--- a/kaffeine/src/player-parts/xine-part/equalizer.cpp
+++ b/kaffeine/src/player-parts/xine-part/equalizer.cpp
@@ -199,7 +199,7 @@ void Equalizer::slotSetDefaultValues()
 
 
 /******* read from config-file ********/
-void Equalizer::ReadValues(KConfig* config)
+void Equalizer::ReadValues(TDEConfig* config)
 {
   config->setGroup("Equalizer");
 
@@ -226,7 +226,7 @@ void Equalizer::ReadValues(KConfig* config)
 
 
 /************** save in config file *************/
-void Equalizer::SaveValues(KConfig* config)
+void Equalizer::SaveValues(TDEConfig* config)
 {
   config->setGroup("Equalizer");
 
diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h
index 2e81096..e14a774 100644
--- a/kaffeine/src/player-parts/xine-part/equalizer.h
+++ b/kaffeine/src/player-parts/xine-part/equalizer.h
@@ -40,8 +40,8 @@ public:
   Equalizer(TQWidget *parent=0, const char *name=0);
   ~Equalizer();
 
-  void ReadValues(KConfig* config);
-  void SaveValues(KConfig* config);
+  void ReadValues(TDEConfig* config);
+  void SaveValues(TDEConfig* config);
 
 signals:
   void signalNewEq30(int);
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index 2b11777..90d77b9 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -185,7 +185,7 @@ bool XinePart::openURL(const MRL& mrl)
 	{
 		kdDebug() << "XinePart: Check for kaffeine/noatun/m3u/pls/asx playlist\n";
 		TQString localFile;
-		if (KIO::NetAccess::download(m_mrl.kurl(), localFile, widget()))
+		if (TDEIO::NetAccess::download(m_mrl.kurl(), localFile, widget()))
 		{
 			TQFile file(localFile);
 			file.open(IO_ReadOnly);
@@ -235,7 +235,7 @@ bool XinePart::openURL(const MRL& mrl)
 			}
 		}
 		else
-			kdError() << "XinePart: " << KIO::NetAccess::lastErrorString() << endl;
+			kdError() << "XinePart: " << TDEIO::NetAccess::lastErrorString() << endl;
 	}
 	/* check for ram playlist */
 	if ( (ext == "ra") || (ext == "rm") || (ext == "ram") || (ext == "lsc") || (ext == "pl") )
@@ -321,7 +321,7 @@ void XinePart::slotPlay(bool forcePlay)
 		kdDebug() << "XinePart: Protocol not supported by xine, try to download it..." << endl;
 
 		TQString localFile;
-		if (KIO::NetAccess::download(mrl.kurl(), localFile, widget()))
+		if (TDEIO::NetAccess::download(mrl.kurl(), localFile, widget()))
 		{
 			m_xine->clearQueue();
 			m_xine->appendToQueue(localFile);
@@ -334,7 +334,7 @@ void XinePart::slotPlay(bool forcePlay)
 				TQTimer::singleShot(0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotPlay()));
 		}
 		else
-			kdError() << "XinePart: " << KIO::NetAccess::lastErrorString() << endl;
+			kdError() << "XinePart: " << TDEIO::NetAccess::lastErrorString() << endl;
 	}
 }
 
@@ -1487,7 +1487,7 @@ void XinePart::loadConfig()
 {
 	kdDebug() << "XinePart: load config" << endl;
 
-	KConfig* config = instance()->config();
+	TDEConfig* config = instance()->config();
 
 	config->setGroup("General Options");
 	if (m_xine->SoftwareMixing())
@@ -1538,7 +1538,7 @@ void XinePart::saveConfig()
 
 	kdDebug() << "XinePart: save config" << endl;
 
-	KConfig* config = instance()->config();
+	TDEConfig* config = instance()->config();
 
 	config->setGroup("General Options");
 	config->writeEntry("Volume", m_volume->value());