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

11 files changed, 82 insertions, 82 deletions

diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index 97e2cad8f..be6546214 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -306,7 +306,7 @@ void PrintWrapper::slotPrintRequested(KPrinter *kprinter)
 		TQString	tmpFile;
 		KURL	url = KURL::fromPathOrURL(*it);
 		kdDebug( 500 ) << url.url() << endl;
-		if (KIO::NetAccess::download(url, tmpFile, this))
+		if (TDEIO::NetAccess::download(url, tmpFile, this))
 		{
 			filestoprint << tmpFile;
 			kprinter->setDocName(url.fileName());
diff --git a/tdeprint/printmgr/kcmprintmgr.cpp b/tdeprint/printmgr/kcmprintmgr.cpp
index 4dba35e70..3a1de59fe 100644
--- a/tdeprint/printmgr/kcmprintmgr.cpp
+++ b/tdeprint/printmgr/kcmprintmgr.cpp
@@ -31,9 +31,9 @@ typedef KGenericFactory<KCMPrintMgr, TQWidget> KPrintMgrFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_printmgr, KPrintMgrFactory("kcmprintmgr") )
 
 KCMPrintMgr::KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList &)
-: KCModule(KPrintMgrFactory::instance(),parent,name)
+: TDECModule(KPrintMgrFactory::instance(),parent,name)
 {
-	setButtons(KCModule::Ok);
+	setButtons(TDECModule::Ok);
 	setRootOnlyMsg( i18n(
 		"Print management as normal user\n"
 		"Some print management operations may need administrator privileges. Use the\n"
diff --git a/tdeprint/printmgr/kcmprintmgr.h b/tdeprint/printmgr/kcmprintmgr.h
index e82bc730f..18cf68a91 100644
--- a/tdeprint/printmgr/kcmprintmgr.h
+++ b/tdeprint/printmgr/kcmprintmgr.h
@@ -24,7 +24,7 @@
 
 class KMMainView;
 
-class KCMPrintMgr : public KCModule
+class KCMPrintMgr : public TDECModule
 {
 public:
 	KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp
index 79ad48058..8c8001ddc 100644
--- a/tdeprint/slave/kio_print.cpp
+++ b/tdeprint/slave/kio_print.cpp
@@ -53,38 +53,38 @@ extern "C"
 	int KDE_EXPORT kdemain(int argc, char **argv);
 }
 
-void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString())
+void addAtom(TDEIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString())
 {
-	KIO::UDSAtom	atom;
+	TDEIO::UDSAtom	atom;
 	atom.m_uds = ID;
 	atom.m_long = l;
 	atom.m_str = s;
 	entry.append(atom);
 }
 
-static void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime)
+static void createDirEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime)
 {
 	entry.clear();
-	addAtom(entry, KIO::UDS_NAME, 0, name);
-	addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
-	addAtom(entry, KIO::UDS_ACCESS, 0500);
-	addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime);
-	addAtom(entry, KIO::UDS_URL, 0, url);
+	addAtom(entry, TDEIO::UDS_NAME, 0, name);
+	addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
+	addAtom(entry, TDEIO::UDS_ACCESS, 0500);
+	addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime);
+	addAtom(entry, TDEIO::UDS_URL, 0, url);
 	PRINT_DEBUG << "creating dir entry url=" << url << " mimetype=" << mime << endl;
-	addAtom(entry, KIO::UDS_SIZE, 0);
-	//addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
+	addAtom(entry, TDEIO::UDS_SIZE, 0);
+	//addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
 }
 
-static void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime)
+static void createFileEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime)
 {
 	entry.clear();
-	addAtom(entry, KIO::UDS_NAME, 0, name);
-	addAtom(entry, KIO::UDS_FILE_TYPE, S_IFREG);
-	addAtom(entry, KIO::UDS_URL, 0, url);
-	addAtom(entry, KIO::UDS_ACCESS, 0400);
-	addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime);
-	addAtom(entry, KIO::UDS_SIZE, 0);
-	addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
+	addAtom(entry, TDEIO::UDS_NAME, 0, name);
+	addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFREG);
+	addAtom(entry, TDEIO::UDS_URL, 0, url);
+	addAtom(entry, TDEIO::UDS_ACCESS, 0400);
+	addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime);
+	addAtom(entry, TDEIO::UDS_SIZE, 0);
+	addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
 }
 
 TQString buildMenu(const TQStringList& items, const TQStringList& links, int active)
@@ -158,7 +158,7 @@ int kdemain(int argc, char **argv)
 }
 
 KIO_Print::KIO_Print(const TQCString& pool, const TQCString& app)
