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

15 files changed, 44 insertions, 44 deletions

diff --git a/apps/ktorrent/README b/apps/ktorrent/README
index 318bd72..69e9ac5 100644
--- a/apps/ktorrent/README
+++ b/apps/ktorrent/README
@@ -42,7 +42,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For more details, consult :
diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp
index 6084e66..6df556b 100644
--- a/apps/ktorrent/filterbar.cpp
+++ b/apps/ktorrent/filterbar.cpp
@@ -76,14 +76,14 @@ FilterBar::~FilterBar()
 {
 }
 
-void FilterBar::saveSettings(KConfig* cfg)
+void FilterBar::saveSettings(TDEConfig* cfg)
 {
 	cfg->writeEntry("filter_bar_hidden",isHidden());
 	cfg->writeEntry("filter_bar_text",m_name_filter);
 	cfg->writeEntry("filter_bar_case_sensitive",m_case_sensitive->isChecked());
 }
 	
-void FilterBar::loadSettings(KConfig* cfg)
+void FilterBar::loadSettings(TDEConfig* cfg)
 {
 	setHidden(cfg->readBoolEntry("filter_bar_hidden",true));
 	m_case_sensitive->setChecked(cfg->readBoolEntry("filter_bar_case_sensitive",true));
diff --git a/apps/ktorrent/filterbar.h b/apps/ktorrent/filterbar.h
index 06743ff..7cb4282 100644
--- a/apps/ktorrent/filterbar.h
+++ b/apps/ktorrent/filterbar.h
@@ -24,7 +24,7 @@
 
 class TQLabel;
 class TQCheckBox;
-class KConfig;
+class TDEConfig;
 class KLineEdit;
 class KPushButton;
 class KToolBarButton;
@@ -49,8 +49,8 @@ public:
 	virtual ~FilterBar();
 	
 	bool matchesFilter(kt::TorrentInterface* tc);
-	void saveSettings(KConfig* cfg);
-	void loadSettings(KConfig* cfg);
+	void saveSettings(TDEConfig* cfg);
+	void loadSettings(TDEConfig* cfg);
 
 private slots:
 	void slotChangeFilter(const TQString& nameFilter);
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index d492f02..651f9c6 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -763,11 +763,11 @@ void KTorrent::changeCaption(const TQString& text)
 	setCaption(text);
 }
 
-void KTorrent::saveProperties(KConfig* )
+void KTorrent::saveProperties(TDEConfig* )
 {
 }
 
-void KTorrent::readProperties(KConfig*)
+void KTorrent::readProperties(TDEConfig*)
 {
 }
 
diff --git a/apps/ktorrent/ktorrent.h b/apps/ktorrent/ktorrent.h
index f32641a..fff305f 100644
--- a/apps/ktorrent/ktorrent.h
+++ b/apps/ktorrent/ktorrent.h
@@ -141,14 +141,14 @@ protected:
 	 * This function is called when it is time for the app to save its
 	 * properties for session management purposes.
 	 */
-	void saveProperties(KConfig *);
+	void saveProperties(TDEConfig *);
 
 	/**
-	 * This function is called when this app is restored.  The KConfig
+	 * This function is called when this app is restored.  The TDEConfig
 	 * object points to the session management config file that was saved
 	 * with @ref saveProperties
 	 */
-	void readProperties(KConfig *);
+	void readProperties(TDEConfig *);
 
 
 private slots:
diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp
index ac04a79..c7c9c81 100644
--- a/apps/ktorrent/ktorrentcore.cpp
+++ b/apps/ktorrent/ktorrentcore.cpp
@@ -282,11 +282,11 @@ bool KTorrentCore::load(const TQString & target,const TQString & dir,bool silent
 	}
 }
 
-void KTorrentCore::downloadFinished(KIO::Job *job)
+void KTorrentCore::downloadFinished(TDEIO::Job *job)
 {
-	KIO::StoredTransferJob* j = (KIO::StoredTransferJob*)job;
+	TDEIO::StoredTransferJob* j = (TDEIO::StoredTransferJob*)job;
 	int err = j->error();
-	if (err == KIO::ERR_USER_CANCELED)
+	if (err == TDEIO::ERR_USER_CANCELED)
 	{
 		loadingFinished(j->url(),false,true);
 		return;
@@ -327,16 +327,16 @@ void KTorrentCore::load(const KURL& url)
 	}
 	else
 	{
-		KIO::Job* j = KIO::storedGet(url,false,true);
-		connect(j,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(downloadFinished( KIO::Job* )));
+		TDEIO::Job* j = TDEIO::storedGet(url,false,true);
+		connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinished( TDEIO::Job* )));
 	}
 }
 
