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

7 files changed, 22 insertions, 22 deletions

diff --git a/kmyfirewall/core/kmfdoc.cpp b/kmyfirewall/core/kmfdoc.cpp
index 45b974f..0d826f4 100644
--- a/kmyfirewall/core/kmfdoc.cpp
+++ b/kmyfirewall/core/kmfdoc.cpp
@@ -146,7 +146,7 @@ KMFError* KMFDoc::exportXMLRuleset( bool promptFile, bool asTemplate ) {
 		}
 		int answer = 0;
 		while ( answer != KMessageBox::Yes ) {
-			if ( KIO::NetAccess::exists( saveUrl, false, TDEApplication::kApplication()->mainWidget() ) ) {
+			if ( TDEIO::NetAccess::exists( saveUrl, false, TDEApplication::kApplication()->mainWidget() ) ) {
 				if ( answer == 4 ) {
 					return exportXMLRuleset( promptFile, asTemplate );
 				} else {
@@ -177,7 +177,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) {
 			f.flush();
 			f.close();
 			
-			if ( ! KIO::NetAccess::upload( file.name(), url, TDEApplication::kApplication()->mainWidget() ) ) {
+			if ( ! TDEIO::NetAccess::upload( file.name(), url, TDEApplication::kApplication()->mainWidget() ) ) {
 				kdDebug() << "Coudn't save File: " << url.url() << endl;
 				m_err->setErrType( KMFError::NORMAL );
 				m_err->setErrMsg( i18n( "<qt><p><b>Saving <i>%1</i> Failed.</b></p>"
diff --git a/kmyfirewall/core/kmfgenericdoc.cpp b/kmyfirewall/core/kmfgenericdoc.cpp
index 2ea592f..1de7bcc 100644
--- a/kmyfirewall/core/kmfgenericdoc.cpp
+++ b/kmyfirewall/core/kmfgenericdoc.cpp
@@ -287,7 +287,7 @@ const TQString& KMFGenericDoc::compile() {
 void KMFGenericDoc::parseDocument( const KURL& url, TQStringList& errors ) {
 // 	kdDebug() << "KMFDoc* KMFGenericDoc::parseDocument( const KURL& )" << endl;
 	TQString xmlfile;
-	if ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
+	if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
 		clear();
 		m_url.setFileName( i18n( "Untitled" ) );
 		return;
@@ -318,11 +318,11 @@ void KMFGenericDoc::parseDocument( const KURL& url, TQStringList& errors ) {
 		m_url = url;
 		// setUrl( url );
 		emit documentChanged();
-		KIO::NetAccess::removeTempFile( xmlfile );
+		TDEIO::NetAccess::removeTempFile( xmlfile );
 		return;
 	//	return this;
 	}
-	KIO::NetAccess::removeTempFile( xmlfile );
+	TDEIO::NetAccess::removeTempFile( xmlfile );
 //	return this;
 }
 
diff --git a/kmyfirewall/core/kmfiptdoc.cpp b/kmyfirewall/core/kmfiptdoc.cpp
index b1a86e5..6002ec0 100644
--- a/kmyfirewall/core/kmfiptdoc.cpp
+++ b/kmyfirewall/core/kmfiptdoc.cpp
@@ -408,7 +408,7 @@ const TQString& KMFIPTDoc::compile() {
 void KMFIPTDoc::parseDocument( const KURL& url, TQStringList& errors ) {
 	// 	kdDebug() << "KMFIPTDoc::parseDocument()" << endl;
 	TQString xmlfile;
-	if ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
+	if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
 		clear();
 		m_url.setFileName( i18n( "Untitled" ) );
 		return;
@@ -447,11 +447,11 @@ void KMFIPTDoc::parseDocument( const KURL& url, TQStringList& errors ) {
 		// setUrl( url );
 		m_url = url;
 		emit documentChanged();
-		KIO::NetAccess::removeTempFile( xmlfile );
+		TDEIO::NetAccess::removeTempFile( xmlfile );
 		return;
 	//	return this;
 	}
-	KIO::NetAccess::removeTempFile( xmlfile );
+	TDEIO::NetAccess::removeTempFile( xmlfile );
 	// return this;
 }
 
diff --git a/kmyfirewall/core/kmfnetwork.cpp b/kmyfirewall/core/kmfnetwork.cpp
index e5ce904..24b2af7 100644
--- a/kmyfirewall/core/kmfnetwork.cpp
+++ b/kmyfirewall/core/kmfnetwork.cpp
@@ -216,7 +216,7 @@ bool KMFNetwork::isEmpty() {
 void KMFNetwork::parseDocument( const KURL& url, TQStringList& errors ) {
 	kdDebug() << "KMFDoc* KMFNetwork::parseDocument( const KURL& url )" << endl;
 	TQString xmlfile;
-	if ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
+	if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
 		clear();
 		m_url.setFileName( i18n( "Untitled" ) );
 		return;
@@ -256,10 +256,10 @@ void KMFNetwork::parseDocument( const KURL& url, TQStringList& errors ) {
 		m_url = url;
 		m_newSavePathNeeded = false;
 		emit documentChanged();
-		KIO::NetAccess::removeTempFile( xmlfile );
+		TDEIO::NetAccess::removeTempFile( xmlfile );
 		return;
 	}
-	KIO::NetAccess::removeTempFile( xmlfile );
+	TDEIO::NetAccess::removeTempFile( xmlfile );
 	return;
 }
 
diff --git a/kmyfirewall/core/kmfprotocollibrary.cpp b/kmyfirewall/core/kmfprotocollibrary.cpp
index f9634da..51b12c4 100644
--- a/kmyfirewall/core/kmfprotocollibrary.cpp
+++ b/kmyfirewall/core/kmfprotocollibrary.cpp
@@ -126,7 +126,7 @@ void KMFProtocolLibrary::forceProtocolLibraryReload() {
 	url.setPath( file );
 	kdDebug() << "CUSTOM lib at: " << file << endl;
 	// KURL tmpurl =  KURL( dir + "protocols/kmfcustomprotocollibrary.xml" );
-	if ( ! KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) {	
+	if ( ! TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) {	
 		kdDebug() << "KMFGenericDoc::loadProtocolLibrary() - no custom protocols found." << endl;
 		return;
 	}
@@ -146,9 +146,9 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url,  KMFEr
 	kdDebug() << "KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& " << url.fileName() << " )" << endl;
 // 	TQPtrList<KMFProtocol> *prots = new TQPtrList<KMFProtocol>();
 
-	KIO::UDSEntry f_props;
+	TDEIO::UDSEntry f_props;
 	
-	if ( ! KIO::NetAccess::stat( url , f_props, TDEApplication::kApplication()->mainWidget() ) ) {
+	if ( ! TDEIO::NetAccess::stat( url , f_props, TDEApplication::kApplication()->mainWidget() ) ) {
 		
 		const TQString msg = i18n( "<qt><p>The file <b>%1</b> could not be loaded.</p>"
 		                          "<p>If you are working with files stored on remote computers "
@@ -168,7 +168,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url,  KMFEr
 	}
 
 	TQString xmlfile;
-	if ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
+	if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
 		const TQString msg = i18n( "<qt><p>Could not download file: <b>%1</b></p></qt>" ).arg( url.url() );
 		err->setErrType( KMFError::NORMAL );
 		err->setErrMsg( msg );
@@ -278,7 +278,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() {
 			f.close();
 			
 			
-			if ( ! KIO::NetAccess::upload( file.name(), url, TDEApplication::kApplication()->mainWidget() ) ) {
+			if ( ! TDEIO::NetAccess::upload( file.name(), url, TDEApplication::kApplication()->mainWidget() ) ) {
 				kdDebug() << "Coudn't save File: " << url.url() << endl;
 				err->setErrType( KMFError::NORMAL );
 				err->setErrMsg( i18n( "<qt><p><b>Saving <i>%1</i> Failed.</b></p>"
diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp
index b6c69ef..0dbdbb9 100644
--- a/kmyfirewall/core/kmftarget.cpp
+++ b/kmyfirewall/core/kmftarget.cpp
@@ -229,7 +229,7 @@ KMFError* KMFTarget::tryAutoConfiguration() {
 	kdDebug() << "Search Path: " << path << endl;
 	TQString localFile = TDEGlobal::dirs() ->findResource( "data", path );
 	
-	if ( ! KIO::NetAccess::exists( localFile, false, TDEApplication::kApplication()->mainWidget() ) ) {
+	if ( ! TDEIO::NetAccess::exists( localFile, false, TDEApplication::kApplication()->mainWidget() ) ) {
 		kdDebug() << "No autoconfigure script found for os: " << config()->oS() << endl;
 		emit sigTargetChanged( this );
 		err->setErrType( KMFError::NORMAL );
diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp
index 0f13cc0..09d2cd7 100644
--- a/kmyfirewall/core/kprocesswrapper.cpp
+++ b/kmyfirewall/core/kprocesswrapper.cpp
@@ -71,7 +71,7 @@ void TDEProcessWrapper::slotStartLocalJob( const TQString& jobName, const TQStri
 	m_stdErr = "";
 	TQString localScriptFile = command;
 	KTempFile *f = new KTempFile();
-	if ( ! KIO::NetAccess::exists( localScriptFile, false, TDEApplication::kApplication()->mainWidget() ) ) {
+	if ( ! TDEIO::NetAccess::exists( localScriptFile, false, TDEApplication::kApplication()->mainWidget() ) ) {
 		kdDebug() << "TDEProcessWrapper::slotStartLocalJob(...) - creating temporary script file." << endl;
 		TQTextStream *ts = f->textStream();
 		*ts << command << endl;
@@ -105,7 +105,7 @@ void TDEProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStr
 	m_stdOut = "";
 	m_stdErr = "";
 	KTempFile *f = new KTempFile();
-	if ( ! KIO::NetAccess::exists( scriptFile, false, TDEApplication::kApplication()->mainWidget() ) ) {
+	if ( ! TDEIO::NetAccess::exists( scriptFile, false, TDEApplication::kApplication()->mainWidget() ) ) {
 		kdDebug() << "TDEProcessWrapper::slotStartRemoteJob(...) - creating temporary script file." << endl;
 		TQTextStream *ts = f->textStream();
 		*ts << scriptFile << endl;
@@ -119,7 +119,7 @@ void TDEProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStr
 	KURL remFileUrl(  execHost->getFishUrl() + "/tmp/" + uuid.toString() );
 	kdDebug() << "UPLOADING: Temporary script file: " << localScriptFile << " to: " << remFileUrl.url() <<  endl;
 	
-	if ( ! KIO::NetAccess::upload( localScriptFile, remFileUrl, TDEApplication::kApplication()->mainWidget() ) ) {
+	if ( ! TDEIO::NetAccess::upload( localScriptFile, remFileUrl, TDEApplication::kApplication()->mainWidget() ) ) {
 		kdDebug() << "ERROR: Could not upload temp file." << endl;
 		m_exitedNormal = false;
 		m_status = 1;
@@ -136,8 +136,8 @@ void TDEProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStr
 	
 	TQString cmd = "bash /tmp/" + uuid.toString();
 	kdDebug() << "Execute: " << cmd << " at: " << execHost->getFishUrl() << endl;
-	const TQString& ret = KIO::NetAccess::fish_execute( execHost->getFishUrl(), cmd, TDEApplication::kApplication()->mainWidget() ); 
-	if ( ! KIO::NetAccess::del( remFileUrl, TDEApplication::kApplication()->mainWidget() ) ) {
+	const TQString& ret = TDEIO::NetAccess::fish_execute( execHost->getFishUrl(), cmd, TDEApplication::kApplication()->mainWidget() ); 
+	if ( ! TDEIO::NetAccess::del( remFileUrl, TDEApplication::kApplication()->mainWidget() ) ) {
 		m_exitedNormal = false;
 		m_status = 1;
 		m_stdErr = i18n( "Could not delete the temporary comand script file." );