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

22 files changed, 78 insertions, 78 deletions

diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index 9bcffc8..e62ddc8 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -67,7 +67,7 @@ Wakeup::~Wakeup()
 
 void Wakeup::update()
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("Noatun Alarm");
 
 	hour[0]=config->readNumEntry("Hour1",7);
@@ -287,7 +287,7 @@ void WakeupPrefs::slotViewFrame(int state)
 
 void WakeupPrefs::save()
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("Noatun Alarm");
 	config->writeEntry("Monday",monday->isChecked());
 	config->writeEntry("Tuesday",tuesday->isChecked());
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index 9271616..a619a0e 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -53,7 +53,7 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent)
   void
 AlsaPlayerConfigModule::save()
 {
-  KConfig * c(TDEGlobal::config());
+  TDEConfig * c(TDEGlobal::config());
   c->setGroup("AlsaPlayerInterface");
   c->writeEntry("ScrollTitle", scroll_->isChecked());
   c->sync();
@@ -63,7 +63,7 @@ AlsaPlayerConfigModule::save()
   void
 AlsaPlayerConfigModule::reopen()
 {
-  KConfig * c(TDEGlobal::config());
+  TDEConfig * c(TDEGlobal::config());
   c->setGroup("AlsaPlayerInterface");
   scroll_->setChecked(c->readBoolEntry("ScrollTitle", true));
 }
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index 08056ae..b48f011 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -53,7 +53,7 @@ CharlatanConfigModule::CharlatanConfigModule(TQObject * parent)
   void
 CharlatanConfigModule::save()
 {
-  KConfig * c(TDEGlobal::config());
+  TDEConfig * c(TDEGlobal::config());
   c->setGroup("CharlatanInterface");
   c->writeEntry("ScrollTitle", scroll_->isChecked());
   c->sync();
@@ -63,7 +63,7 @@ CharlatanConfigModule::save()
   void
 CharlatanConfigModule::reopen()
 {
-  KConfig * c(TDEGlobal::config());
+  TDEConfig * c(TDEGlobal::config());
   c->setGroup("CharlatanInterface");
   scroll_->setChecked(c->readBoolEntry("ScrollTitle", true));
 }
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index b708f02..91cff44 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -394,7 +394,7 @@ void Charlatan::slotTimeout()
 
 void Charlatan::loadConfig()
 {
-	KConfig * c(TDEGlobal::config());
+	TDEConfig * c(TDEGlobal::config());
 	c->setGroup("CharlatanInterface");
 	titleLabel_->setScroll(c->readBoolEntry("ScrollTitle", true));
 }
diff --git a/noatun-plugins/dub/dub/dubapp.h b/noatun-plugins/dub/dub/dubapp.h
index 670a758..0c4f27d 100644
--- a/noatun-plugins/dub/dub/dubapp.h
+++ b/noatun-plugins/dub/dub/dubapp.h
@@ -59,7 +59,7 @@ protected:
   virtual void closeEvent(TQCloseEvent*e);
 
 private:
-  KConfig *config;
+  TDEConfig *config;
   /** view is the main widget which represents your working area. The View
    * class should handle all events of the view widget.  It is kept empty so
    * you can create your view according to your application's needs by
diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp
index 970e9ad..9e81d45 100644
--- a/noatun-plugins/dub/dub/dubconfigmodule.cpp
+++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp
@@ -47,7 +47,7 @@ DubConfigModule::~DubConfigModule()
 
 void DubConfigModule::save(void)
 {
-  KConfig* config(TDEGlobal::config());
+  TDEConfig* config(TDEGlobal::config());
   config->setGroup("DubPlaylist");
 
   mediaDirectory = prefs->mediaDirectory->url();
@@ -81,7 +81,7 @@ void DubConfigModule::save(void)
 void DubConfigModule::reopen(void)
 {
   kdDebug(90010) << "dubconfig: reopen" << endl;
-  KConfig* config(TDEGlobal::config());
+  TDEConfig* config(TDEGlobal::config());
   config->setGroup("DubPlaylist");
   mediaDirectory = config->readPathEntry("MediaDirectory", "~/");
   kdDebug(90010) << "dub: media home is " << mediaDirectory << endl;
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index 706ade4..a562751 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -30,7 +30,7 @@ View::View(int width, int height, int block, int unblock, TQColor front, TQColor
 	setPaletteBackgroundColor(back);
 	KWin::setState(handle(), NET::SkipTaskbar);
 
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 
 	TQSize size = napp->desktop()->size();
@@ -80,7 +80,7 @@ View::View(int width, int height, int block, int unblock, TQColor front, TQColor
 
 View::~View()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	c->writeEntry("at"+TQString::number(mChannel), pos());
 }
@@ -234,7 +234,7 @@ FFRSPrefs::FFRSPrefs( TQObject *parent )
 
 void FFRSPrefs::save()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 
 	c->setGroup("FFRS");
 	c->writeEntry("width", mWidth->value());
@@ -251,35 +251,35 @@ void FFRSPrefs::save()
 
 int FFRSPrefs::width()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	return c->readNumEntry("width", 22);
 }
 
 int FFRSPrefs::height()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	return c->readNumEntry("height", 162);
 }
 
 int FFRSPrefs::fgblock()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	return c->readNumEntry("fgblock", 27-12);
 }
 
 int FFRSPrefs::bgblock()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	return c->readNumEntry("bgblock", 12);
 }
 
 int FFRSPrefs::rate()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	return c->readNumEntry("rate", 110);
 }
@@ -287,7 +287,7 @@ int FFRSPrefs::rate()
 
 TQColor FFRSPrefs::bgcolor()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	TQColor dumbass(0, 64, 0);
 	return c->readColorEntry("bgcolor", &dumbass);
@@ -295,7 +295,7 @@ TQColor FFRSPrefs::bgcolor()
 
 TQColor FFRSPrefs::fgcolor()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	TQColor dumbass(0, 255, 0);
 	return c->readColorEntry("fgcolor", &dumbass);
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 1f94dcd..3d5f677 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -178,7 +178,7 @@ void LyricsCModule::queryChanged( const TQString &query ) {
 
 
 void LyricsCModule::save() {
-  KConfig *conf = TDEGlobal::config();
+  TDEConfig *conf = TDEGlobal::config();
   conf->setGroup( "Lyrics" );
   TQStringList queryList, nameList;
   TQValueVector<SearchProvider>::iterator it;
@@ -197,7 +197,7 @@ void LyricsCModule::save() {
 
 void LyricsCModule::reopen() {
   TQStringList queryList, nameList;
-  KConfig *conf = TDEGlobal::config();
+  TDEConfig *conf = TDEGlobal::config();
   mProviders.clear();
   providersBox->clear();
   kdDebug(90020) << "config read" << endl;
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index 9fa4921..cd6754b 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -54,7 +54,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
 
   /* Connect signals/slots */
 	connect( htmlpart->browserExtension(), TQT_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & )));
