From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- certmanager/lib/backends/chiasmus/chiasmusbackend.cpp | 14 +++++++------- certmanager/lib/cryptplugwrapper.cpp | 2 +- certmanager/lib/cryptplugwrapper.h | 2 +- certmanager/lib/kleo/cryptobackendfactory.cpp | 8 ++++---- certmanager/lib/kleo/cryptobackendfactory.h | 6 +++--- certmanager/lib/kleo/dn.cpp | 4 ++-- certmanager/lib/kleo/kconfigbasedkeyfilter.cpp | 8 ++++---- certmanager/lib/kleo/kconfigbasedkeyfilter.h | 8 ++++---- certmanager/lib/kleo/keyfiltermanager.cpp | 6 +++--- certmanager/lib/ui/cryptoconfigmodule.h | 2 +- certmanager/lib/ui/keyselectiondialog.cpp | 4 ++-- 11 files changed, 32 insertions(+), 32 deletions(-) (limited to 'certmanager/lib') diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index b3e751400..da875e303 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -197,13 +197,13 @@ namespace { TQVariant value() const { return mValue; } - void sync( KConfigBase * config ) { + void sync( TDEConfigBase * config ) { if ( !mDirty ) return; mDirty = false; config->writeEntry( kleo_chiasmus_config_entries[mIdx].name, mValue ); } - void read( const KConfigBase * config ) { + void read( const TDEConfigBase * config ) { mDirty = false; mValue = config->readPropertyEntry( kleo_chiasmus_config_entries[mIdx].name, defaultValue() ); } @@ -254,7 +254,7 @@ namespace { class ChiasmusGeneralGroup : public Kleo::CryptoConfigGroup { mutable std::map mCache; - mutable KConfig * mConfigObject; + mutable TDEConfig * mConfigObject; public: ChiasmusGeneralGroup() : Kleo::CryptoConfigGroup(), mConfigObject( 0 ) {} ~ChiasmusGeneralGroup() { clear(); delete mConfigObject; } @@ -271,7 +271,7 @@ namespace { Kleo::CryptoConfigEntry * entry( const TQString & name ) const { if ( ChiasmusConfigEntry * entry = mCache[name] ) return entry; - const KConfigGroup group( configObject(), "Chiasmus" ); + const TDEConfigGroup group( configObject(), "Chiasmus" ); for ( unsigned int i = 0 ; i < kleo_chiasmus_config_entries_dim ; ++i ) if ( name == kleo_chiasmus_config_entries[i].name ) { ChiasmusConfigEntry * entry = new ChiasmusConfigEntry( i ); @@ -282,17 +282,17 @@ namespace { } void sync() { - KConfigGroup group( configObject(), "Chiasmus" ); + TDEConfigGroup group( configObject(), "Chiasmus" ); for ( std::map::const_iterator it = mCache.begin(), end = mCache.end() ; it != end ; ++it ) it->second->sync( &group ); group.sync(); clear(); } private: - KConfig * configObject() const { + TDEConfig * configObject() const { if ( !mConfigObject ) // this is unsafe. We're a lib, used by concurrent apps. - mConfigObject = new KConfig( "chiasmusbackendrc" ); + mConfigObject = new TDEConfig( "chiasmusbackendrc" ); return mConfigObject; } void clear() { diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index 6f07c954b..f997e9309 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/certmanager/lib/cryptplugwrapper.cpp @@ -133,7 +133,7 @@ public: _unknownAttrsHandling = unknownAttrsInfix; _unknownAttrsHandlingChar = "INFIX"; } - DNBeautifier( KConfig* config, + DNBeautifier( TDEConfig* config, const TQString& cfgGroup, const TQString& cfgAttributeOrderEntry, const TQString& cfgUnknownAttrsEntry, diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index bf1976700..39fd680a4 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -57,7 +57,7 @@ #include -class KConfigBase; +class TDEConfigBase; class QGpgMECryptoConfig; namespace GpgME { 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 mBackendList; - mutable KConfig* mConfigObject; + mutable TDEConfig* mConfigObject; typedef std::map BackendMap; BackendMap mBackends; typedef std::vector 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 -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 ); } diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h index 4d5042f58..2902423c8 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.h +++ b/certmanager/lib/ui/cryptoconfigmodule.h @@ -43,7 +43,7 @@ namespace Kleo { /** * Crypto Config Module widget, dynamically generated from CryptoConfig - * It's a simple TQWidget so that it can be embedded into a dialog or into a KCModule. + * It's a simple TQWidget so that it can be embedded into a dialog or into a TDECModule. */ class CryptoConfigModule : public KJanusWidget { Q_OBJECT diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 35a97611c..adb257493 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -449,14 +449,14 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); TQSize dialogSize( 500, 400 ); - KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" ); + TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" ); dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize ); resize( dialogSize ); } } Kleo::KeySelectionDialog::~KeySelectionDialog() { - KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" ); + TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" ); dialogConfig.writeEntry( "Dialog size", size() ); dialogConfig.sync(); } -- cgit v1.2.1