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 ++++----
 conduits/knotes/knotes-action.cc               | 2 +-
 conduits/popmail/popmail-conduit.h             | 2 +-
 conduits/vcalconduit/cleanupstate.cc           | 4 ++--
 conduits/vcalconduit/vcal-conduitbase.cc       | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'conduits')

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();
diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc
index 18076b2..29a2e32 100644
--- a/conduits/knotes/knotes-action.cc
+++ b/conduits/knotes/knotes-action.cc
@@ -255,7 +255,7 @@ bool KNotesAction::openKNotesResource()
 {
 	FUNCTIONSETUP;
 	
-	KConfig korgcfg( locate( "config", CSL1("korganizerrc") ) );
+	TDEConfig korgcfg( locate( "config", CSL1("korganizerrc") ) );
 	korgcfg.setGroup( "Time & Date" );
 	TQString tz(korgcfg.readEntry( "TimeZoneId" ) );
 	
diff --git a/conduits/popmail/popmail-conduit.h b/conduits/popmail/popmail-conduit.h
index 52b5b91..7b909cc 100644
--- a/conduits/popmail/popmail-conduit.h
+++ b/conduits/popmail/popmail-conduit.h
@@ -36,7 +36,7 @@
 
 #include "plugin.h"
 
-class KSocket;
+class TDESocket;
 
 class PilotRecord;
 class PilotDatabase;
diff --git a/conduits/vcalconduit/cleanupstate.cc b/conduits/vcalconduit/cleanupstate.cc
index 209a0e9..200a9df 100644
--- a/conduits/vcalconduit/cleanupstate.cc
+++ b/conduits/vcalconduit/cleanupstate.cc
@@ -85,7 +85,7 @@ void CleanUpState::startSync( ConduitAction *ca )
 			dynamic_cast<KCal::CalendarLocal*>(fCalendar)->save( fCalendarFile );
 			if(!kurl.isLocalFile())
 			{
-				if( !KIO::NetAccess::upload( fCalendarFile
+				if( !TDEIO::NetAccess::upload( fCalendarFile
 					, vccb->config()->calendarFile(), 0L) )
 				{
 					vccb->addLogError( i18n( "An error occurred while uploading"
@@ -94,7 +94,7 @@ void CleanUpState::startSync( ConduitAction *ca )
 						.arg(vccb->config()->calendarFile()).arg(fCalendarFile));
 				}
 				else {
-					KIO::NetAccess::removeTempFile( fCalendarFile );
+					TDEIO::NetAccess::removeTempFile( fCalendarFile );
 				}
 				TQFile backup( fCalendarFile + CSL1( "~" ) );
 				backup.remove();
diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc
index 19b6790..a6cc86f 100644
--- a/conduits/vcalconduit/vcal-conduitbase.cc
+++ b/conduits/vcalconduit/vcal-conduitbase.cc
@@ -241,7 +241,7 @@ static void listResources( KCal::CalendarResources *p )
 {
 	FUNCTIONSETUP;
 
-	KConfig korgcfg( locate( "config", CSL1("korganizerrc") ) );
+	TDEConfig korgcfg( locate( "config", CSL1("korganizerrc") ) );
 
 	// this part taken from adcalendarbase.cpp:
 	korgcfg.setGroup( "Time & Date" );
@@ -292,14 +292,14 @@ static void listResources( KCal::CalendarResources *p )
 				i18n( "Using non-local time zone: %1" ).arg( tz ) );
 
 			KURL kurl( config()->calendarFile() );
-			if( !KIO::NetAccess::download( config()->calendarFile(),
+			if( !TDEIO::NetAccess::download( config()->calendarFile(),
 				fCalendarFile, 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( config()->calendarFile() ) );
-				KIO::NetAccess::removeTempFile( fCalendarFile );
+				TDEIO::NetAccess::removeTempFile( fCalendarFile );
 				return false;
 			}
 
-- 
cgit v1.2.1