-  connect( htmlpart, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(loadingURL(KIO::Job *)) );
+  connect( htmlpart, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(loadingURL(TDEIO::Job *)) );
   connect( htmlpart, TQT_SIGNAL(completed()), this, TQT_SLOT(loadedURL()) );
   connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) );
   connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) );
@@ -69,7 +69,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
   setAutoSaveSettings("Lyrics");
 
   /* Load configuration */
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("Lyrics");
   follow_act->setChecked(config->readBoolEntry("follow", true));
   /* Create config object */
@@ -112,7 +112,7 @@ void Lyrics::attach(bool a) {
   }
 }
 
-void Lyrics::loadingURL(KIO::Job *)
+void Lyrics::loadingURL(TDEIO::Job *)
 {
   statusBar()->changeItem(i18n("Loading..."), 0);
 }
@@ -245,7 +245,7 @@ void Lyrics::openURLRequest( const KURL &url, const KParts::URLArgs & )
 Lyrics::~Lyrics()
 {
   /* Save configurations */
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("Lyrics");
   config->writeEntry("follow", follow_act->isChecked());
   // Force saving, as closeEvent is probably never called
diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h
index 8da656c..c41e186 100644
--- a/noatun-plugins/lyrics/lyrics.h
+++ b/noatun-plugins/lyrics/lyrics.h
@@ -33,7 +33,7 @@ protected:
 protected slots:
   void changeUI(int, bool);
   void openURLRequest( const KURL &, const KParts::URLArgs & );
-  void loadingURL(KIO::Job *);
+  void loadingURL(TDEIO::Job *);
   void loadedURL();
   void attach(bool);
   void newSong();
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index ec3485e..15e0520 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -28,7 +28,7 @@
 
 
 KDataCollection::KDataCollection(
-		KConfig *config, const TQString &group, const TQString &entry,
+		TDEConfig *config, const TQString &group, const TQString &entry,
 		const char *datadir, const TQString &dir
 	)
 {
@@ -36,7 +36,7 @@ KDataCollection::KDataCollection(
 }
 
 KDataCollection::KDataCollection(
-		KConfig *config, const TQString &group, const TQString &entry,
+		TDEConfig *config, const TQString &group, const TQString &entry,
 		const TQString &dir
 	)
 {
@@ -44,13 +44,13 @@ KDataCollection::KDataCollection(
 }
 
 KDataCollection::KDataCollection(
-		KConfig *config, const TQString &group, const TQString &dir
+		TDEConfig *config, const TQString &group, const TQString &dir
 	)
 {
 	init(config, group, dir, "appdata", dir);
 }
 
-KDataCollection::KDataCollection(KConfig *config, const TQString &dir)
+KDataCollection::KDataCollection(TDEConfig *config, const TQString &dir)
 {
 	init(config, "KDataCollection", dir, "appdata", dir);
 }
@@ -61,7 +61,7 @@ KDataCollection::KDataCollection(const TQString &dir)
 }
 
 void KDataCollection::init(
-		KConfig *config, const TQString &group, const TQString &entry,
+		TDEConfig *config, const TQString &group, const TQString &entry,
 		const char *datadir, const TQString &dir
 	)
 {
@@ -74,7 +74,7 @@ void KDataCollection::init(
 
 TQStringList KDataCollection::names() const
 {
-	KConfigGroup g(mConfig, mGroup);
+	TDEConfigGroup g(mConfig, mGroup);
 
 	// these are the entries I have
 	TQStringList n = g.readListEntry(mEntry);
@@ -96,7 +96,7 @@ TQStringList KDataCollection::names() const
 
 void KDataCollection::remove(const TQString &name)
 {
-	KConfigGroup g(mConfig, mGroup);
+	TDEConfigGroup g(mConfig, mGroup);
 	TQString location = file(name);
 	if (location.isEmpty()) return;
 	if (location == saveFile(name, false))
diff --git a/noatun-plugins/oblique/kdatacollection.h b/noatun-plugins/oblique/kdatacollection.h
index 6230ddb..71a9ea7 100644
--- a/noatun-plugins/oblique/kdatacollection.h
+++ b/noatun-plugins/oblique/kdatacollection.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-class KConfig;
+class TDEConfig;
 
 /**
  * This class allows you to have a set of files.  Some of which can be included
@@ -45,7 +45,7 @@ class KConfig;
  **/
 class KDataCollection
 {
-	KConfig *mConfig;
+	TDEConfig *mConfig;
 	TQString mGroup, mEntry, mDir;
 	const char *mDatadir;
 
@@ -60,7 +60,7 @@ public:
 	 * @param datadir is what is passed to locate, this is "appdata" by default
 	 **/
 	KDataCollection(
-			KConfig *config, const TQString &group, const TQString &entry,
+			TDEConfig *config, const TQString &group, const TQString &entry,
 			const char *datadir, const TQString &dir
 		);
 
@@ -69,32 +69,32 @@ public:
 	 * settings, @p dir is the second argument to locate("appdata", ...)
 	 **/
 	KDataCollection(
-			KConfig *config, const TQString &group, const TQString &entry,
+			TDEConfig *config, const TQString &group, const TQString &entry,
 			const TQString &dir
 		);
 
 	/**
-	 * constructor.  The entry in the KConfig group will be named the same as
+	 * constructor.  The entry in the TDEConfig group will be named the same as
 	 * @p dir.
 	 *
 	 * otherwise the same as the previous function
 	 **/
 	KDataCollection(
-			KConfig *config, const TQString &group,
+			TDEConfig *config, const TQString &group,
 			const TQString &dir
 		);
 
 	/**
 	 * constructor.  The group will be "KDataCollection", The entry in the
-	 * KConfig group will be named the same as
+	 * TDEConfig group will be named the same as
 	 * @p dir.
 	 *
 	 * otherwise the same as the previous function
 	 **/
-	KDataCollection(KConfig *config, const TQString &dir);
+	KDataCollection(TDEConfig *config, const TQString &dir);
 
 	/**
-	 * constructor.  the KConfig is assumed to be TDEGlobal::config()
+	 * constructor.  the TDEConfig is assumed to be TDEGlobal::config()
 	 *
 	 * otherwise the same as the previous function
 	 **/
@@ -136,7 +136,7 @@ public:
 
 private:
 	void init(
-			KConfig *config, const TQString &group, const TQString &entry,
+			TDEConfig *config, const TQString &group, const TQString &entry,
 			const char *datadir, const TQString &dir
 		);
 };
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index 4b2b543..f25338a 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -30,7 +30,7 @@ Oblique::Oblique()
 	mView = 0;
 	mAdder = 0;
 	
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 
 	mBase = new Base(::locate("data", "noatun/")+"/oblique-list");
 
@@ -263,25 +263,25 @@ void DirectoryAdder::addNextPending()
 	if (!listJob &&	(pendingIt!= pendingAddDirectories.end()))
 	{
 		currentJobURL= *pendingIt;
-		listJob = KIO::listDir(currentJobURL, false, false);
+		listJob = TDEIO::listDir(currentJobURL, false, false);
 		connect(
-				listJob, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
-				TQT_SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&))
+				listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
+				TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))
 			);
 		connect(
-				listJob, TQT_SIGNAL(result(KIO::Job *)),
-				TQT_SLOT(slotResult(KIO::Job *))
+				listJob, TQT_SIGNAL(result(TDEIO::Job *)),
+				TQT_SLOT(slotResult(TDEIO::Job *))
 			);
 		connect(
-				listJob, TQT_SIGNAL(redirection(KIO::Job *, const KURL &)),
-				TQT_SLOT(slotRedirection(KIO::Job *, const KURL &))
+				listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)),
+				TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))
 			);
 		pendingAddDirectories.remove(pendingIt);
 		lastAddedSubDirectory = pendingAddDirectories.begin();
 	}
 }
 
