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

29 files changed, 92 insertions, 92 deletions

diff --git a/src/backup.cpp b/src/backup.cpp
index 3572be5..ffcfe72 100644
--- a/src/backup.cpp
+++ b/src/backup.cpp
@@ -166,7 +166,7 @@ void BackupDialog::backup()
 	TQDir dir;
 
 	// Compute a default file name & path (eg. "Baskets_2007-01-31.tar.gz"):
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Backups");
 	TQString folder = config->readEntry("lastFolder", TQDir::homeDirPath()) + "/";
 	TQString fileName = i18n("Backup filename (without extension), %1 is the date", "Baskets_%1")
@@ -224,7 +224,7 @@ void BackupDialog::backup()
 void BackupDialog::restore()
 {
 	// Get last backup folder:
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Backups");
 	TQString folder = config->readEntry("lastFolder", TQDir::homeDirPath()) + "/";
 
diff --git a/src/basket.cpp b/src/basket.cpp
index 69b941e..9d9d744 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -4334,7 +4334,7 @@ void Basket::noteSaveAs()
 		return;
 
 	// TODO: Convert format, etc. (use NoteContent::saveAs(fileName))
-	KIO::copy(url, KURL(fileName));
+	TDEIO::copy(url, KURL(fileName));
 }
 
 Note* Basket::selectedGroup()
@@ -4606,13 +4606,13 @@ void Basket::linkLookChanged()
 	relayoutNotes(true);
 }
 
-void Basket::slotCopyingDone2(KIO::Job *job)
+void Basket::slotCopyingDone2(TDEIO::Job *job)
 {
 	if (job->error()) {
 		DEBUG_WIN << "Copy finished, ERROR";
 		return;
 	}
-	KIO::FileCopyJob *fileCopyJob = (KIO::FileCopyJob*)job;
+	TDEIO::FileCopyJob *fileCopyJob = (TDEIO::FileCopyJob*)job;
 	Note *note = noteForFullPath(fileCopyJob->destURL().path());
 	DEBUG_WIN << "Copy finished, load note: " + fileCopyJob->destURL().path() + (note ? "" : " --- NO CORRESPONDING NOTE");
 	if (note != 0L) {
@@ -5394,7 +5394,7 @@ bool Basket::saveToFile(const TQString& fullPath, const TQByteArray& array, TQ_U
 					),
 					(openSuccess
 						? i18n("Please remove files on the disk <b>%1</b> to let the application safely save your changes.")
-							.arg(KIO::findPathMountPoint(fullPath))
+							.arg(TDEIO::findPathMountPoint(fullPath))
 						: i18n("File permissions are bad for <b>%1</b>. Please check that you have write access to it and the parent folders.")
 							.arg(fullPath)
 					),
diff --git a/src/basket.h b/src/basket.h
index 013351b..6bcb146 100644
--- a/src/basket.h
+++ b/src/basket.h
@@ -589,7 +589,7 @@ public slots:
 	void contentsDragMoveEvent(TQDragMoveEvent *event);
 	void contentsDragLeaveEvent(TQDragLeaveEvent*);
   public slots:
-	void slotCopyingDone2(KIO::Job *job);
+	void slotCopyingDone2(TDEIO::Job *job);
   public:
 	Note* noteForFullPath(const TQString &path);
 
diff --git a/src/basket_config_apps.desktop b/src/basket_config_apps.desktop
index 080a30d..821883e 100644
--- a/src/basket_config_apps.desktop
+++ b/src/basket_config_apps.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Icon=run
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
diff --git a/src/basket_config_baskets.desktop b/src/basket_config_baskets.desktop
index 8f01c5f..a74fe3e 100644
--- a/src/basket_config_baskets.desktop
+++ b/src/basket_config_baskets.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Icon=basket
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
diff --git a/src/basket_config_general.desktop b/src/basket_config_general.desktop
index 74ce1f2..1abc2c7 100644
--- a/src/basket_config_general.desktop
+++ b/src/basket_config_general.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Icon=configure
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
diff --git a/src/basket_config_new_notes.desktop b/src/basket_config_new_notes.desktop
index ca57ac7..1b07a23 100644
--- a/src/basket_config_new_notes.desktop
+++ b/src/basket_config_new_notes.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Icon=filenew
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
diff --git a/src/basket_config_notes_appearance.desktop b/src/basket_config_notes_appearance.desktop
index 225402f..d0621c0 100644
--- a/src/basket_config_notes_appearance.desktop
+++ b/src/basket_config_notes_appearance.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Icon=colorize
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
diff --git a/src/bnpview.cpp b/src/bnpview.cpp
index 1814615..75424b2 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -1793,7 +1793,7 @@ void BNPView::saveAsArchive()
 
 	TQDir dir;
 
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Basket Archive");
 	TQString folder = config->readEntry("lastFolder", TQDir::homeDirPath()) + "/";
 	TQString url = folder + TQString(basket->basketName()).replace("/", "_") + ".baskets";
diff --git a/src/exporterdialog.cpp b/src/exporterdialog.cpp
index 5edc1bb..3089ad6 100644
--- a/src/exporterdialog.cpp
+++ b/src/exporterdialog.cpp
@@ -88,7 +88,7 @@ void ExporterDialog::show()
 
 void ExporterDialog::load()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("HTML Export");
 
 	TQString folder = config->readEntry("lastFolder", TQDir::homeDirPath()) + "/";
@@ -103,7 +103,7 @@ void ExporterDialog::load()
 
 void ExporterDialog::save()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("HTML Export");
 
 	TQString folder = KURL(m_url->url()).directory();
diff --git a/src/formatimporter.cpp b/src/formatimporter.cpp
index 00045f4..bf2feeb 100644
--- a/src/formatimporter.cpp
+++ b/src/formatimporter.cpp
@@ -58,8 +58,8 @@ bool FormatImporter::shouldImportBaskets()
 void FormatImporter::copyFolder(const TQString &folder, const TQString &newFolder)
 {
 	copyFinished = false;
-	KIO::CopyJob *copyJob = KIO::copyAs(KURL(folder), KURL(newFolder), /*showProgressInfo=*/false);
-	connect( copyJob,  TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotCopyingDone(KIO::Job*)) );
+	TDEIO::CopyJob *copyJob = TDEIO::copyAs(KURL(folder), KURL(newFolder), /*showProgressInfo=*/false);
+	connect( copyJob,  TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCopyingDone(TDEIO::Job*)) );
 	while (!copyFinished)
 		kapp->processEvents();
 }
