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

5 files changed, 30 insertions, 30 deletions

diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp
index b7dbc64..b75a04f 100644
--- a/kwallet/allyourbase.cpp
+++ b/kwallet/allyourbase.cpp
@@ -282,13 +282,13 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst
 				return;
 			}
 			TQString tmpFile;
-			if (KIO::NetAccess::download(u, tmpFile, 0L)) {
+			if (TDEIO::NetAccess::download(u, tmpFile, 0L)) {
 				file.setName(tmpFile);
 				file.open(IO_ReadOnly);
 				ds = new TQDataStream(&file);
-				KIO::NetAccess::removeTempFile(tmpFile);
+				TDEIO::NetAccess::removeTempFile(tmpFile);
 			} else {
-				KMessageBox::error(iconView(), KIO::NetAccess::lastErrorString());
+				KMessageBox::error(iconView(), TDEIO::NetAccess::lastErrorString());
 			}
 		}
 		if (ds) {
@@ -439,7 +439,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 			return;
 		}
 		TQString tmpFile;
-		if (KIO::NetAccess::download(u, tmpFile, 0L)) {
+		if (TDEIO::NetAccess::download(u, tmpFile, 0L)) {
 			file.setName(tmpFile);
 			file.open(IO_ReadOnly);
 			ds = new TQDataStream(&file);
@@ -459,9 +459,9 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 			//set the file back to the beginning
 			file.reset();
 			ds = new TQDataStream(&file);
-			KIO::NetAccess::removeTempFile(tmpFile);
+			TDEIO::NetAccess::removeTempFile(tmpFile);
 		} else {
-			KMessageBox::error(this, KIO::NetAccess::lastErrorString());
+			KMessageBox::error(this, TDEIO::NetAccess::lastErrorString());
 			return;
 		}
 	} else {
@@ -662,7 +662,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueList<TQIconDragIt
 	}
 
 	// FIXME: verify that it is a real wallet file first
-	KIO::NetAccess::file_copy(u, KURL::fromPathOrURL(dest));
+	TDEIO::NetAccess::file_copy(u, KURL::fromPathOrURL(dest));
 	e->accept();
 }
 
diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp
index 3506f58..dd03591 100644
--- a/kwallet/konfigurator/konfigurator.cpp
+++ b/kwallet/konfigurator/konfigurator.cpp
@@ -41,7 +41,7 @@ typedef KGenericFactory<KWalletConfig, TQWidget> KWalletFactory;
 K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet"))
 
 KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&)