-: KIO::SlaveBase("print", pool, app)
+: TDEIO::SlaveBase("print", pool, app)
 {
 }
 
@@ -182,7 +182,7 @@ void KIO_Print::listDir(const KURL& url)
 
 		int	mask;
 		TQString	mimeType;
-		KIO::UDSEntry	entry;
+		TDEIO::UDSEntry	entry;
 
 		if (group == "printers")
 		{
@@ -201,7 +201,7 @@ void KIO_Print::listDir(const KURL& url)
 		}
 		else
 		{
-			error(KIO::ERR_DOES_NOT_EXIST, url.url());
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.url());
 			return;
 		}
 
@@ -220,14 +220,14 @@ void KIO_Print::listDir(const KURL& url)
 			listEntry(entry, false);
 		}
 
-		listEntry(KIO::UDSEntry(), true);
+		listEntry(TDEIO::UDSEntry(), true);
 		finished();
 	}
 	else
 	{
-		//error(KIO::ERR_UNSUPPORTED_ACTION, i18n("Unsupported path %1").arg(url.path()));
+		//error(TDEIO::ERR_UNSUPPORTED_ACTION, i18n("Unsupported path %1").arg(url.path()));
 		// better do nothing
-		listEntry(KIO::UDSEntry(), true);
+		listEntry(TDEIO::UDSEntry(), true);
 		totalSize(0);
 		finished();
 	}
@@ -237,7 +237,7 @@ void KIO_Print::listRoot()
 {
 	PRINT_DEBUG << "listing root entry" << endl;
 
-	KIO::UDSEntry	entry;
+	TDEIO::UDSEntry	entry;
 
 	// Classes entry
 	createDirEntry(entry, i18n("Classes"), "print:/classes", "print/folder");
@@ -291,7 +291,7 @@ void KIO_Print::listDirDB( const KURL& url )
 			remUrl.addQueryItem( "printer", pathComps[ 1 ] );
 			break;
 		default:
-			error( KIO::ERR_UNSUPPORTED_ACTION, "Not implemented" );
+			error( TDEIO::ERR_UNSUPPORTED_ACTION, "Not implemented" );
 			return;
 	}
 	remUrl.addQueryItem( "format", "xml" );
@@ -302,7 +302,7 @@ void KIO_Print::listDirDB( const KURL& url )
 		if ( doc.setContent( &m_httpBuffer, false ) )
 		{
 			TQDomNodeList l;
-			KIO::UDSEntry entry;
+			TDEIO::UDSEntry entry;
 			switch ( pathComps.size() )
 			{
 				case 0:
@@ -353,18 +353,18 @@ void KIO_Print::listDirDB( const KURL& url )
 					}
 					break;
 				default:
-					error( KIO::ERR_UNSUPPORTED_ACTION, "Not implemented" );
+					error( TDEIO::ERR_UNSUPPORTED_ACTION, "Not implemented" );
 					return;
 			}
-			listEntry( KIO::UDSEntry(), true );
+			listEntry( TDEIO::UDSEntry(), true );
 			finished();
 		}
 		else
 		{
 			if ( m_httpBuffer.buffer().size() == 0 )
-				error( KIO::ERR_INTERNAL, i18n( "Empty data received (%1)." ).arg( url.host() ) );
+				error( TDEIO::ERR_INTERNAL, i18n( "Empty data received (%1)." ).arg( url.host() ) );
 			else
-				error( KIO::ERR_INTERNAL, i18n( "Corrupted/incomplete data or server error (%1)." ).arg( url.host() ) );
+				error( TDEIO::ERR_INTERNAL, i18n( "Corrupted/incomplete data or server error (%1)." ).arg( url.host() ) );
 		}
 	}
 	/*
@@ -383,7 +383,7 @@ void KIO_Print::stat(const KURL& url)
 
 	PRINT_DEBUG << "stat: " << url.url() << endl;
 	TQStringList	path = TQStringList::split('/', url.encodedPathAndQuery(-1), false);
-	KIO::UDSEntry	entry;
+	TDEIO::UDSEntry	entry;
 	TQString	mime;
 	bool err(false);
 
@@ -427,13 +427,13 @@ void KIO_Print::stat(const KURL& url)
 		finished();
 	}
 	else
-		error(KIO::ERR_DOES_NOT_EXIST, url.path());
+		error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 }
 
 void KIO_Print::statDB( const KURL& url )
 {
 	PRINT_DEBUG << "statDB: " << url << endl;
-	KIO::UDSEntry entry;
+	TDEIO::UDSEntry entry;
 	TQStringList pathComps = TQStringList::split( '/', url.path(), false );
 	if ( pathComps.size() == 3 )
 		createFileEntry( entry, i18n( "Printer driver" ), url.url(), "print/driver" );
@@ -454,11 +454,11 @@ bool KIO_Print::getDBFile( const KURL& src )
 	m_httpBuffer.open( IO_WriteOnly|IO_Truncate ); // be sure to erase the existing data
 
 	/* start the transfer job */