-void KTorrentCore::downloadFinishedSilently(KIO::Job *job)
+void KTorrentCore::downloadFinishedSilently(TDEIO::Job *job)
 {
-	KIO::StoredTransferJob* j = (KIO::StoredTransferJob*)job;
+	TDEIO::StoredTransferJob* j = (TDEIO::StoredTransferJob*)job;
 	int err = j->error();
-	if (err == KIO::ERR_USER_CANCELED)
+	if (err == TDEIO::ERR_USER_CANCELED)
 	{
 		loadingFinished(j->url(),false,true);
 	}
@@ -394,8 +394,8 @@ void KTorrentCore::loadSilently(const KURL& url)
 	else
 	{
 		// download to a random file in tmp
-		KIO::Job* j = KIO::storedGet(url,false,true);
-		connect(j,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(downloadFinishedSilently( KIO::Job* )));
+		TDEIO::Job* j = TDEIO::storedGet(url,false,true);
+		connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinishedSilently( TDEIO::Job* )));
 	}
 }
 
@@ -425,9 +425,9 @@ void KTorrentCore::loadSilentlyDir(const KURL& url, const KURL& savedir)
 	else
 	{
 		// download to a random file in tmp
-		KIO::Job* j = KIO::storedGet(url,false,true);
+		TDEIO::Job* j = TDEIO::storedGet(url,false,true);
 		custom_save_locations.insert(j,savedir); // keep track of save location
-		connect(j,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(downloadFinishedSilently( KIO::Job* )));
+		connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinishedSilently( TDEIO::Job* )));
 	}
 }
 
diff --git a/apps/ktorrent/ktorrentcore.h b/apps/ktorrent/ktorrentcore.h
index f17cb89..8e25653 100644
--- a/apps/ktorrent/ktorrentcore.h
+++ b/apps/ktorrent/ktorrentcore.h
@@ -35,7 +35,7 @@ namespace bt
 	class TorrentControl;
 }
 
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -339,8 +339,8 @@ private slots:
 	void torrentFinished(kt::TorrentInterface* tc);
 	void slotStoppedByError(kt::TorrentInterface* tc, TQString msg);
 	void torrentSeedAutoStopped(kt::TorrentInterface* tc,kt::AutoStopReason reason);
-	void downloadFinished(KIO::Job *job);
-	void downloadFinishedSilently(KIO::Job *job);
+	void downloadFinished(TDEIO::Job *job);
+	void downloadFinishedSilently(TDEIO::Job *job);
 	void emitCorruptedData(kt::TorrentInterface* tc);
 	
 private:
@@ -352,7 +352,7 @@ private:
 	kt::PluginManager* pman;
 	bt::QueueManager* qman;
 	kt::GroupManager* gman;
-	TQMap<KIO::Job*,KURL> custom_save_locations; // map to store save locations
+	TQMap<TDEIO::Job*,KURL> custom_save_locations; // map to store save locations
 };
 
 #endif
diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp
index 447eaee..6dd7c67 100644
--- a/apps/ktorrent/ktorrentview.cpp
+++ b/apps/ktorrent/ktorrentview.cpp
@@ -206,7 +206,7 @@ void KTorrentView::setCurrentGroup(Group* group)
 	onExecuted(view->currentItem());
 }
 
-void KTorrentView::saveSettings(KConfig* cfg,int idx)
+void KTorrentView::saveSettings(TDEConfig* cfg,int idx)
 {
 	TQString group = TQString("KTorrentView-%1").arg(idx);
 	view->saveLayout(cfg,group);
@@ -215,7 +215,7 @@ void KTorrentView::saveSettings(KConfig* cfg,int idx)
 }
 
 