-void DirectoryAdder::slotResult(KIO::Job *job)
+void DirectoryAdder::slotResult(TDEIO::Job *job)
 {
 	listJob= 0;
 	if (job && job->error())
@@ -291,12 +291,12 @@ void DirectoryAdder::slotResult(KIO::Job *job)
 		emit done();
 }
 
-void DirectoryAdder::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries)
+void DirectoryAdder::slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &entries)
 {
 	TQMap<TQString,KURL> __list; // temp list to sort entries
 
-	KIO::UDSEntryListConstIterator it = entries.begin();
-	KIO::UDSEntryListConstIterator end = entries.end();
+	TDEIO::UDSEntryListConstIterator it = entries.begin();
+	TDEIO::UDSEntryListConstIterator end = entries.end();
 
 	for (; it != end; ++it)
 	{
@@ -316,7 +316,7 @@ void DirectoryAdder::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries)
 	}
 }
 
-void DirectoryAdder::slotRedirection(KIO::Job *, const KURL & url)
+void DirectoryAdder::slotRedirection(TDEIO::Job *, const KURL & url)
 {
 	currentJobURL= url;
 }
diff --git a/noatun-plugins/oblique/oblique.h b/noatun-plugins/oblique/oblique.h
index ad068f1..f5c1798 100644
--- a/noatun-plugins/oblique/oblique.h
+++ b/noatun-plugins/oblique/oblique.h
@@ -18,7 +18,7 @@ class Selector;
 class TreeItem;
 class DirectoryAdder;
 
