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

51 files changed, 113 insertions, 113 deletions

diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
index 971da38ff..a05e44d6f 100644
--- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
@@ -607,7 +607,7 @@ bool CupsdConf::parseOption(const TQString& line)
 
 bool CupsdConf::loadAvailableResources()
 {
-	KConfig	conf("tdeprintrc");
+	TDEConfig	conf("tdeprintrc");
 	conf.setGroup("CUPS");
 	TQString	host = conf.readEntry("Host",cupsServer());
 	int 	port = conf.readNumEntry("Port",ippPort());
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
index 5e6d4659d..ada83d362 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -95,7 +95,7 @@ const char* getPassword(const char*)
 	TQString	user(cupsUser());
 	TQString	pass;
 
-	if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted)
+	if (TDEIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted)
 	{
 		cupsSetUser(user.latin1());
 		pass_string = pass;
diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp
index 2f7031503..7962b13ef 100644
--- a/tdeprint/cups/cupsinfos.cpp
+++ b/tdeprint/cups/cupsinfos.cpp
@@ -117,7 +117,7 @@ const char* CupsInfos::getPasswordCB()
 
 void CupsInfos::load()
 {
-	KConfig	*conf_ = KMFactory::self()->printConfig();
+	TDEConfig	*conf_ = KMFactory::self()->printConfig();
 	conf_->setGroup("CUPS");
 	host_ = conf_->readEntry("Host",TQString::fromLatin1(cupsServer()));
 	port_ = conf_->readNumEntry("Port",ippPort());
@@ -141,7 +141,7 @@ void CupsInfos::load()
 
 void CupsInfos::save()
 {
-	KConfig	*conf_ = KMFactory::self()->printConfig();
+	TDEConfig	*conf_ = KMFactory::self()->printConfig();
 	conf_->setGroup("CUPS");
 	conf_->writeEntry("Host",host_);
 	conf_->writeEntry("Port",port_);
diff --git a/tdeprint/cups/kmconfigcups.cpp b/tdeprint/cups/kmconfigcups.cpp
index 7e03dae01..55a96d9d5 100644
--- a/tdeprint/cups/kmconfigcups.cpp
+++ b/tdeprint/cups/kmconfigcups.cpp
@@ -40,12 +40,12 @@ KMConfigCups::KMConfigCups(TQWidget *parent)
 	lay0->addStretch(1);
 }
 
-void KMConfigCups::loadConfig(KConfig *)
+void KMConfigCups::loadConfig(TDEConfig *)
 {
 	m_widget->load();
 }
 
-void KMConfigCups::saveConfig(KConfig *conf)
+void KMConfigCups::saveConfig(TDEConfig *conf)
 {
 	m_widget->saveConfig(conf);
 }
diff --git a/tdeprint/cups/kmconfigcups.h b/tdeprint/cups/kmconfigcups.h
index c0f1ab2ba..5d7032403 100644
--- a/tdeprint/cups/kmconfigcups.h
+++ b/tdeprint/cups/kmconfigcups.h
@@ -29,8 +29,8 @@ class KMConfigCups : public KMConfigPage
 public:
 	KMConfigCups(TQWidget *parent = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	KMCupsConfigWidget	*m_widget;
diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp
index fbec34f2a..2fe66d787 100644
--- a/tdeprint/cups/kmconfigcupsdir.cpp
+++ b/tdeprint/cups/kmconfigcupsdir.cpp
@@ -52,7 +52,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
 	m_stddir->setChecked(true);
 }
 
-void KMConfigCupsDir::loadConfig(KConfig *conf)
+void KMConfigCupsDir::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("CUPS");
 	QString	dir = conf->readPathEntry("InstallDir");
@@ -60,7 +60,7 @@ void KMConfigCupsDir::loadConfig(KConfig *conf)
 	m_installdir->setURL(dir);
 }
 
-void KMConfigCupsDir::saveConfig(KConfig *conf)
+void KMConfigCupsDir::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("CUPS");
 	conf->writePathEntry("InstallDir",(m_stddir->isChecked() ? TQString::null : m_installdir->url()));
diff --git a/tdeprint/cups/kmconfigcupsdir.h b/tdeprint/cups/kmconfigcupsdir.h
index 352388c99..6affa62b0 100644
--- a/tdeprint/cups/kmconfigcupsdir.h
+++ b/tdeprint/cups/kmconfigcupsdir.h
@@ -30,8 +30,8 @@ class KMConfigCupsDir : public KMConfigPage
 public:
 	KMConfigCupsDir(TQWidget *parent = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	KURLRequester		*m_installdir;
diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp
index ca2f4aedb..ce005fc3b 100644
--- a/tdeprint/cups/kmcupsconfigwidget.cpp
+++ b/tdeprint/cups/kmcupsconfigwidget.cpp
@@ -143,7 +143,7 @@ void KMCupsConfigWidget::save(bool sync)
 	if (sync) inf->save();
 }
 
-void KMCupsConfigWidget::saveConfig(KConfig *conf)
+void KMCupsConfigWidget::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("CUPS");
 	conf->writeEntry("Host",m_host->text());
diff --git a/tdeprint/cups/kmcupsconfigwidget.h b/tdeprint/cups/kmcupsconfigwidget.h
index 7eee42d80..b8e253ba8 100644
--- a/tdeprint/cups/kmcupsconfigwidget.h
+++ b/tdeprint/cups/kmcupsconfigwidget.h
@@ -24,7 +24,7 @@
 
 class TQLineEdit;
 class TQCheckBox;
-class KConfig;
+class TDEConfig;
 
 class KMCupsConfigWidget : public TQWidget
 {
@@ -33,7 +33,7 @@ public:
 
 	void load();
 	void save(bool sync = true);
-	void saveConfig(KConfig*);
+	void saveConfig(TDEConfig*);
 
 protected:
 	TQLineEdit	*m_host, *m_port, *m_login, *m_password;
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index e5630652e..b0d61b8ac 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -111,7 +111,7 @@ TQString KMCupsManager::driverDirectory()
 
 TQString KMCupsManager::cupsInstallDir()
 {
-	KConfig	*conf=  KMFactory::self()->printConfig();
+	TDEConfig	*conf=  KMFactory::self()->printConfig();
 	conf->setGroup("CUPS");
 	TQString	dir = conf->readPathEntry("InstallDir");
 	return dir;
@@ -1055,14 +1055,14 @@ void KMCupsManager::slotConnectionFailed( int errcode )
     TQString einfo;
 
     switch (errcode) {
-    case KNetwork::KSocketBase::ConnectionRefused:
-    case KNetwork::KSocketBase::ConnectionTimedOut:
+    case KNetwork::TDESocketBase::ConnectionRefused:
+    case KNetwork::TDESocketBase::ConnectionTimedOut:
         einfo = i18n("connection refused") + TQString(" (%1)").arg(errcode);
         break;
-    case KNetwork::KSocketBase::LookupFailure:
+    case KNetwork::TDESocketBase::LookupFailure:
         einfo = i18n("host not found") + TQString(" (%1)").arg(errcode);
         break;
-    case KNetwork::KSocketBase::WouldBlock:
+    case KNetwork::TDESocketBase::WouldBlock:
     default:
         einfo = i18n("read failed (%1)").arg(errcode);
         break;
diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp
index 661d97764..a1b4ad4ee 100644
--- a/tdeprint/kmfactory.cpp
+++ b/tdeprint/kmfactory.cpp
@@ -224,11 +224,11 @@ void KMFactory::loadFactory(const TQString& syst)
 	}
 }
 
-KConfig* KMFactory::printConfig(const TQString& group)
+TDEConfig* KMFactory::printConfig(const TQString& group)
 {
 	if (!m_printconfig)
 	{
-		m_printconfig = new KConfig("tdeprintrc");
+		m_printconfig = new TDEConfig("tdeprintrc");
 		TQ_CHECK_PTR(m_printconfig);
 	}
 	if (!group.isEmpty())
@@ -238,7 +238,7 @@ KConfig* KMFactory::printConfig(const TQString& group)
 
 TQString KMFactory::printSystem()
 {
-	KConfig	*conf = printConfig();
+	TDEConfig	*conf = printConfig();
 	conf->setGroup("General");
 	TQString	sys = conf->readEntry("PrintSystem");
 	if (sys.isEmpty())
@@ -276,7 +276,7 @@ void KMFactory::reload(const TQString& syst, bool saveSyst)
 	unload();
 	if (saveSyst)
 	{
-		KConfig	*conf = printConfig();
+		TDEConfig	*conf = printConfig();
 		conf->setGroup("General");
 		conf->writeEntry("PrintSystem", syst);
 		conf->sync();
@@ -403,7 +403,7 @@ void KMFactory::slot_configChanged()
 
 void KMFactory::saveConfig()
 {
-	KConfig	*conf = printConfig();
+	TDEConfig	*conf = printConfig();
 	conf->sync();
 	kdDebug(500) << "KMFactory (" << getpid() << ") emitting DCOP signal configChanged()" << endl;
 	emit configChanged();
diff --git a/tdeprint/kmfactory.h b/tdeprint/kmfactory.h
index 8bfc9961d..baaf48477 100644
--- a/tdeprint/kmfactory.h
+++ b/tdeprint/kmfactory.h
@@ -39,7 +39,7 @@ class KXmlCommandManager;
 class KMSpecialManager;
 class KPrinterImpl;
 class KLibFactory;
-class KConfig;
+class TDEConfig;
 class KPReloadObject;
 
 class TDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject
@@ -72,7 +72,7 @@ public:
 	KMSpecialManager* specialManager();
 	KXmlCommandManager* commandManager();
 	KPrinterImpl* printerImplementation();
-	KConfig* printConfig(const TQString& group = TQString::null);
+	TDEConfig* printConfig(const TQString& group = TQString::null);
 	TQString printSystem();
 	TQValueList<PluginInfo> pluginList();
 	PluginInfo pluginInfo(const TQString& name);
@@ -121,7 +121,7 @@ private:
 	KPrinterImpl		*m_implementation;
 	KLibFactory		*m_factory;
 
-	KConfig			*m_printconfig;
+	TDEConfig			*m_printconfig;
 	Settings		*m_settings;
 	TQPtrList<KPReloadObject> m_objects;
 };
diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp
index 30a1fb993..3496cdb1d 100644
--- a/tdeprint/kmjobmanager.cpp
+++ b/tdeprint/kmjobmanager.cpp
@@ -242,14 +242,14 @@ bool KMJobManager::doPluginAction(int, const TQPtrList<KMJob>&)
 
 void KMJobManager::setLimit(int val)
 {
-	KConfig *conf = KMFactory::self()->printConfig();
+	TDEConfig *conf = KMFactory::self()->printConfig();
 	conf->setGroup("Jobs");
 	conf->writeEntry("Limit", val);
 }
 
 int KMJobManager::limit()
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("Jobs");
 	return conf->readNumEntry("Limit", 0);
 }
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index 115f3fd02..57e06994d 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -418,7 +418,7 @@ bool KMManager::configureServer(TQWidget*)
 
 TQString KMManager::testPage()
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	QString	tpage = conf->readPathEntry("TestPage");
 	if (tpage.isEmpty())
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 5e77f890a..06a61e1c0 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -439,7 +439,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	}
 	else
 	{
-		KConfig	*config = TDEGlobal::config();
+		TDEConfig	*config = TDEGlobal::config();
 		config->setGroup("KPrinter Settings");
 		expandDialog(!config->readBoolEntry("DialogReduced", (KMFactory::self()->settings()->application != KPrinter::StandAlone)));
 	}
@@ -447,7 +447,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 
 KPrintDialog::~KPrintDialog()
 {
-	KConfig	*config = TDEGlobal::config();
+	TDEConfig	*config = TDEGlobal::config();
 	config->setGroup("KPrinter Settings");
 	config->writeEntry("DialogReduced", d->m_reduced);
 
@@ -730,19 +730,19 @@ bool KPrintDialog::checkOutputFile()
 			{
 				//value = (KMessageBox::warningYesNo(this,i18n("File \"%1\" already exists. Overwrite?").arg(f.absFilePath())) == KMessageBox::Yes);
 				time_t mtimeDest = f.lastModified().toTime_t();
-				KIO::RenameDlg dlg( this, i18n( "Print" ), TQString::null, d->m_file->url(),
-						KIO::M_OVERWRITE, ( time_t ) -1, f.size(), ( time_t ) -1, f.created().toTime_t() , mtimeDest+1, mtimeDest, true );
+				TDEIO::RenameDlg dlg( this, i18n( "Print" ), TQString::null, d->m_file->url(),
+						TDEIO::M_OVERWRITE, ( time_t ) -1, f.size(), ( time_t ) -1, f.created().toTime_t() , mtimeDest+1, mtimeDest, true );
 				int result = dlg.exec();
 				switch ( result )
 				{
-					case KIO::R_OVERWRITE:
+					case TDEIO::R_OVERWRITE:
 						value = true;
 						break;
 					default:
-					case KIO::R_CANCEL:
+					case TDEIO::R_CANCEL:
 						value = false;
 						break;
-					case KIO::R_RENAME:
+					case TDEIO::R_RENAME:
 						url = dlg.newDestURL();
 						d->m_file->setURL( url.path() );
 						value = true;
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index e62bf635b..3664b4157 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -174,7 +174,7 @@ void KPrinter::loadSettings()
 	setSearchName(option("kde-searchname"));
 	d->m_options.remove("kde-searchname");
 
-	KConfig	*conf = TDEGlobal::config(), *pconf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = TDEGlobal::config(), *pconf = KMFactory::self()->printConfig();
 	conf->setGroup("KPrinter Settings");
 	pconf->setGroup("General");
 
@@ -199,7 +199,7 @@ void KPrinter::saveSettings()
 	}
 
 	// save latest used printer to config file
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("KPrinter Settings");
 	conf->writeEntry("Printer",searchName());
 	// latest used print command
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index 9c62d25f8..5c3d840a0 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -223,7 +223,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool
 void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
 {
 	kdDebug(500) << "tdeprint: status message: " << msg << endl;
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	if (!conf->readBoolEntry("ShowStatusMsg", true))
 		return;
@@ -583,7 +583,7 @@ void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts)
 
 void KPrinterImpl::loadAppOptions()
 {
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("KPrinter Settings");
 	TQStringList	opts = conf->readListEntry("ApplicationOptions");
 	for (uint i=0; i<opts.count(); i+=2)
@@ -598,7 +598,7 @@ void KPrinterImpl::saveAppOptions()
 		if (it.key().startsWith("app-"))
 			optlist << it.key() << it.data();
 
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("KPrinter Settings");
 	conf->writeEntry("ApplicationOptions", optlist);
 }
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index bd812b939..19270727e 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -244,7 +244,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 	if ( !isPS )
 		kdDebug( 500 ) << "Previewing a non PostScript file, built-in preview disabled" << endl;
 
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	KLibFactory	*factory(0);
 	bool	externalPreview = conf->readBoolEntry("ExternalPreview", false);
diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp
index a38aa4e26..5251b990a 100644
--- a/tdeprint/lpd/kmlpdmanager.cpp
+++ b/tdeprint/lpd/kmlpdmanager.cpp
@@ -273,7 +273,7 @@ void KMLpdManager::listPrinters()
 
 TQString KMLpdManager::programName(int f)
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("LPD");
 	switch (f)
 	{
diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp
index f43a8da2d..b5c43ebef 100644
--- a/tdeprint/lpr/kmconfiglpr.cpp
+++ b/tdeprint/lpr/kmconfiglpr.cpp
@@ -45,12 +45,12 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
 	l0->addStretch(1);
 }
 
-void KMConfigLpr::loadConfig(KConfig*)
+void KMConfigLpr::loadConfig(TDEConfig*)
 {
 	m_mode->setCurrentItem(LprSettings::self()->mode());
 }
 
-void KMConfigLpr::saveConfig(KConfig *conf)
+void KMConfigLpr::saveConfig(TDEConfig *conf)
 {
 	LprSettings::self()->setMode((LprSettings::Mode)(m_mode->currentItem()));
 
diff --git a/tdeprint/lpr/kmconfiglpr.h b/tdeprint/lpr/kmconfiglpr.h
index 7f3d50857..fa7a0ae26 100644
--- a/tdeprint/lpr/kmconfiglpr.h
+++ b/tdeprint/lpr/kmconfiglpr.h
@@ -29,8 +29,8 @@ class KMConfigLpr : public KMConfigPage
 public:
 	KMConfigLpr(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	TQComboBox	*m_mode;
diff --git a/tdeprint/lpr/lprsettings.cpp b/tdeprint/lpr/lprsettings.cpp
index 0c1cec2a9..30b650c17 100644
--- a/tdeprint/lpr/lprsettings.cpp
+++ b/tdeprint/lpr/lprsettings.cpp
@@ -53,7 +53,7 @@ LprSettings* LprSettings::self()
 void LprSettings::init()
 {
 	// LPR/LPRng mode
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("LPR");
 	TQString	modestr = conf->readEntry("Mode");
 	if (modestr == "LPRng")
diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp
index cd823d540..ee63e9eeb 100644
--- a/tdeprint/management/kmconfigdialog.cpp
+++ b/tdeprint/management/kmconfigdialog.cpp
@@ -47,7 +47,7 @@ KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name)
 	KMFactory::self()->uiManager()->setupConfigDialog(this);
 
 	// initialize pages
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	TQPtrListIterator<KMConfigPage>	it(m_pages);
 	for (;it.current();++it)
 		it.current()->loadConfig(conf);
@@ -77,7 +77,7 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page)
 void KMConfigDialog::slotOk()
 {
 	// save configuration
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	TQPtrListIterator<KMConfigPage>	it(m_pages);
 	for (;it.current();++it)
 		it.current()->saveConfig(conf);
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index 29d5107e0..2eea53b0e 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -88,7 +88,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
 	m_remove->setEnabled(false);
 }
 
-void KMConfigFilter::loadConfig(KConfig *conf)
+void KMConfigFilter::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("Filter");
 	TQStringList	m_plist = conf->readListEntry("Printers");
@@ -106,7 +106,7 @@ void KMConfigFilter::loadConfig(KConfig *conf)
 	m_locationre->setText(conf->readEntry("LocationRe"));
 }
 
-void KMConfigFilter::saveConfig(KConfig *conf)
+void KMConfigFilter::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("Filter");
 	TQStringList	plist;
diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h
index 9571f0d54..298c83de2 100644
--- a/tdeprint/management/kmconfigfilter.h
+++ b/tdeprint/management/kmconfigfilter.h
@@ -32,8 +32,8 @@ class KMConfigFilter : public KMConfigPage
 public:
 	KMConfigFilter(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 protected slots:
 	void slotSelectionChanged();
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index 183d0b621..b933cab00 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -103,7 +103,7 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
 	m_down->setEnabled(false);
 }
 
-void KMConfigFonts::loadConfig(KConfig *)
+void KMConfigFonts::loadConfig(TDEConfig *)
 {
 	TQSettings	settings;
 	m_embedfonts->setChecked(settings.readBoolEntry("/qt/embedFonts", true));
@@ -113,7 +113,7 @@ void KMConfigFonts::loadConfig(KConfig *)
 		item = new TQListViewItem(m_fontpath, item, *it);
 }
 
-void KMConfigFonts::saveConfig(KConfig *)
+void KMConfigFonts::saveConfig(TDEConfig *)
 {
 	TQSettings	settings;
 	settings.writeEntry("/qt/embedFonts", m_embedfonts->isChecked());
diff --git a/tdeprint/management/kmconfigfonts.h b/tdeprint/management/kmconfigfonts.h
index a93a26d75..dd65d3901 100644
--- a/tdeprint/management/kmconfigfonts.h
+++ b/tdeprint/management/kmconfigfonts.h
@@ -33,8 +33,8 @@ class KMConfigFonts : public KMConfigPage
 public:
 	KMConfigFonts(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 protected slots:
 	void slotUp();
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index 2298d7485..f02cfa854 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -104,7 +104,7 @@ void KMConfigGeneral::setEnabledPreviewButton(bool b)
     m_preview->setEnabled(!m_testpage->url().isEmpty() && b);
 }
 
-void KMConfigGeneral::loadConfig(KConfig *conf)
+void KMConfigGeneral::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("General");
 	m_timer->setValue(conf->readNumEntry("TimerDelay",5));
@@ -118,7 +118,7 @@ void KMConfigGeneral::loadConfig(KConfig *conf)
 	m_uselast->setChecked(conf->readBoolEntry("UseLast", true));
 }
 
-void KMConfigGeneral::saveConfig(KConfig *conf)
+void KMConfigGeneral::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("General");
 	conf->writeEntry("TimerDelay",m_timer->value());
diff --git a/tdeprint/management/kmconfiggeneral.h b/tdeprint/management/kmconfiggeneral.h
index 8fc6fa5ab..b82a91daa 100644
--- a/tdeprint/management/kmconfiggeneral.h
+++ b/tdeprint/management/kmconfiggeneral.h
@@ -32,8 +32,8 @@ class KMConfigGeneral : public KMConfigPage
 public:
 	KMConfigGeneral(TQWidget *parent = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 protected slots:
 	void slotTestPagePreview();
diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp
index 1088e1b3a..0fb40fb7b 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -48,13 +48,13 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
 	l1->addWidget(m_limit);
 }
 
-void KMConfigJobs::loadConfig(KConfig *conf)
+void KMConfigJobs::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("Jobs");
 	m_limit->setValue(conf->readNumEntry("Limit", 0));
 }
 
-void KMConfigJobs::saveConfig(KConfig *conf)
+void KMConfigJobs::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("Jobs");
 	conf->writeEntry("Limit", m_limit->value());
diff --git a/tdeprint/management/kmconfigjobs.h b/tdeprint/management/kmconfigjobs.h
index 34be5b1ef..29818d68a 100644
--- a/tdeprint/management/kmconfigjobs.h
+++ b/tdeprint/management/kmconfigjobs.h
@@ -30,8 +30,8 @@ class KMConfigJobs : public KMConfigPage
 public:
 	KMConfigJobs(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	KIntNumInput	*m_limit;
diff --git a/tdeprint/management/kmconfigpage.cpp b/tdeprint/management/kmconfigpage.cpp
index fb967e05d..6a259a062 100644
--- a/tdeprint/management/kmconfigpage.cpp
+++ b/tdeprint/management/kmconfigpage.cpp
@@ -26,11 +26,11 @@ KMConfigPage::KMConfigPage(TQWidget *parent, const char *name)
 	m_header = "Header";
 }
 
-void KMConfigPage::loadConfig(KConfig*)
+void KMConfigPage::loadConfig(TDEConfig*)
 {
 }
 
-void KMConfigPage::saveConfig(KConfig*)
+void KMConfigPage::saveConfig(TDEConfig*)
 {
 }
 #include "kmconfigpage.moc"
diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h
index 59b93fb3d..f29b8a23e 100644
--- a/tdeprint/management/kmconfigpage.h
+++ b/tdeprint/management/kmconfigpage.h
@@ -24,7 +24,7 @@
 
 #include <tdelibs_export.h>
 
-class KConfig;
+class TDEConfig;
 
 class TDEPRINT_EXPORT KMConfigPage : public TQWidget
 {
@@ -32,8 +32,8 @@ class TDEPRINT_EXPORT KMConfigPage : public TQWidget
 public:
 	KMConfigPage(TQWidget *parent = 0, const char *name = 0);
 
-	virtual void loadConfig(KConfig*);
-	virtual void saveConfig(KConfig*);
+	virtual void loadConfig(TDEConfig*);
+	virtual void saveConfig(TDEConfig*);
 
 	TQString pageName() const 	{ return m_name; }
 	TQString pageHeader() const 	{ return m_header; }
diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp
index 316925d48..548968701 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -59,14 +59,14 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
 	m_program->setEnabled(false);
 }
 
-void KMConfigPreview::loadConfig(KConfig *conf)
+void KMConfigPreview::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("General");
 	m_useext->setChecked(conf->readBoolEntry("ExternalPreview", false));
 	m_program->setURL(conf->readPathEntry("PreviewCommand", "gv"));
 }
 
-void KMConfigPreview::saveConfig(KConfig *conf)
+void KMConfigPreview::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("General");
 	conf->writeEntry("ExternalPreview", m_useext->isChecked());
diff --git a/tdeprint/management/kmconfigpreview.h b/tdeprint/management/kmconfigpreview.h
index a9c826c98..b8b5ab097 100644
--- a/tdeprint/management/kmconfigpreview.h
+++ b/tdeprint/management/kmconfigpreview.h
@@ -30,8 +30,8 @@ class KMConfigPreview : public KMConfigPage
 public:
 	KMConfigPreview(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	TQCheckBox	*m_useext;
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index 579cae5df..704a20db5 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -234,7 +234,7 @@ void KMDriverDbWidget::slotOtherClicked()
 		if ( !url.isEmpty() )
 		{
 			TQString filename;
-			if ( KIO::NetAccess::download( url, filename, this ) )
+			if ( TDEIO::NetAccess::download( url, filename, this ) )
 			{
 				DrMain	*driver = KMFactory::self()->manager()->loadFileDriver(filename);
 				if (driver)
@@ -255,7 +255,7 @@ void KMDriverDbWidget::slotOtherClicked()
 				}
 				else
 				{
-					KIO::NetAccess::removeTempFile( filename );
+					TDEIO::NetAccess::removeTempFile( filename );
 					KMessageBox::error(this,"<qt>"+i18n("Wrong driver format.")+"<p>"+KMManager::self()->errorMsg()+"</p></qt>");
 				}
 			}
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 19c46224f..da8a98016 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -99,7 +99,7 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name)
 	if (m_standalone)
 	{
 		setCaption(i18n("No Printer"));
-		KConfig *conf = KMFactory::self()->printConfig();
+		TDEConfig *conf = KMFactory::self()->printConfig();
 		TQSize defSize( 550, 250 );
 		conf->setGroup( "Jobs" );
 		resize( conf->readSizeEntry( "Size", &defSize ) );
@@ -111,7 +111,7 @@ KMJobViewer::~KMJobViewer()
 	if (m_standalone)
 	{
 		kdDebug( 500 ) << "Destroying stand-alone job viewer window" << endl;
-		KConfig *conf = KMFactory::self()->printConfig();
+		TDEConfig *conf = KMFactory::self()->printConfig();
 		conf->setGroup( "Jobs" );
 		conf->writeEntry( "Size", size() );
 		emit viewerDestroyed(this);
@@ -700,7 +700,7 @@ void KMJobViewer::slotConfigure()
 	KMConfigJobs	*w = new KMConfigJobs(&dlg);
 	dlg.setMainWidget(w);
 	dlg.resize(300, 10);
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	w->loadConfig(conf);
 	if (dlg.exec())
 	{
@@ -727,7 +727,7 @@ void KMJobViewer::slotDropped( TQDropEvent *e, TQListViewItem* )
 	for ( KURL::List::ConstIterator it = uris.begin();
 	      it != uris.end(); ++it)
 	{
-		if ( KIO::NetAccess::download( *it, target, 0 ) )
+		if ( TDEIO::NetAccess::download( *it, target, 0 ) )
 			files << target;
 	}
 
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index 22b9ac8e9..daafbff97 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -145,7 +145,7 @@ void KMMainView::loadParameters()
 
 void KMMainView::restoreSettings()
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	setViewType((KMPrinterView::ViewType)conf->readNumEntry("ViewType",KMPrinterView::Icons));
 	setOrientation(conf->readNumEntry("Orientation", Qt::Vertical));
@@ -162,7 +162,7 @@ void KMMainView::restoreSettings()
 
 void KMMainView::saveSettings()
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	conf->writeEntry("ViewType",(int)m_printerview->viewType());
 	conf->writeEntry("Orientation",(int)orientation());
diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp
index 4a7f611d8..5acc27351 100644
--- a/tdeprint/management/kmtimer.cpp
+++ b/tdeprint/management/kmtimer.cpp
@@ -86,7 +86,7 @@ void KMTimer::startTimer(int t)
 {
 	if (t == -1)
 	{
-		KConfig	*conf = KMFactory::self()->printConfig();
+		TDEConfig	*conf = KMFactory::self()->printConfig();
 		conf->setGroup("General");
 		t = conf->readNumEntry("TimerDelay", 5) * 1000;
 	}
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index d4652878f..0e0cd306b 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -105,7 +105,7 @@ void KMWDriverTest::initPrinter(KMPrinter *p)
 	{
 		m_driver = KMFactory::self()->manager()->loadFileDriver(drfile);
 		/* remove the temp file if it has been downloaded */
-		KIO::NetAccess::removeTempFile( drfile );
+		TDEIO::NetAccess::removeTempFile( drfile );
 	}
 	else if (p->dbEntry() != NULL)
 		m_driver = KMFactory::self()->manager()->loadDbDriver(p->dbEntry());
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index e667d1fa1..04556c07b 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -148,7 +148,7 @@ bool KMWSocketUtil::checkPrinter(const TQString& IPstr, int port, TQString* host
 		if (hostname)
 		{
 			TQString	portname;
-			KExtendedSocket::resolve((KSocketAddress*)(sock.peerAddress()), *hostname, portname);
+			KExtendedSocket::resolve((TDESocketAddress*)(sock.peerAddress()), *hostname, portname);
 		}
 		result = true;
 	}
diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index a49a77877..1943f9354 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -241,9 +241,9 @@ void NetworkScanner::slotConnectionSuccess()
 {
 	kdDebug() << "Success" << endl;
 #ifdef USE_QSOCKET
-	KSocketAddress *addr = KExtendedSocket::peerAddress( d->socket->socket() );
+	TDESocketAddress *addr = KExtendedSocket::peerAddress( d->socket->socket() );
 #else
-	KSocketAddress *addr = const_cast<KSocketAddress*>( d->socket->peerAddress() );
+	TDESocketAddress *addr = const_cast<TDESocketAddress*>( d->socket->peerAddress() );
 #endif
 	kdDebug() << "Connection success: " << ( addr ? addr->pretty() : TQString( "ERROR" ) ) << endl;
 	kdDebug() << "Socket: " << d->socket->socket() << endl;
diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp
index 7e46139ef..c30409e66 100644
--- a/tdeprint/printerfilter.cpp
+++ b/tdeprint/printerfilter.cpp
@@ -38,7 +38,7 @@ PrinterFilter::~PrinterFilter()
 
 void PrinterFilter::update()
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("Filter");
 	m_locationRe.setPattern(conf->readEntry("LocationRe"));
 	m_printers = conf->readListEntry("Printers");
@@ -52,7 +52,7 @@ void PrinterFilter::update()
 void PrinterFilter::setEnabled(bool on)
 {
 	m_enabled = on;
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("KPrinter Settings");
 	conf->writeEntry("FilterEnabled", m_enabled);
 }
diff --git a/tdeprint/rlpr/kmconfigproxy.cpp b/tdeprint/rlpr/kmconfigproxy.cpp
index 0f8ca3743..78513dad3 100644
--- a/tdeprint/rlpr/kmconfigproxy.cpp
+++ b/tdeprint/rlpr/kmconfigproxy.cpp
@@ -36,12 +36,12 @@ KMConfigProxy::KMConfigProxy(TQWidget *parent)
 	lay0->addStretch(1);
 }
 
-void KMConfigProxy::loadConfig(KConfig *conf)
+void KMConfigProxy::loadConfig(TDEConfig *conf)
 {
 	m_widget->loadConfig(conf);
 }
 
-void KMConfigProxy::saveConfig(KConfig *conf)
+void KMConfigProxy::saveConfig(TDEConfig *conf)
 {
 	m_widget->saveConfig(conf);
 }
diff --git a/tdeprint/rlpr/kmconfigproxy.h b/tdeprint/rlpr/kmconfigproxy.h
index 6f3b7ef42..e3f92808c 100644
--- a/tdeprint/rlpr/kmconfigproxy.h
+++ b/tdeprint/rlpr/kmconfigproxy.h
@@ -23,15 +23,15 @@
 #include "kmconfigpage.h"
 
 class KMProxyWidget;
-class KConfig;
+class TDEConfig;
 
 class KMConfigProxy : public KMConfigPage
 {
 public:
 	KMConfigProxy(TQWidget *parent = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	KMProxyWidget	*m_widget;
diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp
index e4a761519..763282ecd 100644
--- a/tdeprint/rlpr/kmproxywidget.cpp
+++ b/tdeprint/rlpr/kmproxywidget.cpp
@@ -55,7 +55,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
 	lay0->addWidget(m_proxyport,2,1);
 }
 
-void KMProxyWidget::loadConfig(KConfig *conf)
+void KMProxyWidget::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("RLPR");
 	m_proxyhost->setText(conf->readEntry("ProxyHost",TQString::null));
@@ -63,7 +63,7 @@ void KMProxyWidget::loadConfig(KConfig *conf)
 	m_useproxy->setChecked(!m_proxyhost->text().isEmpty());
 }
 
-void KMProxyWidget::saveConfig(KConfig *conf)
+void KMProxyWidget::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("RLPR");
 	conf->writeEntry("ProxyHost",(m_useproxy->isChecked() ? m_proxyhost->text() : TQString::null));
diff --git a/tdeprint/rlpr/kmproxywidget.h b/tdeprint/rlpr/kmproxywidget.h
index 0c1a5079b..a698889a9 100644
--- a/tdeprint/rlpr/kmproxywidget.h
+++ b/tdeprint/rlpr/kmproxywidget.h
@@ -22,7 +22,7 @@
 
 #include <tqgroupbox.h>
 
-class KConfig;
+class TDEConfig;
 class TQLineEdit;
 class TQCheckBox;
 
@@ -31,8 +31,8 @@ class KMProxyWidget : public TQGroupBox
 public:
 	KMProxyWidget(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	TQLineEdit	*m_proxyhost;
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index 2833c9598..628205a31 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -57,7 +57,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 		cmd = TQString::fromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies());
 
 		// proxy settings
-		KConfig	*conf = KMFactory::self()->printConfig();
+		TDEConfig	*conf = KMFactory::self()->printConfig();
 		conf->setGroup("RLPR");
 		QString	host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null);
 		if (!host.isEmpty())
diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp
index 1b5cc691a..92178f0f4 100644
--- a/tdeprint/tdeprintcheck.cpp
+++ b/tdeprint/tdeprintcheck.cpp
@@ -53,7 +53,7 @@ static const char* const config_stddirs[] = {
 	0
 };
 
-bool KdeprintChecker::check(KConfig *conf, const TQString& group)
+bool KdeprintChecker::check(TDEConfig *conf, const TQString& group)
 {
 	if (!group.isEmpty())
 		conf->setGroup(group);
diff --git a/tdeprint/tdeprintcheck.h b/tdeprint/tdeprintcheck.h
index 0bb28cc28..bb839063f 100644
--- a/tdeprint/tdeprintcheck.h
+++ b/tdeprint/tdeprintcheck.h
@@ -28,7 +28,7 @@
 class TDEPRINT_EXPORT KdeprintChecker
 {
 public:
-	static bool check(KConfig *conf, const TQString& group = TQString::null);
+	static bool check(TDEConfig *conf, const TQString& group = TQString::null);
 	static bool check(const TQStringList& uris);
 
 private:
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index 7777e19ce..617fddf8f 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -162,7 +162,7 @@ void KDEPrintd::slotPrintError( KPrintProcess *proc, const TQString& msg )
 TQString KDEPrintd::openPassDlg(const TQString& user)
 {
 	TQString	user_(user), pass_, result;
-	if (KIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted)
+	if (TDEIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted)
 		result.append(user_).append(":").append(pass_);
 	return result;
 }
@@ -252,7 +252,7 @@ void KDEPrintd::processRequest()
 		return;
 
 	Request *req = m_requestsPending.first();
-	KIO::AuthInfo info;
+	TDEIO::AuthInfo info;
 	TQByteArray params, reply;
 	TQCString replyType;
 	TQString authString( "::" );
@@ -264,13 +264,13 @@ void KDEPrintd::processRequest()
 
 	TQDataStream input( params, IO_WriteOnly );
 	input << info << TQString(i18n( "Authentication failed (user name=%1)" ).arg( info.username )) << 0L << (long int) req->seqNbr;
-	if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(KIO::AuthInfo,TQString,long int,long int)",
+	if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(TDEIO::AuthInfo,TQString,long int,long int)",
 				params, replyType, reply ) )
 	{
-		if ( replyType == "KIO::AuthInfo" )
+		if ( replyType == "TDEIO::AuthInfo" )
 		{
 			TQDataStream output( reply, IO_ReadOnly );
-			KIO::AuthInfo result;
+			TDEIO::AuthInfo result;
 			int seqNbr;
 			output >> result >> seqNbr;
 
@@ -278,7 +278,7 @@ void KDEPrintd::processRequest()
 				authString = result.username + ":" + result.password + ":" + TQString::number( seqNbr );
 		}
 		else
-			kdWarning( 500 ) << "DCOP returned type error, expected KIO::AuthInfo, received " << replyType << endl;
+			kdWarning( 500 ) << "DCOP returned type error, expected TDEIO::AuthInfo, received " << replyType << endl;
 	}
 	else
 		kdWarning( 500 ) << "Cannot communicate with kded_kpasswdserver" << endl;
@@ -298,7 +298,7 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons
 {
 	TQByteArray params, reply;
 	TQCString replyType;
-	KIO::AuthInfo info;
+	TDEIO::AuthInfo info;
 
 	info.username = user;
 	info.password = passwd;
@@ -307,7 +307,7 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons
 	TQDataStream input( params, IO_WriteOnly );
 	input << info << ( long int )0;
 
-	if ( !callingDcopClient()->call( "kded", "kpasswdserver", "addAuthInfo(KIO::AuthInfo,long int)",
+	if ( !callingDcopClient()->call( "kded", "kpasswdserver", "addAuthInfo(TDEIO::AuthInfo,long int)",
 			params, replyType, reply ) )
 		kdWarning( 500 ) << "Unable to initialize password, cannot communicate with kded_kpasswdserver" << endl;
 }