Rename a number of libraries and executables to avoid conflicts with KDE4

1 files changed, 14 insertions, 14 deletions

diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp
index 82525619..48271559 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.cpp
+++ b/kopete/plugins/webpresence/webpresenceplugin.cpp
@@ -25,7 +25,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
@@ -73,33 +73,33 @@ WebPresencePlugin::~WebPresencePlugin()
 
 void WebPresencePlugin::loadSettings()
 {
-	TDEConfig *kconfig = TDEGlobal::config();
-	kconfig->setGroup( "Web Presence Plugin" );
+	TDEConfig *tdeconfig = TDEGlobal::config();
+	tdeconfig->setGroup( "Web Presence Plugin" );
 
-	frequency = kconfig->readNumEntry("UploadFrequency", 15);
-	resultURL = kconfig->readPathEntry("uploadURL");
+	frequency = tdeconfig->readNumEntry("UploadFrequency", 15);
+	resultURL = tdeconfig->readPathEntry("uploadURL");
 
 	resultFormatting = WEB_UNDEFINED;
 
-	if ( kconfig->readBoolEntry( "formatHTML", false ) ) {
+	if ( tdeconfig->readBoolEntry( "formatHTML", false ) ) {
 		resultFormatting = WEB_HTML;
-	} else if ( kconfig->readBoolEntry( "formatXHTML", false ) ) {
+	} else if ( tdeconfig->readBoolEntry( "formatXHTML", false ) ) {
 		resultFormatting = WEB_XHTML;
-	} else if ( kconfig->readBoolEntry( "formatXML", false ) ) {
+	} else if ( tdeconfig->readBoolEntry( "formatXML", false ) ) {
 		resultFormatting = WEB_XML;
-	} else if ( kconfig->readBoolEntry( "formatStylesheet", false ) ) {
+	} else if ( tdeconfig->readBoolEntry( "formatStylesheet", false ) ) {
 		resultFormatting = WEB_CUSTOM;
-		userStyleSheet = kconfig->readEntry("formatStylesheetURL");
+		userStyleSheet = tdeconfig->readEntry("formatStylesheetURL");
 	}
 
 	// Default to HTML if we dont get anything useful from config file.
 	if ( resultFormatting == WEB_UNDEFINED )
 		resultFormatting = WEB_HTML;
 
-	useImagesInHTML = kconfig->readBoolEntry( "useImagesHTML", false );
-	useImName = kconfig->readBoolEntry("showName", true);
-	userName = kconfig->readEntry("showThisName");
-	showAddresses = kconfig->readBoolEntry("includeIMAddress", false);
+	useImagesInHTML = tdeconfig->readBoolEntry( "useImagesHTML", false );
+	useImName = tdeconfig->readBoolEntry("showName", true);
+	userName = tdeconfig->readEntry("showThisName");
+	showAddresses = tdeconfig->readBoolEntry("includeIMAddress", false);
 
 	// Update file when settings are changed.
 	slotWriteFile();