@@ -67,13 +67,13 @@ void FormatImporter::copyFolder(const TQString &folder, const TQString &newFolde
 void FormatImporter::moveFolder(const TQString &folder, const TQString &newFolder)
 {
 	copyFinished = false;
-	KIO::CopyJob *copyJob = KIO::moveAs(KURL(folder), KURL(newFolder), /*showProgressInfo=*/false);
-	connect( copyJob,  TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotCopyingDone(KIO::Job*)) );
+	TDEIO::CopyJob *copyJob = TDEIO::moveAs(KURL(folder), KURL(newFolder), /*showProgressInfo=*/false);
+	connect( copyJob,  TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCopyingDone(TDEIO::Job*)) );
 	while (!copyFinished)
 		kapp->processEvents();
 }
 
-void FormatImporter::slotCopyingDone(KIO::Job *)
+void FormatImporter::slotCopyingDone(TDEIO::Job *)
 {
 //	std::cout << "Copy finished of " + from.path() + " to " + to.path() << std::endl;
 	copyFinished = true;
diff --git a/src/formatimporter.h b/src/formatimporter.h
index 2568288..7b8b75d 100644
--- a/src/formatimporter.h
+++ b/src/formatimporter.h
@@ -25,7 +25,7 @@
 //#include <tqwidget.h>
 #include <tqdom.h>
 
-namespace KIO {
+namespace TDEIO {
 	class Job;
 }
 
@@ -44,7 +44,7 @@ class FormatImporter : TQObject
 	void copyFolder(const TQString &folder, const TQString &newFolder);
 	void moveFolder(const TQString &folder, const TQString &newFolder);
   private slots:
-	void slotCopyingDone(KIO::Job*);
+	void slotCopyingDone(TDEIO::Job*);
   private:
 	bool copyFinished;
 };
diff --git a/src/global.cpp b/src/global.cpp
index 220147f..b205478 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -41,7 +41,7 @@ BackgroundManager *Global::backgroundManager   = 0L;
 SystemTray        *Global::systemTray          = 0L;
 BNPView           *Global::bnpView             = 0L;
 TDEGlobalAccel      *Global::globalAccel         = 0L;
-KConfig           *Global::basketConfig        = 0L;
+TDEConfig           *Global::basketConfig        = 0L;
 AboutData          Global::basketAbout;
 
 void Global::setCustomSavesFolder(const TQString &folder)
@@ -92,7 +92,7 @@ KMainWindow* Global::mainWindow()
 	return 0;
 }
 