-	KIO::TransferJob *job = KIO::get( src, false, false );
-	connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( slotResult( KIO::Job* ) ) );
-	connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
-	connect( job, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ), TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
-	connect( job, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ), TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
+	TDEIO::TransferJob *job = TDEIO::get( src, false, false );
+	connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+	connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+	connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
 	kapp->enter_loop();
 	m_httpBuffer.close();
 
@@ -474,7 +474,7 @@ void KIO_Print::getDB( const KURL& url )
 
 	TQStringList pathComps = TQStringList::split( '/', url.path(), false );
 	if ( pathComps.size() != 3 )
-		error( KIO::ERR_MALFORMED_URL, url.url() );
+		error( TDEIO::ERR_MALFORMED_URL, url.url() );
 	else
 	{
 		KURL remUrl;
@@ -498,7 +498,7 @@ void KIO_Print::getDB( const KURL& url )
 	}
 }
 
-void KIO_Print::slotResult( KIO::Job *j )
+void KIO_Print::slotResult( TDEIO::Job *j )
 {
 	/*
 	 * store slave results for later user (job gets deleted 
@@ -513,7 +513,7 @@ void KIO_Print::slotResult( KIO::Job *j )
 	kapp->exit_loop();
 }
 
-void KIO_Print::slotData( KIO::Job *j, const TQByteArray& d )
+void KIO_Print::slotData( TDEIO::Job *j, const TQByteArray& d )
 {
 	PRINT_DEBUG << "HTTP data received (size=" << d.size() << ")" << endl;
 	if ( d.size() > 0 )
@@ -521,19 +521,19 @@ void KIO_Print::slotData( KIO::Job *j, const TQByteArray& d )
 		int len = m_httpBuffer.writeBlock( d );
 		if ( len == -1 || len != ( int )d.size() )
 		{
-			m_httpError = KIO::ERR_INTERNAL;
+			m_httpError = TDEIO::ERR_INTERNAL;
 			m_httpErrorTxt = "Unable to write to the internal buffer.";
 			j->kill( false );
 		}
 	}
 }
 
-void KIO_Print::slotTotalSize( KIO::Job*, KIO::filesize_t sz )
+void KIO_Print::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t sz )
 {
 	totalSize( sz );
 }
 
-void KIO_Print::slotProcessedSize( KIO::Job*, KIO::filesize_t sz )
+void KIO_Print::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t sz )
 {
 	processedSize( sz );
 }
@@ -568,7 +568,7 @@ void KIO_Print::get(const KURL& url)
 			query = group.mid(p+1);
 		if (!query.isEmpty() && query != "jobs" && query != "completed_jobs")
 		{
-			error(KIO::ERR_MALFORMED_URL, TQString());
+			error(TDEIO::ERR_MALFORMED_URL, TQString());
 			return;
 		}
 		PRINT_DEBUG << "listing jobs for all printers" << endl;
@@ -594,7 +594,7 @@ void KIO_Print::get(const KURL& url)
 	if (elems.count() > 2 || (path.isEmpty() && group != "printers" && group != "classes" && group != "specials")
 	    || (mprinter == 0 && path.isEmpty()))
 	{
-		error(KIO::ERR_DOES_NOT_EXIST, url.path());
+		error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 		return;
 	}
 
@@ -609,7 +609,7 @@ void KIO_Print::get(const KURL& url)
 			else if (query == "driver")
 				showDriver(mprinter);
 			else
-				error(KIO::ERR_MALFORMED_URL, KURL::decode_string(elems[1]));
+				error(TDEIO::ERR_MALFORMED_URL, KURL::decode_string(elems[1]));
 		}
 		else if (group == "printers" && mprinter->isPrinter())
 			showPrinterInfo(mprinter);
@@ -618,18 +618,18 @@ void KIO_Print::get(const KURL& url)
 		else if (group == "specials" && mprinter->isSpecial())
 			showSpecialInfo(mprinter);
 		else
-			error(KIO::ERR_INTERNAL, i18n("Unable to determine object type for %1.").arg(printer));
+			error(TDEIO::ERR_INTERNAL, i18n("Unable to determine object type for %1.").arg(printer));
 	}
 	else if (!path.isEmpty())
 		showData(path);
 	else
-		error(KIO::ERR_INTERNAL, i18n("Unable to determine source type for %1.").arg(printer));
+		error(TDEIO::ERR_INTERNAL, i18n("Unable to determine source type for %1.").arg(printer));
 }
 
 void KIO_Print::showPrinterInfo(KMPrinter *printer)
 {
 	if (!KMManager::self()->completePrinter(printer))
-		error(KIO::ERR_INTERNAL, i18n("Unable to retrieve printer information for %1.").arg(printer->name()));
+		error(TDEIO::ERR_INTERNAL, i18n("Unable to retrieve printer information for %1.").arg(printer->name()));
 	else
 	{
 		mimeType("text/html");
@@ -637,7 +637,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer)
 		TQString	content;
 		if (!loadTemplate(TQString::fromLatin1("printer.template"), content))
 		{
-			error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template"));
+			error(TDEIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template"));
 			return;
 		}
 
@@ -670,7 +670,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer)
 void KIO_Print::showClassInfo(KMPrinter *printer)
 {
 	if (!KMManager::self()->completePrinter(printer))
-		error(KIO::ERR_INTERNAL, i18n("Unable to retrieve class information for %1.").arg(printer->name()));
+		error(TDEIO::ERR_INTERNAL, i18n("Unable to retrieve class information for %1.").arg(printer->name()));
 	else
 	{
 		mimeType("text/html");
@@ -678,7 +678,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
 		TQString	content;
 		if (!loadTemplate(TQString::fromLatin1("class.template"), content))
 		{
-			error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template"));
+			error(TDEIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template"));
 			return;
 		}
 
@@ -721,7 +721,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
 	TQString	content;
 	if (!loadTemplate(TQString::fromLatin1("pseudo.template"), content))
 	{
-		error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
+		error(TDEIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
 		return;
 	}
 
@@ -783,7 +783,7 @@ void KIO_Print::showData(const TQString& pathname)
 	else
 	{
 		PRINT_DEBUG << "file not found" << endl;
-		error(KIO::ERR_DOES_NOT_EXIST, pathname);
+		error(TDEIO::ERR_DOES_NOT_EXIST, pathname);
 	}
 }
 
@@ -822,7 +822,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
 	TQString	content;
 	if (!loadTemplate(TQString::fromLatin1("jobs.template"), content))
 	{
-		error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
+		error(TDEIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
 		return;
 	}
 
@@ -893,7 +893,7 @@ void KIO_Print::showDriver(KMPrinter *prt)
 	TQString	content;
 	if (!loadTemplate(TQString::fromLatin1("driver.template"), content))
 	{
-		error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
+		error(TDEIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
 		return;
 	}
 
diff --git a/tdeprint/slave/kio_print.h b/tdeprint/slave/kio_print.h
index 954a3045f..afd337ba6 100644
--- a/tdeprint/slave/kio_print.h
+++ b/tdeprint/slave/kio_print.h
@@ -26,11 +26,11 @@
 #include <tqbuffer.h>
 
 class KMPrinter;
-namespace KIO {
+namespace TDEIO {
 	class Job;
 }
 
-class KIO_Print : public TQObject, public KIO::SlaveBase
+class KIO_Print : public TQObject, public TDEIO::SlaveBase
 {
 	Q_OBJECT
 public:
@@ -41,10 +41,10 @@ public:
 	void stat(const KURL& url);
 
 protected slots:
-	void slotResult( KIO::Job* );
-	void slotData( KIO::Job*, const TQByteArray& );
-	void slotTotalSize( KIO::Job*, KIO::filesize_t );
-	void slotProcessedSize( KIO::Job*, KIO::filesize_t );
+	void slotResult( TDEIO::Job* );
+	void slotData( TDEIO::Job*, const TQByteArray& );
+	void slotTotalSize( TDEIO::Job*, TDEIO::filesize_t );
+	void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t );
 
 private:
 	void listRoot();
diff --git a/tdeprint/tdeprintfax/conffax.cpp b/tdeprint/tdeprintfax/conffax.cpp
index e36916b83..97d5e036a 100644
--- a/tdeprint/tdeprintfax/conffax.cpp
+++ b/tdeprint/tdeprintfax/conffax.cpp
@@ -61,7 +61,7 @@ ConfFax::ConfFax(TQWidget *parent, const char *name)
 
 void ConfFax::load()
 {
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("Fax");
 	TQString	v = conf->readEntry("Page", TDEGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter");
 	if (v == "letter") m_pagesize->setCurrentItem(1);
@@ -73,7 +73,7 @@ void ConfFax::load()
 
 void ConfFax::save()
 {
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("Fax");
 	conf->writeEntry("Resolution", (m_resolution->currentItem() == 0 ? "High" : "Low"));
 	conf->writeEntry("Page", (m_pagesize->currentItem() == 0 ? "a4" : (m_pagesize->currentItem() == 1 ? "letter" : "legal")));
diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp
index be3025e65..0526ee684 100644
--- a/tdeprint/tdeprintfax/confgeneral.cpp
+++ b/tdeprint/tdeprintfax/confgeneral.cpp
@@ -69,7 +69,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)
 
 void ConfGeneral::load()
 {
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("Personal");
 	m_name->setText(conf->readEntry("Name", getenv("USER")));
 	m_number->setText(conf->readEntry("Number"));
@@ -80,7 +80,7 @@ void ConfGeneral::load()
 
 void ConfGeneral::save()
 {
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("Personal");
 	conf->writeEntry("Name", m_name->text());
 	conf->writeEntry("Number", m_number->text());
diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp
index a116af180..e1171962a 100644
--- a/tdeprint/tdeprintfax/confsystem.cpp
+++ b/tdeprint/tdeprintfax/confsystem.cpp
@@ -97,7 +97,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
  
 void ConfSystem::load() 
 { 
-	KConfig	*conf = TDEGlobal::config(); 
+	TDEConfig	*conf = TDEGlobal::config(); 
 	conf->setGroup("System");
 	m_commands << conf->readPathEntry("EFax", defaultCommand(efax_default_cmd)); 
 	m_commands << conf->readPathEntry("HylaFax", defaultCommand(hylafax_default_cmd));
@@ -130,7 +130,7 @@ void ConfSystem::load()
 void ConfSystem::save()
 {
 	m_commands[ m_current ] = m_command->text();
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("System");
 	if (m_commands[EFAX_ID] != defaultCommand(efax_default_cmd))
 		conf->writePathEntry("EFax", m_commands[EFAX_ID]);
diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp
index c9b183b27..fd0073b7a 100644
--- a/tdeprint/tdeprintfax/faxab.cpp
+++ b/tdeprint/tdeprintfax/faxab.cpp
@@ -60,7 +60,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
 	l2->addWidget(m_ok, 0);
 	l2->addWidget(m_cancel, 0);
 
-	KConfig *conf = TDEGlobal::config();
+	TDEConfig *conf = TDEGlobal::config();
 	conf->setGroup( "General" );
 	TQSize defsize( 400, 200 );
 	resize( conf->readSizeEntry( "ABSize", &defsize ) );
@@ -71,7 +71,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
 
 FaxAB::~FaxAB()
 {
-	KConfig *conf = TDEGlobal::config();
+	TDEConfig *conf = TDEGlobal::config();
 	conf->setGroup( "General" );
 	conf->writeEntry( "ABSize", size() );
 }
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index 7e70a5e71..2c8faffc6 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -75,14 +75,14 @@ char const* pageSizeText(int size)
  */
 static TQString pageSize()
 {
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("Fax");
 	return conf->readEntry("Page", pageSizeText(TDEGlobal::locale()->pageSize()));
 }
 
 static TQString stripNumber( const TQString& s )
 {
-	KConfig *conf = TDEGlobal::config();
+	TDEConfig *conf = TDEGlobal::config();
 	conf->setGroup( "Personal" );
 
 	// removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools)
@@ -193,7 +193,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa
 	// unquote variables (they will be replaced with quoted values later)
 
 	TQValueStack<bool> stack;
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 
 	TQString cmd = s;
 
@@ -426,7 +426,7 @@ void FaxCtrl::slotProcessExited(TDEProcess*)
 
 TQString FaxCtrl::faxCommand()
 {
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("System");
 	TQString	sys = conf->readPathEntry("System", "efax");
 	TQString cmd;
@@ -576,7 +576,7 @@ void FaxCtrl::addLog(const TQString& s, bool isTitle)
 
 TQString FaxCtrl::faxSystem()
 {
-	KConfig	*conf = TDEGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("System");
 	TQString	s = conf->readEntry("System", "efax");
 	s[0] = s[0].upper();
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 047b4cb3c..95266a95b 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -274,7 +274,7 @@ void KdeprintFax::slotKab()
 void KdeprintFax::addURL(KURL url)
 {
 	TQString	target;
-	if (KIO::NetAccess::download(url,target,this))
+	if (TDEIO::NetAccess::download(url,target,this))
 	{
 		m_files->insertItem(KMimeType::pixmapForURL(url,0,KIcon::Small),target);
 		actionCollection()->action("file_remove")->setEnabled(true);