-namespace KIO
+namespace TDEIO
 {
 	class ListJob;
 	class Job;
@@ -118,7 +118,7 @@ class DirectoryAdder : public TQObject
 	Oblique *mOblique;
 	KURL::List pendingAddDirectories;
 	KURL::List::Iterator lastAddedSubDirectory;
-	KIO::ListJob *listJob;
+	TDEIO::ListJob *listJob;
 	KURL currentJobURL;
 
 public:
@@ -133,9 +133,9 @@ signals:
 	void done();
 
 private slots:
-	void slotResult(KIO::Job *job);
-	void slotEntries(KIO::Job *job, const KIO::UDSEntryList &entries);
-	void slotRedirection(KIO::Job *, const KURL & url);
+	void slotResult(TDEIO::Job *job);
+	void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &entries);
+	void slotRedirection(TDEIO::Job *, const KURL & url);
 
 private:
 	
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index b8909a1..04c9cdd 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -478,7 +478,7 @@ Tree::Tree(Oblique *oblique, TQWidget *parent)
 
 	mSlice = oblique->base()->defaultSlice();
 
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 	mFileOfQuery = g.readEntry("schema", "standard");
 	if (!setSchema(mFileOfQuery))
 	{
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 15b15e5..c769603 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -92,7 +92,7 @@ View::View(Oblique *oblique)
 	applyMainWindowSettings(TDEGlobal::config(), "Oblique View");
 	createGUI("obliqueui.rc");
 
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 	TQStringList tabids = g.readListEntry("tabids");
 	
 	for (TQStringList::Iterator i(tabids.begin()); i != tabids.end(); ++i)
@@ -142,7 +142,7 @@ View::~View()
 		tabids.append(t);
 	}
 	
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 	g.writeEntry("tabids", tabids);
 	g.sync();
 }
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index 5d64685..ac8c701 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -62,7 +62,7 @@ void SynaePrefs::save()
 	if(!changed)
 		return;
 