-KConfig* Global::config()
+TDEConfig* Global::config()
 {
 	if(!Global::basketConfig)
 		Global::basketConfig = KSharedConfig::openConfig("basketrc");
diff --git a/src/global.h b/src/global.h
index 35571ac..49ac04a 100644
--- a/src/global.h
+++ b/src/global.h
@@ -50,7 +50,7 @@ class Global
 	static SystemTray        *systemTray;
 	static BNPView           *bnpView;
 	static TDEGlobalAccel      *globalAccel;
-	static KConfig           *basketConfig;
+	static TDEConfig           *basketConfig;
 	static AboutData          basketAbout;
 
 	// Application Folders:
@@ -64,7 +64,7 @@ class Global
 	// Various Things:
 	static TQString openNoteIcon();      /// << @return the icon used for the "Open" action on notes.
 	static KMainWindow* mainWindow();
-	static KConfig* config();
+	static TDEConfig* config();
 	static TDEAboutData* about() { return &basketAbout; };
 };
 
diff --git a/src/htmlexporter.cpp b/src/htmlexporter.cpp
index f9ef3d3..70e0f59 100644
--- a/src/htmlexporter.cpp
+++ b/src/htmlexporter.cpp
@@ -44,7 +44,7 @@ HTMLExporter::HTMLExporter(Basket *basket)
 	TQDir dir;
 
 	// Compute a default file name & path:
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Export to HTML");
 	TQString folder = config->readEntry("lastFolder", TQDir::homeDirPath()) + "/";
 	TQString url = folder + TQString(basket->basketName()).replace("/", "_") + ".html";
@@ -550,11 +550,11 @@ TQString HTMLExporter::copyFile(const TQString &srcPath, bool createIt)
 		if (file.open(IO_WriteOnly))
 			file.close();
 		// And then we copy the file AND overwriting the file we juste created:
-		new KIO::FileCopyJob(
+		new TDEIO::FileCopyJob(
 			KURL(srcPath), KURL(fullPath), 0666, /*move=*/false,
 			/*overwrite=*/true, /*resume=*/true, /*showProgress=*/false );
 	} else
-		/*KIO::CopyJob *copyJob = */KIO::copy(KURL(srcPath), KURL(fullPath)); // Do it as before
+		/*TDEIO::CopyJob *copyJob = */TDEIO::copy(KURL(srcPath), KURL(fullPath)); // Do it as before
 
 	return fileName;
 }
