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

---
 kopete/plugins/cryptography/cryptographyplugin.cpp             | 2 +-
 kopete/plugins/cryptography/kopete_cryptography_config.desktop | 2 +-
 kopete/plugins/cryptography/popuppublic.cpp                    | 4 ++--
 kopete/plugins/cryptography/popuppublic.h                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kopete/plugins/cryptography')

diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index f76fae2f..7e7d7761 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -94,7 +94,7 @@ CryptographyPlugin::~CryptographyPlugin()
 
 void CryptographyPlugin::loadSettings()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Cryptography Plugin");
 
 	mPrivateKeyID = config->readEntry("PGP_private_key");
diff --git a/kopete/plugins/cryptography/kopete_cryptography_config.desktop b/kopete/plugins/cryptography/kopete_cryptography_config.desktop
index 77bb8bd0..23e321aa 100644
--- a/kopete/plugins/cryptography/kopete_cryptography_config.desktop
+++ b/kopete/plugins/cryptography/kopete_cryptography_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=encrypted
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_cryptography
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 39560eeb..65cfb3bc 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -194,7 +194,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
 	CBuntrusted->setChecked( KGpgSettings::allowUntrustedKeys() );
 	CBhideid->setChecked( KGpgSettings::hideUserID() );
 	if (filemode) CBshred->setChecked( KGpgSettings::shredSource() );*/
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Cryptography Plugin");
 
 	CBarmor->hide();
@@ -467,7 +467,7 @@ void popupPublic::slotprocread(KProcIO *p)
 void popupPublic::slotOk()
 {
 //BEGIN modified for Kopete
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Cryptography Plugin");
 
 	config->writeEntry("UntrustedKeys", CBuntrusted->isChecked());
diff --git a/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h
index ca62a6d7..02570ef2 100644
--- a/kopete/plugins/cryptography/popuppublic.h
+++ b/kopete/plugins/cryptography/popuppublic.h
@@ -47,7 +47,7 @@ public:
 	TQStringList untrustedList;
 
 private:
-        KConfig *config;
+        TDEConfig *config;
         TQButtonGroup *boutonboxoptions;
         TQString customOptions;
 
-- 
cgit v1.2.1