From 4812cdb245fee471edd87f685a3833aeead705b7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:11:45 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 conduits/abbrowserconduit/abbrowser-conduit.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'conduits/abbrowserconduit')

diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc
index 8ccb9a2..9e677d0 100644
--- a/conduits/abbrowserconduit/abbrowser-conduit.cc
+++ b/conduits/abbrowserconduit/abbrowser-conduit.cc
@@ -285,14 +285,14 @@ bool AbbrowserConduit::_loadAddressBook()
 		{ // initialize the abook with the given file
 			DEBUGKPILOT<<"Loading custom addressbook"<<endl;
 			KURL kurl(AbbrowserSettings::fileName());
-			if(!KIO::NetAccess::download(AbbrowserSettings::fileName(), fABookFile, 0L) &&
+			if(!TDEIO::NetAccess::download(AbbrowserSettings::fileName(), fABookFile, 0L) &&
 				!kurl.isLocalFile())
 			{
 				emit logError(i18n("You chose to sync with the file \"%1\", which "
 							"cannot be opened. Please make sure to supply a "
 							"valid file name in the conduit's configuration dialog. "
 							"Aborting the conduit.").arg(AbbrowserSettings::fileName()));
-				KIO::NetAccess::removeTempFile(fABookFile);
+				TDEIO::NetAccess::removeTempFile(fABookFile);
 				stopTickle();
 				return false;
 			}
@@ -392,13 +392,13 @@ bool AbbrowserConduit::_saveAddressBook()
 		if(!kurl.isLocalFile())
 		{
 			DEBUGKPILOT << fname << "Deleting local addressbook tempfile" << endl;
-			if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) {
+			if(!TDEIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) {
 				emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload "
 					"the temporary local file \"%2\" manually")
 					.arg(AbbrowserSettings::fileName()).arg(fABookFile));
 			}
 			else {
-				KIO::NetAccess::removeTempFile(fABookFile);
+				TDEIO::NetAccess::removeTempFile(fABookFile);
 			}
 			TQFile backup(fABookFile + CSL1("~"));
 			backup.remove();
-- 
cgit v1.2.1