diff --git a/src/kcm_basket.cpp b/src/kcm_basket.cpp
index 2c75c5b..5935872 100644
--- a/src/kcm_basket.cpp
+++ b/src/kcm_basket.cpp
@@ -28,7 +28,7 @@
 //----------------------------
 extern "C"
 {
-	KDE_EXPORT KCModule *create_basket_config_general(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_basket_config_general(TQWidget *parent, const char *)
 	{
 		GeneralPage *page = new GeneralPage(parent, "kcmbasket_config_general");
 		return page;
@@ -37,7 +37,7 @@ extern "C"
 
 extern "C"
 {
-	KDE_EXPORT KCModule *create_basket_config_baskets(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_basket_config_baskets(TQWidget *parent, const char *)
 	{
 		BasketsPage *page = new BasketsPage(parent, "kcmbasket_config_baskets");
 		return page;
@@ -46,7 +46,7 @@ extern "C"
 
 extern "C"
 {
-	KDE_EXPORT KCModule *create_basket_config_new_notes(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_basket_config_new_notes(TQWidget *parent, const char *)
 	{
 		NewNotesPage *page = new NewNotesPage(parent, "kcmbasket_config_new_notes");
 		return page;
@@ -55,7 +55,7 @@ extern "C"
 
 extern "C"
 {
-	KDE_EXPORT KCModule *create_basket_config_notes_appearance(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_basket_config_notes_appearance(TQWidget *parent, const char *)
 	{
 		NotesAppearancePage *page = new NotesAppearancePage(parent, "kcmbasket_config_notes_appearance");
 		return page;
@@ -64,7 +64,7 @@ extern "C"
 
 extern "C"
 {
-	KDE_EXPORT KCModule *create_basket_config_apps(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_basket_config_apps(TQWidget *parent, const char *)
 	{
 		ApplicationsPage *page = new ApplicationsPage(parent, "kcmbasket_config_apps");
 		return page;
diff --git a/src/kicondialog.cpp b/src/kicondialog.cpp
index a812e85..d7c7837 100644
--- a/src/kicondialog.cpp
+++ b/src/kicondialog.cpp
@@ -106,8 +106,8 @@ void KIconDialog::init()
     setCustomLocation(TQString()); // Initialize mFileList
 
     // Read configuration
-    KConfig *config = TDEGlobal::config();
-    KConfigGroupSaver saver(config, "KIconDialog");
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver saver(config, "KIconDialog");
     d->recentMax = config->readNumEntry("RecentMax", 10);
     d->recentList = config->readPathListEntry("RecentIcons");
 
@@ -143,8 +143,8 @@ void KIconDialog::init()
 KIconDialog::~KIconDialog()
 {
     // Write configuration
-    KConfig *config = TDEGlobal::config();
-    KConfigGroupSaver saver(config, "KIconDialog");
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver saver(config, "KIconDialog");
     config->writeEntry("RecentMax", d->recentMax, true, true);
     config->writePathEntry("RecentIcons", d->recentList, ',', true, true);
 
diff --git a/src/likeback.cpp b/src/likeback.cpp
index ee0c23c..ac599f7 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -208,7 +208,7 @@ LikeBackPrivate::~LikeBackPrivate()
 /********** class LikeBack: **********/
 /*************************************/
 
-LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const TDEAboutData *aboutData)
+LikeBack::LikeBack(Button buttons, bool showBarByDefault, TDEConfig *config, const TDEAboutData *aboutData)
  : TQObject()
 {
 	// Initialize properties (1/2):
@@ -369,7 +369,7 @@ const TDEAboutData* LikeBack::aboutData()
 	return d->aboutData;
 }
 
-KConfig* LikeBack::config()
+TDEConfig* LikeBack::config()
 {
 	return d->config;
 }
@@ -605,7 +605,7 @@ void LikeBack::fetchUserEmail()
 //	m_configureEmail->setEnabled(true);
 
 	// ### KDE4: why oh why is KEmailSettings in kio?
-	KConfig emailConf( TQString::fromLatin1("emaildefaults") );
+	TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
 
 	// find out the default profile
 	emailConf.setGroup(TQString::fromLatin1("Defaults"));
diff --git a/src/likeback.h b/src/likeback.h
index 1f1b684..c3d1f25 100644
--- a/src/likeback.h
+++ b/src/likeback.h
@@ -23,7 +23,7 @@
 
 #include <tqobject.h>
 
-class KConfig;
+class TDEConfig;
 class TDEAboutData;
 class KAction;
 class KActionCollection;
@@ -124,7 +124,7 @@ class LikeBack : public TQObject
 	 *                         The version is used to store the button-bar visibility per version (can be shown in a development version but not in a final one...)
 	 *                         and to send with the comment, so you can filter per version and know if a comment refers the latest version of the application or not.
 	 */
-	LikeBack(Button buttons = DefaultButtons, bool showBarByDefault = false, KConfig *config = 0, const TDEAboutData *aboutData = 0);
+	LikeBack(Button buttons = DefaultButtons, bool showBarByDefault = false, TDEConfig *config = 0, const TDEAboutData *aboutData = 0);
 
 	/**
 	 * Destructor.
@@ -330,10 +330,10 @@ class LikeBack : public TQObject
 	const TDEAboutData *aboutData();
 
 	/**
-	 * @Returns A pointer to the KConfig used to store user configuration (email address, if the button-bar should be shown).
+	 * @Returns A pointer to the TDEConfig used to store user configuration (email address, if the button-bar should be shown).
 	 * @See The LikeBack constructor for more information.
 	 */
-	KConfig *config();
+	TDEConfig *config();
 
 	/**
 	 * During the first comment sending, the user is invited to enter his email address for the developers to be able to contact him back.
diff --git a/src/likeback_private.h b/src/likeback_private.h
index 970bc0d..211855b 100644
--- a/src/likeback_private.h
+++ b/src/likeback_private.h
@@ -38,7 +38,7 @@ class LikeBackPrivate
 	LikeBackPrivate();
 	~LikeBackPrivate();
 	LikeBackBar             *bar;
-	KConfig                 *config;
+	TDEConfig                 *config;
 	const TDEAboutData        *aboutData;
 	LikeBack::Button         buttons;
 	TQString                  hostName;
diff --git a/src/linklabel.cpp b/src/linklabel.cpp
index 8e2de2a..02db7a4 100644
--- a/src/linklabel.cpp
+++ b/src/linklabel.cpp
@@ -554,7 +554,7 @@ TQString LinkDisplay::toHtml(HTMLExporter *exporter, const KURL &url, const TQSt
 
 /** LinkLookEditWidget **/
 
-LinkLookEditWidget::LinkLookEditWidget(KCModule *module, const TQString exTitle, const TQString exIcon,
+LinkLookEditWidget::LinkLookEditWidget(TDECModule *module, const TQString exTitle, const TQString exIcon,
                                        TQWidget *parent, const char *name, WFlags fl)
  : TQWidget(parent, name, fl)
 {
diff --git a/src/linklabel.h b/src/linklabel.h
index 48b67c6..3cddc05 100644
--- a/src/linklabel.h
+++ b/src/linklabel.h
@@ -38,7 +38,7 @@ class IconSizeCombo;
 
 class HTMLExporter;
 class HelpLabel;
-class KCModule;
+class TDECModule;
 
 /** Store the style of links
   * @author S�astien Laot
@@ -182,7 +182,7 @@ class LinkLookEditWidget : public TQWidget
   Q_OBJECT
   
   public:
-	LinkLookEditWidget(KCModule* module, const TQString exTitle, const TQString exIcon,
+	LinkLookEditWidget(TDECModule* module, const TQString exTitle, const TQString exIcon,
 					   TQWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 	~LinkLookEditWidget();
 	void saveChanges();
diff --git a/src/notecontent.cpp b/src/notecontent.cpp
index cc5d683..785d5b1 100644
--- a/src/notecontent.cpp
+++ b/src/notecontent.cpp
@@ -1019,7 +1019,7 @@ void FileContent::toolTipInfos(TQStringList *keys, TQStringList *values)
 {
 	// Get the size of the file:
 	uint size = TQFileInfo(fullPath()).size();
-	TQString humanFileSize = KIO::convertSize((KIO::filesize_t)size);
+	TQString humanFileSize = TDEIO::convertSize((TDEIO::filesize_t)size);
 
 	keys->append(i18n("Size"));
 	values->append(humanFileSize);
@@ -1134,7 +1134,7 @@ void FileContent::startFetchingUrlPreview()
 		KURL filteredUrl = NoteFactory::filteredURL(url);//KURIFilter::self()->filteredURI(url);
 		KURL::List urlList;
 		urlList.append(filteredUrl);
-		m_previewJob = KIO::filePreview(urlList, linkLook->previewSize(), linkLook->previewSize(), linkLook->iconSize());
+		m_previewJob = TDEIO::filePreview(urlList, linkLook->previewSize(), linkLook->previewSize(), linkLook->iconSize());
 		connect( m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(newPreview(const KFileItem*, const TQPixmap&)) );
 		connect( m_previewJob, TQT_SIGNAL(failed(const KFileItem*)),                     this, TQT_SLOT(removePreview(const KFileItem*))              );
 	}
@@ -1346,7 +1346,7 @@ void LinkContent::startFetchingUrlPreview()
 		KURL filteredUrl = NoteFactory::filteredURL(url);//KURIFilter::self()->filteredURI(url);
 		KURL::List urlList;
 		urlList.append(filteredUrl);
-		m_previewJob = KIO::filePreview(urlList, linkLook->previewSize(), linkLook->previewSize(), linkLook->iconSize());
+		m_previewJob = TDEIO::filePreview(urlList, linkLook->previewSize(), linkLook->previewSize(), linkLook->iconSize());
 		connect( m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(newPreview(const KFileItem*, const TQPixmap&)) );
 		connect( m_previewJob, TQT_SIGNAL(failed(const KFileItem*)),                     this, TQT_SLOT(removePreview(const KFileItem*))              );
 	}
diff --git a/src/notecontent.h b/src/notecontent.h
index f05c7bc..00f233b 100644
--- a/src/notecontent.h
+++ b/src/notecontent.h
@@ -41,7 +41,7 @@ class TQStringList;
 class KMultipleDrag;
 
 class KFileItem;
-namespace KIO { class PreviewJob; }
+namespace TDEIO { class PreviewJob; }
 
 class Note;
 class Basket;
@@ -370,7 +370,7 @@ class FileContent : public TQObject, public NoteContent
 	void removePreview(const KFileItem*);
 	void startFetchingUrlPreview();
   protected:
-	KIO::PreviewJob *m_previewJob;
+	TDEIO::PreviewJob *m_previewJob;
 };
 
 /** Real implementation of sound notes:
@@ -468,7 +468,7 @@ class LinkContent : public TQObject, public NoteContent
 	void removePreview(const KFileItem*);
 	void startFetchingUrlPreview();
   protected:
-	KIO::PreviewJob *m_previewJob;
+	TDEIO::PreviewJob *m_previewJob;
 };
 
 /** Real implementation of launcher notes:
diff --git a/src/notedrag.cpp b/src/notedrag.cpp
index 3b4ad3d..8b87ea8 100644
--- a/src/notedrag.cpp
+++ b/src/notedrag.cpp
@@ -115,7 +115,7 @@ void NoteDrag::serializeNotes(NoteSelection *noteList, TQDataStream &stream, boo
 				if (cutting) {
 					// Move file in a temporary place:
 					TQString fullPath = Global::tempCutFolder() + Tools::fileNameForNewFile(content->fileName(), Global::tempCutFolder());
-					KIO::move(KURL(content->fullPath()), KURL(fullPath), /*showProgressInfo=*/false);
+					TDEIO::move(KURL(content->fullPath()), KURL(fullPath), /*showProgressInfo=*/false);
 					node->fullPath = fullPath;
 					stream << fullPath;
 				} else
@@ -482,10 +482,10 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *parent, bool moveF
 				if (note->basket() != parent) {
 					TQString newFileName = NoteFactory::createFileForNewNote(parent, "", fileName);
 					note->content()->setFileName(newFileName);
-					KIO::FileCopyJob *copyJob = KIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName),
+					TDEIO::FileCopyJob *copyJob = TDEIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName),
 					                                           /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false);
-					parent->connect( copyJob, TQT_SIGNAL(result(KIO::Job *)),
-					                 parent,  TQT_SLOT(slotCopyingDone2(KIO::Job *)) );
+					parent->connect( copyJob, TQT_SIGNAL(result(TDEIO::Job *)),
+					                 parent,  TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) );
 				}
 				note->setGroupWidth(groupWidth);
 				note->setParentNote(0);
@@ -503,15 +503,15 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *parent, bool moveF
 				// Later on, file_copy/file_move will copy/move the file to the new location.
 				TQString newFileName = NoteFactory::createFileForNewNote(parent, "", fileName);
 				note = NoteFactory::loadFile(newFileName, (NoteType::Id)type, parent);
-				KIO::FileCopyJob *copyJob;
+				TDEIO::FileCopyJob *copyJob;
 				if (moveFiles)
-					copyJob = KIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName),
+					copyJob = TDEIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName),
 					                         /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false);
 				else
-					copyJob = KIO::file_copy(KURL(fullPath), KURL(parent->fullPath() + newFileName),
+					copyJob = TDEIO::file_copy(KURL(fullPath), KURL(parent->fullPath() + newFileName),
 					                         /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false);
-				parent->connect( copyJob, TQT_SIGNAL(result(KIO::Job *)),
-				                 parent,  TQT_SLOT(slotCopyingDone2(KIO::Job *)) );
+				parent->connect( copyJob, TQT_SIGNAL(result(TDEIO::Job *)),
+				                 parent,  TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) );
 				note->setGroupWidth(groupWidth);
 				note->setAddedDate(addedDate);
 				note->setLastModificationDate(lastModificationDate);
diff --git a/src/noteedit.cpp b/src/noteedit.cpp
index 77d65c5..0e463be 100644
--- a/src/noteedit.cpp
+++ b/src/noteedit.cpp
@@ -760,7 +760,7 @@ void LauncherEditDialog::slotOk()
 {
 	// TODO: Remember if a string has been modified AND IS DIFFERENT FROM THE ORIGINAL!
 
-	KConfig conf(m_noteContent->fullPath());
+	TDEConfig conf(m_noteContent->fullPath());
 	conf.setGroup("Desktop Entry");
 	conf.writeEntry("Exec", m_command->runCommand());
 	conf.writeEntry("Name", m_name->text());
diff --git a/src/notefactory.cpp b/src/notefactory.cpp
index f35728b..ee14c5c 100644
--- a/src/notefactory.cpp
+++ b/src/notefactory.cpp
@@ -686,15 +686,15 @@ Note* NoteFactory::copyFileAndLoad(const KURL &url, Basket *parent)
 //	parent->dontCareOfCreation(fullPath);
 
 
-//	KIO::CopyJob *copyJob = KIO::copy(url, KURL(fullPath));
-//	parent->connect( copyJob,  TQT_SIGNAL(copyingDone(KIO::Job *, const KURL &, const KURL &, bool, bool)),
-//					 parent, TQT_SLOT(slotCopyingDone(KIO::Job *, const KURL &, const KURL &, bool, bool)) );
+//	TDEIO::CopyJob *copyJob = TDEIO::copy(url, KURL(fullPath));
+//	parent->connect( copyJob,  TQT_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)),
+//					 parent, TQT_SLOT(slotCopyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)) );
 
-	KIO::FileCopyJob *copyJob = new KIO::FileCopyJob(
+	TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob(
 			url, KURL(fullPath), 0666, /*move=*/false,
 			/*overwrite=*/true, /*resume=*/true, /*showProgress=*/true );
-	parent->connect( copyJob,  TQT_SIGNAL(result(KIO::Job *)),
-					 parent, TQT_SLOT(slotCopyingDone2(KIO::Job *)) );
+	parent->connect( copyJob,  TQT_SIGNAL(result(TDEIO::Job *)),
+					 parent, TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) );
 
 
 	NoteType::Id type = typeForURL(url, parent); // Use the type of the original file because the target doesn't exist yet
@@ -703,7 +703,7 @@ Note* NoteFactory::copyFileAndLoad(const KURL &url, Basket *parent)
 
 Note* NoteFactory::moveFileAndLoad(const KURL &url, Basket *parent)
 {
-	// Globally the same as copyFileAndLoad() but move instead of copy (KIO::move())
+	// Globally the same as copyFileAndLoad() but move instead of copy (TDEIO::move())
 	TQString fileName = fileNameForNewNote(parent, url.fileName());
 	TQString fullPath = parent->fullPathForFileName(fileName);
 
@@ -714,15 +714,15 @@ Note* NoteFactory::moveFileAndLoad(const KURL &url, Basket *parent)
 //	parent->dontCareOfCreation(fullPath);
 
 
-//	KIO::CopyJob *copyJob = KIO::move(url, KURL(fullPath));
-//	parent->connect( copyJob,  TQT_SIGNAL(copyingDone(KIO::Job *, const KURL &, const KURL &, bool, bool)),
-//					 parent, TQT_SLOT(slotCopyingDone(KIO::Job *, const KURL &, const KURL &, bool, bool)) );
+//	TDEIO::CopyJob *copyJob = TDEIO::move(url, KURL(fullPath));
+//	parent->connect( copyJob,  TQT_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)),
+//					 parent, TQT_SLOT(slotCopyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)) );
 
-	KIO::FileCopyJob *copyJob = new KIO::FileCopyJob(
+	TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob(
 			url, KURL(fullPath), 0666, /*move=*/true,
 			/*overwrite=*/true, /*resume=*/true, /*showProgress=*/true );
-	parent->connect( copyJob,  TQT_SIGNAL(result(KIO::Job *)),
-					 parent, TQT_SLOT(slotCopyingDone2(KIO::Job *)) );
+	parent->connect( copyJob,  TQT_SIGNAL(result(TDEIO::Job *)),
+					 parent, TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) );
 
 
 	NoteType::Id type = typeForURL(url, parent); // Use the type of the original file because the target doesn't exist yet
diff --git a/src/settings.cpp b/src/settings.cpp
index 7019968..ef4e8f2 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -123,7 +123,7 @@ void Settings::loadConfig()
 	loadLinkLook(LinkLook::networkLinkLook, "Network Link Look", defaultNetworkLinkLook);
 	loadLinkLook(LinkLook::launcherLook,    "Launcher Look",     defaultLauncherLook   );
 
-	KConfig* config = Global::config();
+	TDEConfig* config = Global::config();
 	config->setGroup("Main window"); // TODO: Split with a "System tray icon" group !
 	setTreeOnLeft(           config->readBoolEntry("treeOnLeft",           true)  );
 	setFilterOnTop(          config->readBoolEntry("filterOnTop",          true)  );
@@ -207,7 +207,7 @@ void Settings::saveConfig()
 	saveLinkLook(LinkLook::networkLinkLook, "Network Link Look");
 	saveLinkLook(LinkLook::launcherLook,    "Launcher Look"    );
 
- KConfig* config = Global::config();
+ TDEConfig* config = Global::config();
 	config->setGroup("Main window");
 	config->writeEntry( "treeOnLeft",           treeOnLeft()           );
 	config->writeEntry( "filterOnTop",          filterOnTop()          );
@@ -272,7 +272,7 @@ void Settings::saveConfig()
 
 void Settings::loadLinkLook(LinkLook *look, const TQString &name, const LinkLook &defaultLook)
 {
- KConfig* config = Global::config();
+ TDEConfig* config = Global::config();
 	config->setGroup(name);
 
 	TQString underliningStrings[] = { "Always", "Never", "OnMouseHover", "OnMouseOutside" };
@@ -304,7 +304,7 @@ void Settings::loadLinkLook(LinkLook *look, const TQString &name, const LinkLook
 
 void Settings::saveLinkLook(LinkLook *look, const TQString &name)
 {
- KConfig* config = Global::config();
+ TDEConfig* config = Global::config();
 	config->setGroup(name);
 
 	TQString underliningStrings[] = { "Always", "Never", "OnMouseHover", "OnMouseOutside" };
@@ -355,7 +355,7 @@ void Settings::setAutoBullet(bool yes)
 /** GeneralPage */
 
 GeneralPage::GeneralPage(TQWidget * parent, const char * name)
- : KCModule(parent, name)
+ : TDECModule(parent, name)
 {
 	TQVBoxLayout *layout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
 	TQHBoxLayout *hLay;
@@ -500,7 +500,7 @@ void GeneralPage::defaults()
 /** BasketsPage */
 
 BasketsPage::BasketsPage(TQWidget * parent, const char * name)
- : KCModule(parent, name)
+ : TDECModule(parent, name)
 {
 	TQVBoxLayout *layout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
 	TQHBoxLayout *hLay;
@@ -680,7 +680,7 @@ void BasketsPage::defaults()
 /** class NewNotesPage: */
 
 NewNotesPage::NewNotesPage(TQWidget * parent, const char * name)
- : KCModule(parent, name)
+ : TDECModule(parent, name)
 {
 	TQVBoxLayout *layout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
 	TQHBoxLayout *hLay;
@@ -788,7 +788,7 @@ void NewNotesPage::visualize()
 /** class NotesAppearancePage: */
 
 NotesAppearancePage::NotesAppearancePage(TQWidget * parent, const char * name)
- : KCModule(parent, name)
+ : TDECModule(parent, name)
 {
 	TQVBoxLayout *layout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
 	TQTabWidget *tabs = new TQTabWidget(this);
@@ -835,7 +835,7 @@ void NotesAppearancePage::defaults()
 /** class ApplicationsPage: */
 
 ApplicationsPage::ApplicationsPage(TQWidget * parent, const char * name)
- : KCModule(parent, name)
+ : TDECModule(parent, name)
 {
 	/* Applications page */
 	TQVBoxLayout *layout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
diff --git a/src/settings.h b/src/settings.h
index 1f45bbf..ec4975d 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -53,7 +53,7 @@ class LinkLookEditWidget;
 class RunCommandRequester;
 class IconSizeCombo;
 
-class GeneralPage : public KCModule
+class GeneralPage : public TDECModule
 {
   Q_OBJECT
   
@@ -82,7 +82,7 @@ class GeneralPage : public KCModule
 	KIntNumInput        *m_timeToShowOnMouseIn;
 };
 
-class BasketsPage : public KCModule
+class BasketsPage : public TDECModule
 {
   Q_OBJECT
   
@@ -114,7 +114,7 @@ class BasketsPage : public KCModule
 	KIntNumInput        *m_reLockTimeoutMinutes;
 };
 
-class NewNotesPage : public KCModule
+class NewNotesPage : public TDECModule
 {
   Q_OBJECT
   
@@ -143,7 +143,7 @@ class NewNotesPage : public KCModule
 	TQCheckBox           *m_viewSoundFileContent;
 };
 
-class NotesAppearancePage : public KCModule
+class NotesAppearancePage : public TDECModule
 {
   Q_OBJECT
   
@@ -164,7 +164,7 @@ class NotesAppearancePage : public KCModule
 	LinkLookEditWidget  *m_launcherLook;
 };
 
-class ApplicationsPage : public KCModule
+class ApplicationsPage : public TDECModule
 {
   Q_OBJECT