-	KConfig *c = TDEGlobal::config();
+	TDEConfig *c = TDEGlobal::config();
 	c->setGroup("Synaescope");
 	c->writeEntry("xResolution", xRes->value());
 	c->writeEntry("yResolution", yRes->value());
@@ -73,7 +73,7 @@ void SynaePrefs::save()
 void SynaePrefs::reopen()
 {
 //	kdDebug(66666) << k_funcinfo << endl;
-	KConfig *c = TDEGlobal::config();
+	TDEConfig *c = TDEGlobal::config();
 	c->setGroup("Synaescope");
 
 	xRes->setValue(c->readNumEntry("xResolution", 320));
diff --git a/noatun-plugins/synaescope/main.cpp b/noatun-plugins/synaescope/main.cpp
index adbadaa..02ad014 100644
--- a/noatun-plugins/synaescope/main.cpp
+++ b/noatun-plugins/synaescope/main.cpp
@@ -182,7 +182,7 @@ int main(void)
 
 	core = new Core;
 
-	KConfig mConfig("noatunrc");
+	TDEConfig mConfig("noatunrc");
 	mConfig.setGroup("Synaescope");
 
 	core->windWidth = mConfig.readNumEntry("xResolution", 320);
diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp
index eed8362..cd16408 100644
--- a/noatun-plugins/synaescope/ui.cpp
+++ b/noatun-plugins/synaescope/ui.cpp
@@ -353,7 +353,7 @@ Interface::Interface()
 	static const float SliderSize=0.125;
 
 	{
-		KConfig config("noatun/synaescope", false, false, "data");
+		TDEConfig config("noatun/synaescope", false, false, "data");
 		core->fadeMode=(SymbolID)config.readNumEntry("mode", (int)Stars);
 		core->pointsAreDiamonds=config.readBoolEntry("diamonds", false);
 		core->brightnessTwiddler=config.readDoubleNumEntry("brightness", .4);
@@ -452,7 +452,7 @@ Interface::Interface()
 
 Interface::~Interface()
 {
-	KConfig config("noatun/synaescope", false, false, "data");
+	TDEConfig config("noatun/synaescope", false, false, "data");
 	config.writeEntry("mode",core->fadeMode);
 	config.writeEntry("diamonds", core->pointsAreDiamonds);
 	config.writeEntry("brightness", core->brightnessTwiddler);
diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp
index e260d18..b61bf51 100644
--- a/noatun-plugins/tippercanoe/ui.cpp
+++ b/noatun-plugins/tippercanoe/ui.cpp
@@ -266,7 +266,7 @@ Interface::Interface()
 	static const float SliderSize=0.125;
 
 	{
-		KConfig config("noatun/synaescope", false, false, "data");
+		TDEConfig config("noatun/synaescope", false, false, "data");
 		core->fadeMode=(SymbolID)config.readNumEntry("mode", (int)Stars);
 		core->pointsAreDiamonds=config.readBoolEntry("diamonds", false);
 		core->brightnessTwiddler=config.readDoubleNumEntry("brightness", .4);
@@ -349,7 +349,7 @@ Interface::Interface()
 
 Interface::~Interface()
 {
-	KConfig config("noatun/synaescope", false, false, "data");
+	TDEConfig config("noatun/synaescope", false, false, "data");
 	config.writeEntry("mode",core->fadeMode);
 	config.writeEntry("diamonds", core->pointsAreDiamonds);
 	config.writeEntry("brightness", core->brightnessTwiddler);
diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp
index b20ec1e..2e0112e 100644
--- a/noatun-plugins/wavecapture/wavecapture.cpp
+++ b/noatun-plugins/wavecapture/wavecapture.cpp
@@ -141,8 +141,8 @@ void WaveCapture::saveAs()
 			if (url.isValid())
 				KRecentDocument::add( url );
 
-			m_job = KIO::file_move( KURL( filename2 ), url, -1, true );
-			connect( m_job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( copyFinished( KIO::Job* ) ) );
+			m_job = TDEIO::file_move( KURL( filename2 ), url, -1, true );
+			connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( copyFinished( TDEIO::Job* ) ) );
 		}
 		else
 		{
@@ -186,7 +186,7 @@ void WaveCapture::stop()
 	_timer->start( 0, true );
 }
 
-void WaveCapture::copyFinished( KIO::Job* job )
+void WaveCapture::copyFinished( TDEIO::Job* job )
 {
 	if( job == m_job )
 		m_job = 0;
diff --git a/noatun-plugins/wavecapture/wavecapture.h b/noatun-plugins/wavecapture/wavecapture.h
index 28a2a1d..da979ad 100644
--- a/noatun-plugins/wavecapture/wavecapture.h
+++ b/noatun-plugins/wavecapture/wavecapture.h
@@ -26,7 +26,7 @@
 #include <string>
 
 class TQTimer;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 class WaveCapture : public TQObject, public Plugin
 {
@@ -47,7 +47,7 @@ protected slots:
 	void playing();
 	void paused();
 	void saveAs();
-	void copyFinished( KIO::Job* );
+	void copyFinished( TDEIO::Job* );
 
 private:
 	void start();
@@ -65,7 +65,7 @@ private:
 	std::string _filename;
 
 	TQTimer* _timer;
-	KIO::Job* m_job;
+	TDEIO::Job* m_job;
 };
 
 #endif