diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/crypto | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/crypto')
| -rw-r--r-- | kcontrol/crypto/crypto.cpp | 8 | ||||
| -rw-r--r-- | kcontrol/crypto/crypto.h | 6 |
2 files changed, 7 insertions, 7 deletions
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 }; |