-: KCModule(KWalletFactory::instance(), parent, name) {
+: TDECModule(KWalletFactory::instance(), parent, name) {
 
 	TDEAboutData *about =
 		new TDEAboutData(I18N_NOOP("kcmkwallet"),
@@ -51,7 +51,7 @@ KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringL
 		about->addAuthor("George Staikos", 0, "staikos@kde.org");
 	setAboutData( about );
 
-	_cfg = new KConfig("kwalletrc", false, false);
+	_cfg = new TDEConfig("kwalletrc", false, false);
 
 	TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	vbox->add(_wcw = new WalletConfigWidget(this));
@@ -182,7 +182,7 @@ void KWalletConfig::load() {
 }
 
 void KWalletConfig::load(bool useDefaults) {
-	KConfigGroup config(_cfg, "Wallet");
+	TDEConfigGroup config(_cfg, "Wallet");
 	config.setReadDefaults( useDefaults );
 	_wcw->_enabled->setChecked(config.readBoolEntry("Enabled", true));
 	_wcw->_openPrompt->setChecked(config.readBoolEntry("Prompt on Open", true));
@@ -235,7 +235,7 @@ void KWalletConfig::load(bool useDefaults) {
 
 
 void KWalletConfig::save() {
-	KConfigGroup config(_cfg, "Wallet");
+	TDEConfigGroup config(_cfg, "Wallet");
 	config.writeEntry("Enabled", _wcw->_enabled->isChecked());
 	config.writeEntry("Launch Manager", _wcw->_launchManager->isChecked());
 	config.writeEntry("Leave Manager Open", !_wcw->_autocloseManager->isChecked());
diff --git a/kwallet/konfigurator/konfigurator.h b/kwallet/konfigurator/konfigurator.h
index 28fef08..5b833ba 100644
--- a/kwallet/konfigurator/konfigurator.h
+++ b/kwallet/konfigurator/konfigurator.h
@@ -22,11 +22,11 @@
 
 #include <kcmodule.h>
 
-class KConfig;
+class TDEConfig;
 class WalletConfigWidget;
 class TQListViewItem;
 
-class KWalletConfig : public KCModule {
+class KWalletConfig : public TDECModule {
 	Q_OBJECT
   
 	public:
@@ -52,7 +52,7 @@ class KWalletConfig : public KCModule {
 
 	private:
 		WalletConfigWidget *_wcw;
-		KConfig *_cfg;
+		TDEConfig *_cfg;
 };
 
 #endif
diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp
index 69dbb48..83c69f8 100644
--- a/kwallet/kwalleteditor.cpp
+++ b/kwallet/kwalleteditor.cpp
@@ -817,7 +817,7 @@ void KWalletEditor::importWallet() {
 	}
 
 	TQString tmpFile;
-	if (!KIO::NetAccess::download(url, tmpFile, this)) {
+	if (!TDEIO::NetAccess::download(url, tmpFile, this)) {
 		KMessageBox::sorry(this, i18n("Unable to access wallet '<b>%1</b>'.").arg(url.prettyURL()));
 		return;
 	}
@@ -932,7 +932,7 @@ void KWalletEditor::importWallet() {
 
 	delete w;
 
-	KIO::NetAccess::removeTempFile(tmpFile);
+	TDEIO::NetAccess::removeTempFile(tmpFile);
 	updateFolderList(true);
 	restoreEntry();
 }
@@ -945,7 +945,7 @@ void KWalletEditor::importXML() {
 	}
 
 	TQString tmpFile;
-	if (!KIO::NetAccess::download(url, tmpFile, this)) {
+	if (!TDEIO::NetAccess::download(url, tmpFile, this)) {
 		KMessageBox::sorry(this, i18n("Unable to access XML file '<b>%1</b>'.").arg(url.prettyURL()));
 		return;
 	}
@@ -953,21 +953,21 @@ void KWalletEditor::importXML() {
 	TQFile qf(tmpFile);
 	if (!qf.open(IO_ReadOnly)) {
 		KMessageBox::sorry(this, i18n("Error opening XML file '<b>%1</b>' for input.").arg(url.prettyURL()));
-		KIO::NetAccess::removeTempFile(tmpFile);
+		TDEIO::NetAccess::removeTempFile(tmpFile);
 		return;
 	}
 
 	TQDomDocument doc(tmpFile);
 	if (!doc.setContent(&qf)) {
 		KMessageBox::sorry(this, i18n("Error reading XML file '<b>%1</b>' for input.").arg(url.prettyURL()));
-		KIO::NetAccess::removeTempFile(tmpFile);
+		TDEIO::NetAccess::removeTempFile(tmpFile);
 		return;
 	}
 
 	TQDomElement top = doc.documentElement();
 	if (top.tagName().lower() != "wallet") {
 		KMessageBox::sorry(this, i18n("Error: XML file does not contain a wallet."));
-		KIO::NetAccess::removeTempFile(tmpFile);
+		TDEIO::NetAccess::removeTempFile(tmpFile);
 		return;
 	}
 
@@ -1038,7 +1038,7 @@ void KWalletEditor::importXML() {
 		n = n.nextSibling();
 	}
 
-	KIO::NetAccess::removeTempFile(tmpFile);
+	TDEIO::NetAccess::removeTempFile(tmpFile);
 	updateFolderList(true);
 	restoreEntry();
 }
@@ -1105,7 +1105,7 @@ void KWalletEditor::exportXML() {
 
 	if (!url.isEmpty()) {
 		bool ok = true;
-		if (KIO::NetAccess::exists(url, false, this)) {
+		if (TDEIO::NetAccess::exists(url, false, this)) {
 			int rc = KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists. Would you like to overwrite this file?").arg(url.prettyURL()), i18n("Overwrite"));
 			if (rc == KMessageBox::Cancel) {
 				ok = false;
@@ -1113,7 +1113,7 @@ void KWalletEditor::exportXML() {
 		}
 		if (ok) {
 			KURL tfURL; tfURL.setPath(tf.name());
-			KIO::NetAccess::file_copy(tfURL, url, 0600, true, false, this);
+			TDEIO::NetAccess::file_copy(tfURL, url, 0600, true, false, this);
 		}
 	}
 }
@@ -1129,11 +1129,11 @@ void KWalletEditor::saveAs() {
 	if (!url.isEmpty()) {
 		// Sync() kwalletd
 		if (_nonLocal) {
-			KIO::NetAccess::file_copy(KURL(_walletName), url, 0600, false, false, this);
+			TDEIO::NetAccess::file_copy(KURL(_walletName), url, 0600, false, false, this);
 		} else {
 			TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + _walletName + ".kwl";
 			KURL destURL; destURL.setPath(path);
-			KIO::NetAccess::file_copy(destURL, url, 0600, false, false, this);
+			TDEIO::NetAccess::file_copy(destURL, url, 0600, false, false, this);
 		}
 	}
 }
diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp
index 20ab41d..7457682 100644
--- a/kwallet/kwalletmanager.cpp
+++ b/kwallet/kwalletmanager.cpp
@@ -54,8 +54,8 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
 
 	TDEApplication::dcopClient()->setQtBridgeEnabled(false);
 	_shuttingDown = false;
-	KConfig cfg("kwalletrc"); // not sure why this setting isn't in kwalletmanagerrc...
-	KConfigGroup walletConfigGroup(&cfg, "Wallet");
+	TDEConfig cfg("kwalletrc"); // not sure why this setting isn't in kwalletmanagerrc...
+	TDEConfigGroup walletConfigGroup(&cfg, "Wallet");
 	_dcopRef = 0L;
 	if (walletConfigGroup.readBoolEntry("Launch Manager", true)) {
 		_tray = new KSystemTray(this, "kwalletmanager tray");
@@ -326,7 +326,7 @@ void KWalletManager::allWalletsClosed() {
 
 
 void KWalletManager::possiblyQuit() {
-	KConfig cfg("kwalletrc");
+	TDEConfig cfg("kwalletrc");
 	cfg.setGroup("Wallet");
 	if (_windows.isEmpty() &&
 			!isVisible() &&
@@ -412,8 +412,8 @@ TQPixmap KWalletManager::loadSystemTrayIcon(const TQString &icon) {
 #if KDE_IS_VERSION(3, 1, 90)
 	return KSystemTray::loadIcon(icon);
 #else
-	KConfig *appCfg = kapp->config();
-	KConfigGroupSaver configSaver(appCfg, "System Tray");
+	TDEConfig *appCfg = kapp->config();
+	TDEConfigGroupSaver configSaver(appCfg, "System Tray");
 	int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
 	return kapp->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
 #endif