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

---
 kcontrol/crypto/crypto.cpp | 8 ++++----
 kcontrol/crypto/crypto.h   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kcontrol/crypto')

diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index 6bdc6478f..c718184ba 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -217,7 +217,7 @@ TQString CAItem::configName() const
 
 
 KCryptoConfig::KCryptoConfig(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(KryptoFactory::instance(), parent, name)
+  : TDECModule(KryptoFactory::instance(), parent, name)
 {
 TQGridLayout *grid;
 TQBoxLayout *top = new TQVBoxLayout(this);
@@ -307,7 +307,7 @@ TQString whatstr;
 #endif
 
   // no need to parse kdeglobals.
-  config = new KConfig("cryptodefaults", false, false);
+  config = new TDEConfig("cryptodefaults", false, false);
   policies = new KSimpleConfig("ksslpolicies", false);
   pcerts = new KSimpleConfig("ksslcertificates", false);
   authcfg = new KSimpleConfig("ksslauthmap", false);
@@ -1009,7 +1009,7 @@ void KCryptoConfig::load( bool useDefaults )
   }
 
   groups = _signers->list();
-  KConfig sigcfg("ksslcalist", true, false);
+  TDEConfig sigcfg("ksslcalist", true, false);
   caList->clear();
   for (TQStringList::Iterator i = groups.begin();
                              i != groups.end();
@@ -2066,7 +2066,7 @@ void KCryptoConfig::slotCARestore() {
 
 
   TQStringList groups = _signers->list();
-  KConfig sigcfg("ksslcalist", true, false);
+  TDEConfig sigcfg("ksslcalist", true, false);
 
   for (TQStringList::Iterator i = groups.begin();
                              i != groups.end();
diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h
index 514012e71..efcef6072 100644
--- a/kcontrol/crypto/crypto.h
+++ b/kcontrol/crypto/crypto.h
@@ -215,7 +215,7 @@ private:
 
 
 
-class KCryptoConfig : public KCModule
+class KCryptoConfig : public TDECModule
 {
   Q_OBJECT
 public:
@@ -352,9 +352,9 @@ private:
   KSSLSigners *_signers;
   TQLabel *cHash;
 
-  KConfig *config;
+  TDEConfig *config;
   KSimpleConfig *policies, *pcerts, *authcfg;
-  KConfig *cacfg;
+  TDEConfig *cacfg;
 
   bool ___lehack;       // to hack around a lineedit problem
 };
-- 
cgit v1.2.1