Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

6 files changed, 20 insertions, 20 deletions

diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 295c05c60..f67343ca8 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -178,10 +178,10 @@ Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget *
   return new Kleo::BackendConfigWidget( mSelf, parent, name );
 }
 
-KConfig* Kleo::CryptoBackendFactory::configObject() const {
+TDEConfig* Kleo::CryptoBackendFactory::configObject() const {
   if ( !mConfigObject )
     // this is unsafe. We're a lib, used by concurrent apps.
-    mConfigObject = new KConfig( "libkleopatrarc" );
+    mConfigObject = new TDEConfig( "libkleopatrarc" );
   return mConfigObject;
 }
 
@@ -195,7 +195,7 @@ void Kleo::CryptoBackendFactory::setOpenPGPBackend( const CryptoBackend* backend
 
 void Kleo::CryptoBackendFactory::setProtocolBackend( const char * protocol, const CryptoBackend * backend ) {
   const TQString name = backend ? backend->name() : TQString() ;
-  KConfigGroup group( configObject(), "Backends" );
+  TDEConfigGroup group( configObject(), "Backends" );
   group.writeEntry( protocol, name );
   configObject()->sync();
   mBackends[protocol] = backend;
@@ -218,7 +218,7 @@ static const char * defaultBackend( const char * proto ) {
 
 void Kleo::CryptoBackendFactory::readConfig() {
   mBackends.clear();
-  const KConfigGroup group( configObject(), "Backends" );
+  const TDEConfigGroup group( configObject(), "Backends" );
   for ( ProtocolSet::const_iterator it = mAvailableProtocols.begin(), end = mAvailableProtocols.end() ; it != end ; ++it ) {
     const TQString backend = group.readEntry( *it, defaultBackend( *it ) );
     mBackends[*it] = backendByName( backend );
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index da1743f95..09012da3d 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -46,7 +46,7 @@ namespace Kleo {
 }
 
 class TQString;
-class KConfig;
+class TDEConfig;
 
 namespace Kleo {
 
@@ -76,7 +76,7 @@ namespace Kleo {
 
     Kleo::BackendConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const;
 
-    KConfig* configObject() const;
+    TDEConfig* configObject() const;
 
     // The preferred backend for smime (can be 0) - currently unused
     //const CryptoBackend* smimeBackend() const;
@@ -97,7 +97,7 @@ namespace Kleo {
 
   protected:
     std::vector<CryptoBackend*> mBackendList;
-    mutable KConfig* mConfigObject;
+    mutable TDEConfig* mConfigObject;
     typedef std::map<const char *, const CryptoBackend*, lt_i_str> BackendMap;
     BackendMap mBackends;
     typedef std::vector<const char *> ProtocolSet;
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 774302ba7..3249cc73b 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private()
 
 Kleo::DNAttributeMapper::DNAttributeMapper() {
   d = new Private();
-  const KConfigGroup config( kapp->config(), "DN" );
+  const TDEConfigGroup config( kapp->config(), "DN" );
   d->attributeOrder = config.readListEntry( "AttributeOrder" );
   if ( d->attributeOrder.empty() )
     std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
@@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
   if ( order.empty() )
     std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
 	       std::back_inserter( d->attributeOrder ) );
-  KConfigGroup config( kapp->config(), "DN" );
+  TDEConfigGroup config( kapp->config(), "DN" );
   config.writeEntry( "AttributeOrder", order );
 }
 
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
index 47e1548ee..4ed6ab37d 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
@@ -67,7 +67,7 @@ static GpgME::UserID::Validity map2Validity( const TQString & s ) {
 }
 
 
-Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
+Kleo::TDEConfigBasedKeyFilter::TDEConfigBasedKeyFilter( const TDEConfigBase & config )
   : KeyFilter(),
     mSpecificity( 0 ),
     mItalic( false ),
@@ -151,11 +151,11 @@ Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
   }
 }
 
-Kleo::KConfigBasedKeyFilter::~KConfigBasedKeyFilter() {
+Kleo::TDEConfigBasedKeyFilter::~TDEConfigBasedKeyFilter() {
 
 }
 
-bool Kleo::KConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
+bool Kleo::TDEConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
 #ifdef MATCH
 #undef MATCH
 #endif
@@ -243,7 +243,7 @@ static inline TQFont adapt( TQFont font, bool it, bool b, bool strike ) {
   return font;
 }
 
-TQFont Kleo::KConfigBasedKeyFilter::font( const TQFont & f ) const {
+TQFont Kleo::TDEConfigBasedKeyFilter::font( const TQFont & f ) const {
   if ( mUseFullFont )
     return resizedFont( mFont, f.pointSize(), mStrikeOut );
   else
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.h b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
index 98050cc6b..487b3791a 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.h
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
@@ -41,14 +41,14 @@
 
 #include <gpgmepp/key.h>
 
-class KConfigBase;
+class TDEConfigBase;
 
 namespace Kleo {
 
-  class KConfigBasedKeyFilter : public KeyFilter {
+  class TDEConfigBasedKeyFilter : public KeyFilter {
   public:
-    explicit KConfigBasedKeyFilter( const KConfigBase & config );
-    ~KConfigBasedKeyFilter();
+    explicit TDEConfigBasedKeyFilter( const TDEConfigBase & config );
+    ~TDEConfigBasedKeyFilter();
     bool matches( const GpgME::Key & key ) const;
 
     unsigned int specificity() const { return mSpecificity; }
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 6edc7c571..1276f9fd3 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -104,13 +104,13 @@ static inline bool by_increasing_specificity( const Kleo::KeyFilter * left, cons
 void Kleo::KeyFilterManager::reload() {
   d->clear();
 
-  KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+  TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
   if ( !config )
     return;
   const TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
   for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
-    const KConfigGroup cfg( config, *it );
-    d->filters.push_back( new KConfigBasedKeyFilter( cfg ) );
+    const TDEConfigGroup cfg( config, *it );
+    d->filters.push_back( new TDEConfigBasedKeyFilter( cfg ) );
   }
   std::stable_sort( d->filters.begin(), d->filters.end(), by_increasing_specificity );
 }