-void KTorrentView::loadSettings(KConfig* cfg,int idx)
+void KTorrentView::loadSettings(TDEConfig* cfg,int idx)
 {
 	TQString group = TQString("KTorrentView-%1").arg(idx);
 	view->restoreLayout(cfg,group);
diff --git a/apps/ktorrent/ktorrentview.h b/apps/ktorrent/ktorrentview.h
index 1355baa..b822a77 100644
--- a/apps/ktorrent/ktorrentview.h
+++ b/apps/ktorrent/ktorrentview.h
@@ -101,10 +101,10 @@ public:
 	kt::TorrentInterface* getCurrentTC();
 	
 	/// Save the views settings
-	void saveSettings(KConfig* cfg,int idx);
+	void saveSettings(TDEConfig* cfg,int idx);
 	
 	/// Load the views settings
-	void loadSettings(KConfig* cfg,int idx);
+	void loadSettings(TDEConfig* cfg,int idx);
 	
 	/**
 	 * Put the current selection in a list.
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index 78b1f47..28dd724 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -60,7 +60,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
     m_clearAccelAction = new KAction(i18n("Clear Accelerator"), 0,
         TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this));
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("UI");
     TQString accel = config->readEntry(TQString("button_%1").arg(text), "");
     if (!accel.isEmpty())
@@ -70,7 +70,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
 Button::~Button()
 {
 //     m_buttonBar->removeButton(this);
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("UI");
 
     TQRegExp r("^&([0-9])\\s.*");
diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
index 11482f8..ec53feb 100644
--- a/apps/ktorrent/newui/ddockwindow.cpp
+++ b/apps/ktorrent/newui/ddockwindow.cpp
@@ -68,7 +68,7 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
             break;
     }
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("UI");
     int mode = config->readNumEntry("MDIStyle", 3);
     Ideal::ButtonMode buttonMode = Ideal::Text;
@@ -103,7 +103,7 @@ DDockWindow::~DDockWindow()
 void DDockWindow::setVisible(bool v)
 {
     //write dock width to the config file
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     TQString group = TQString("%1").arg(m_name);
     config->setGroup(group);
 
@@ -147,7 +147,7 @@ void DDockWindow::loadSettings()
 
 void DDockWindow::saveSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     TQString group = TQString("%1").arg(m_name);
     int invisibleWidth = 0;
     config->setGroup(group);
@@ -199,7 +199,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
     {
         //if the widget was selected last time the dock is deleted
         //we need to show it
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         TQString group = TQString("%1").arg(m_name);
         config->setGroup(group);
         if (config->readEntry("ViewLastWidget") == title)
diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp
index 56ee17b..125f083 100644
--- a/apps/ktorrent/newui/dmainwindow.cpp
+++ b/apps/ktorrent/newui/dmainwindow.cpp
@@ -42,7 +42,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name)
 
 void DMainWindow::loadSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("UI");
     m_openTabAfterCurrent = config->readBoolEntry("OpenNewTabAfterCurrent", true);
     m_showIconsOnTabs = config->readBoolEntry("ShowTabIcons", false);
diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/apps/ktorrent/newui/dtabwidget.cpp
index 2176a51..7cf36a5 100644
--- a/apps/ktorrent/newui/dtabwidget.cpp
+++ b/apps/ktorrent/newui/dtabwidget.cpp
@@ -56,7 +56,7 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name)
 void DTabWidget::loadSettings()
 {
 	/*
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("UI");
 //    m_tabBarShown = config->readBoolEntry("TabBarShown", true);
     m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0);
diff --git a/apps/ktorrent/viewmanager.cpp b/apps/ktorrent/viewmanager.cpp
index 2d75635..45a99a0 100644
--- a/apps/ktorrent/viewmanager.cpp
+++ b/apps/ktorrent/viewmanager.cpp
@@ -43,7 +43,7 @@ KTorrentView* ViewManager::newView()
 	return v;
 }
 	
-void ViewManager::saveViewState(KConfig* cfg)
+void ViewManager::saveViewState(TDEConfig* cfg)
 {
 	TQStringList cv;
 	int idx = 0;
@@ -56,7 +56,7 @@ void ViewManager::saveViewState(KConfig* cfg)
 	cfg->writeEntry("current_views",cv);
 }
 	
-void ViewManager::restoreViewState(KConfig* cfg,KTorrent* ktor)
+void ViewManager::restoreViewState(TDEConfig* cfg,KTorrent* ktor)
 {
 	TQStringList def;
 	def.append(i18n("Downloads"));
diff --git a/apps/ktorrent/viewmanager.h b/apps/ktorrent/viewmanager.h
index 1c959aa..67025aa 100644
--- a/apps/ktorrent/viewmanager.h
+++ b/apps/ktorrent/viewmanager.h
@@ -24,7 +24,7 @@
 #include <tqvaluelist.h>
 #include <interfaces/guiinterface.h>
 
-class KConfig;
+class TDEConfig;
 class KTabWidget;
 class KTorrentView;
 class KTorrent;
@@ -44,10 +44,10 @@ public:
 	KTorrentView* newView();
 	
 	/// Save all views
-	void saveViewState(KConfig* cfg);
+	void saveViewState(TDEConfig* cfg);
 	
 	/// Restore all views from configuration
-	void restoreViewState(KConfig* cfg,KTorrent* ktor);
+	void restoreViewState(TDEConfig* cfg,KTorrent* ktor);
 	
 	/// Start all selected downloads in the current view
 	void startDownloads();