diff options
Diffstat (limited to 'kopete/libkopete')
25 files changed, 93 insertions, 93 deletions
diff --git a/kopete/libkopete/PORTING b/kopete/libkopete/PORTING index b1d8e8a6..21634bba 100644 --- a/kopete/libkopete/PORTING +++ b/kopete/libkopete/PORTING @@ -32,7 +32,7 @@ Porting from Kopete 0.9 to Kopete 0.10 *) KopeteAccount has been renamed to Kopete::Account .) Account no longer inerits from PluginDataObject. you can access directly to the config with configGroup() - The config now uses the KConfig cache dirrectly and not internal cache. + The config now uses the TDEConfig cache dirrectly and not internal cache. .) loaded() has been removed since properties are available dirrectly in the constructor. .) setAccountId and accountIdChanged has been removed .) password() setPassword() rememberPassword() has been removed. if the account has a pssword, uses PasswordedAccount diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp index a229937c..4cc0af42 100644 --- a/kopete/libkopete/avdevice/videodevicepool.cpp +++ b/kopete/libkopete/avdevice/videodevicepool.cpp @@ -756,7 +756,7 @@ void VideoDevicePool::loadConfig() kdDebug(14010) << k_funcinfo << "called" << endl; if((hasDevices())&&(m_clients==0)) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Video Device Settings"); const TQString currentdevice = config->readEntry("Current Device", TQString()); kdDebug(14010) << k_funcinfo << "Current device: " << currentdevice << endl; @@ -817,7 +817,7 @@ void VideoDevicePool::saveConfig() kdDebug(14010) << k_funcinfo << "called" << endl; if(hasDevices()) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Video Device Settings"); /* if(m_modelvector.size()) diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index c6c0b2c0..14c5efaf 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -64,7 +64,7 @@ public: // Widgets to parse TQPtrList<TQWidget> widgets; - // Name of the group that KConfig should be set to for each widget. + // Name of the group that TDEConfig should be set to for each widget. TQMap<TQWidget*, TQString> groups; // Child widgets of widgets to ignore @@ -101,7 +101,7 @@ public: } }; -KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *parent, +KAutoConfig::KAutoConfig(TDEConfig *kconfig, TQObject *parent, const char *name) : TQObject(parent, name), config(kconfig) { d = new KAutoConfigPrivate(); } diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h index 0aecd380..b582e85a 100644 --- a/kopete/libkopete/kautoconfig.h +++ b/kopete/libkopete/kautoconfig.h @@ -25,7 +25,7 @@ #include "kopete_export.h" -class KConfig; +class TDEConfig; class TQWidget; /** @@ -119,12 +119,12 @@ signals: public: /** * Constructor. - * @param kconfig - KConfig to use when retrieving/saving the widgets + * @param kconfig - TDEConfig to use when retrieving/saving the widgets * that KAutoConfig knows about. * @param parent - Parent object. * @param name - Object name. */ - KAutoConfig( KConfig *kconfig, TQObject *parent=0, const char *name=0 ); + KAutoConfig( TDEConfig *kconfig, TQObject *parent=0, const char *name=0 ); /** * Constructor. @@ -243,9 +243,9 @@ public slots: protected: /** - * KConfigBase object used to get/save values. + * TDEConfigBase object used to get/save values. */ - KConfig *config; + TDEConfig *config; /** * Map of the classes and the signals that they emit when changed. */ diff --git a/kopete/libkopete/kcautoconfigmodule.cpp b/kopete/libkopete/kcautoconfigmodule.cpp index b6911215..1143f124 100644 --- a/kopete/libkopete/kcautoconfigmodule.cpp +++ b/kopete/libkopete/kcautoconfigmodule.cpp @@ -31,7 +31,7 @@ class KCAutoConfigModule::KCAutoConfigModulePrivate KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, const TQStringList & args ) - : KCModule( parent, name, args ) + : TDECModule( parent, name, args ) , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) ); @@ -40,7 +40,7 @@ KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, co } KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * parent, const TQStringList & args ) - : KCModule( instance, parent, args ) + : TDECModule( instance, parent, args ) , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) ); @@ -50,16 +50,16 @@ KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * paren -KCAutoConfigModule::KCAutoConfigModule( KConfig *config,TQWidget * parent, const char * name, const TQStringList & args ) - : KCModule( parent, name, args ) , d( new KCAutoConfigModulePrivate ) +KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config,TQWidget * parent, const char * name, const TQStringList & args ) + : TDECModule( parent, name, args ) , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) ); connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified())); } -KCAutoConfigModule::KCAutoConfigModule( KConfig *config , TDEInstance * instance, TQWidget * parent, const TQStringList & args ) - : KCModule( instance, parent, args ) +KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config , TDEInstance * instance, TQWidget * parent, const TQStringList & args ) + : TDECModule( instance, parent, args ) , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) ); diff --git a/kopete/libkopete/kcautoconfigmodule.h b/kopete/libkopete/kcautoconfigmodule.h index be76dc26..43f6e2d3 100644 --- a/kopete/libkopete/kcautoconfigmodule.h +++ b/kopete/libkopete/kcautoconfigmodule.h @@ -25,11 +25,11 @@ #include "kopete_export.h" class KAutoConfig; -class KConfig; +class TDEConfig; /** - * @short Convenience KCModule for creating config page handled with KAutoConfig + * @short Convenience TDECModule for creating config page handled with KAutoConfig * * This class makes it very easy to create a configuration page using KAutoConfig. * All you need to do is create a class that is derived from KCAutoConfigModule, create your @@ -50,41 +50,41 @@ class KConfig; * @author Olivier Goffart <ogoffart(@)tisclinet.be> * @since 3.2 */ -class KOPETE_EXPORT KCAutoConfigModule : public KCModule +class KOPETE_EXPORT KCAutoConfigModule : public TDECModule { Q_OBJECT public: /** - * Standard KCModule constructor. Use TDEGlobal::config() + * Standard TDECModule constructor. Use TDEGlobal::config() */ KCAutoConfigModule( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** - * Standard KCModule constructor. Use TDEGlobal::config() + * Standard TDECModule constructor. Use TDEGlobal::config() */ KCAutoConfigModule( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); /** * Constructor. - * @param config the KConfig to use + * @param config the TDEConfig to use * @param instance TDEInstance object for this KCM * @param parent parent widget * @param args special arguments for this KCM * - * @todo document what the args mean (inherited from KCModule?) + * @todo document what the args mean (inherited from TDECModule?) */ - KCAutoConfigModule(KConfig* config, TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule(TDEConfig* config, TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); /** * Constructor, much like the one above, except with * no instance and with a name. - * @param config the KConfig to use + * @param config the TDEConfig to use * @param parent parent widget * @param name name of the object * @param args special arguments for this KCM */ - KCAutoConfigModule(KConfig* config, TQWidget * parent = 0, const char * name=0 , const TQStringList & args = TQStringList() ); + KCAutoConfigModule(TDEConfig* config, TQWidget * parent = 0, const char * name=0 , const TQStringList & args = TQStringList() ); ~KCAutoConfigModule(); @@ -114,7 +114,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Reload the config from the configfile. * - * You can also reimplement this method, but you should always call the parent KCModule::load() + * You can also reimplement this method, but you should always call the parent TDECModule::load() * be sure you know what you are doing */ virtual void load(); @@ -122,7 +122,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Save the config to the configfile. * - * You can also reimplement this method, but you should always call the parent KCModule::save() + * You can also reimplement this method, but you should always call the parent TDECModule::save() * be sure you know what you are doing */ virtual void save(); @@ -130,7 +130,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Reload the default config * - * You can also reimplement this method, but you should always call the parent KCModule::defaults() + * You can also reimplement this method, but you should always call the parent TDECModule::defaults() * be sure you know what you are doing */ virtual void defaults(); diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index 5bae36fb..e8f69779 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -164,8 +164,8 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix ) { TQString appName = TQString::fromAscii( KNotifyClient::instance()->instanceName() ); KIconLoader iconLoader( appName ); - KConfig eventsFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+"/eventsrc" ), true, false, "data"); - KConfigGroup config( &eventsFile, "!Global!" ); + TDEConfig eventsFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+"/eventsrc" ), true, false, "data"); + TDEConfigGroup config( &eventsFile, "!Global!" ); TQString iconName = config.readEntry( "IconName", appName ); TQPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small ); TQString title = config.readEntry( "Comment", appName ); @@ -313,10 +313,10 @@ KNotification *KNotification::event( const TQString& message , const TQString& t TQString commandline; // get config file - KConfig eventsFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+"/eventsrc" ), true, false, "data"); + TDEConfig eventsFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+"/eventsrc" ), true, false, "data"); eventsFile.setGroup(message); - KConfig configFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+".eventsrc" ), true, false); + TDEConfig configFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+".eventsrc" ), true, false); configFile.setGroup(message); int present=KNotifyClient::getPresentation(message); diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index f549d1f0..69efb623 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -76,7 +76,7 @@ public: TQTimer suppressStatusTimer; bool suppressStatusNotification; Kopete::BlackLister *blackList; - KConfigGroup *configGroup; + TDEConfigGroup *configGroup; uint connectionTry; TQString customIcon; Kopete::OnlineStatus restoreStatus; @@ -86,7 +86,7 @@ public: Account::Account( Protocol *parent, const TQString &accountId, const char *name ) : TQObject( parent, name ), d( new Private( parent, accountId ) ) { - d->configGroup=new KConfigGroup(TDEGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id )); + d->configGroup=new TDEConfigGroup(TDEGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id )); d->excludeconnect = d->configGroup->readBoolEntry( "ExcludeConnect", false ); d->color = d->configGroup->readColorEntry( "Color", &d->color ); @@ -202,7 +202,7 @@ TQPixmap Account::accountIcon(const int size) const return base; } -KConfigGroup* Kopete::Account::configGroup() const +TDEConfigGroup* Kopete::Account::configGroup() const { return d->configGroup; } diff --git a/kopete/libkopete/kopeteaccount.h b/kopete/libkopete/kopeteaccount.h index 854890af..1cf045d2 100644 --- a/kopete/libkopete/kopeteaccount.h +++ b/kopete/libkopete/kopeteaccount.h @@ -28,7 +28,7 @@ class TQDomNode; class KActionMenu; -class KConfigGroup; +class TDEConfigGroup; namespace Kopete { @@ -55,7 +55,7 @@ class BlackLister; * the user tied to this account. You must create this contact in the contructor of your * account and pass it to @ref setMyself(). * - * All account data is saved to @ref KConfig. This includes the accountId, the autoconnect flag and + * All account data is saved to @ref TDEConfig. This includes the accountId, the autoconnect flag and * the color. You can save more data using @ref configGroup() * * When you create a new account, you have to register it with the account manager by calling @@ -307,14 +307,14 @@ public: bool isAway() const; /** - * Return the @ref KConfigGroup used to write and read special properties + * Return the @ref TDEConfigGroup used to write and read special properties * * "Protocol", "AccountId" , "Color", "AutoConnect", "Priority", "Enabled" , "Icon" are reserved keyword * already in use in that group. * * for compatibility, try to not use key that start with a uppercase */ - KConfigGroup *configGroup() const; + TDEConfigGroup *configGroup() const; /** * @brief Remove the account from the server. @@ -434,7 +434,7 @@ signals: private: /** * @internal - * Reads the configuration information of the account from KConfig. + * Reads the configuration information of the account from TDEConfig. */ void readConfig(); diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp index 69f741cb..21f0d688 100644 --- a/kopete/libkopete/kopeteaccountmanager.cpp +++ b/kopete/libkopete/kopeteaccountmanager.cpp @@ -296,7 +296,7 @@ void AccountManager::removeAccount( Account *account ) Protocol *protocol = account->protocol(); - KConfigGroup *configgroup = account->configGroup(); + TDEConfigGroup *configgroup = account->configGroup(); // Clean up the contact list TQDictIterator<Kopete::Contact> it( account->contacts() ); @@ -346,7 +346,7 @@ void AccountManager::save() for ( TQPtrListIterator<Account> it( d->accounts ); it.current(); ++it ) { - KConfigBase *config = it.current()->configGroup(); + TDEConfigBase *config = it.current()->configGroup(); config->writeEntry( "Protocol", it.current()->protocol()->pluginId() ); config->writeEntry( "AccountId", it.current()->accountId() ); @@ -364,7 +364,7 @@ void AccountManager::load() // and load the required protocols if the account is enabled. // Don't try to optimize duplicate calls out, the plugin queue is smart enough // (and fast enough) to handle that without adding complexity here - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { @@ -387,7 +387,7 @@ void AccountManager::slotPluginLoaded( Plugin *plugin ) // Iterate over all groups that start with "Account_" as those are accounts // and parse them if they are from this protocol - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { diff --git a/kopete/libkopete/kopeteaccountmanager.h b/kopete/libkopete/kopeteaccountmanager.h index 03b56334..4f8f3bc2 100644 --- a/kopete/libkopete/kopeteaccountmanager.h +++ b/kopete/libkopete/kopeteaccountmanager.h @@ -167,13 +167,13 @@ public slots: /** * \internal - * Save the account data to KConfig + * Save the account data to TDEConfig */ void save(); /** * \internal - * Load the account data from KConfig + * Load the account data from TDEConfig */ void load(); diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 13b4ca5d..94e07ddd 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -145,7 +145,7 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") load(); KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), this, TQT_SLOT( load() ) ); // Set up the config object - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); /* Load the saved away messages */ config->setGroup("Away Messages"); @@ -255,7 +255,7 @@ void Kopete::Away::setGlobalAway(bool status) void Kopete::Away::save() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); /* Set the away message settings in the Away Messages config group */ config->setGroup("Away Messages"); config->writeEntry("Messages", d->awayMessageList); @@ -267,7 +267,7 @@ void Kopete::Away::save() void Kopete::Away::load() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("AutoAway"); d->awayTimeout=config->readNumEntry("Timeout", 600); d->goAvailable=config->readBoolEntry("GoAvailable", true); diff --git a/kopete/libkopete/kopeteaway.h b/kopete/libkopete/kopeteaway.h index 81adb30f..8234c729 100644 --- a/kopete/libkopete/kopeteaway.h +++ b/kopete/libkopete/kopeteaway.h @@ -150,7 +150,7 @@ private: * @brief Saves the away messages to disk * * This function will save the current list of away messages to the disk - * using KConfig. It is called automatically. + * using TDEConfig. It is called automatically. */ void save(); diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp index 88fbd0ce..e31a5d1a 100644 --- a/kopete/libkopete/kopeteblacklister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -37,7 +37,7 @@ public: BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *parent, const char *name) : TQObject(parent, name), d( new Private ) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); d->owner = accountId; d->protocol = protocolId; @@ -87,7 +87,7 @@ void BlackLister::removeContact(Contact *contact) void BlackLister::saveToDisk() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("BlackLister"); config->writeEntry( d->protocol + TQString::fromLatin1("_") + d->owner, d->blacklist ); diff --git a/kopete/libkopete/kopeteconfig.kcfgc b/kopete/libkopete/kopeteconfig.kcfgc index 86dbae8e..94897924 100644 --- a/kopete/libkopete/kopeteconfig.kcfgc +++ b/kopete/libkopete/kopeteconfig.kcfgc @@ -1,7 +1,7 @@ ClassName=Config File=kopete.kcfg GlobalEnums=false -Inherits=KConfigSkeleton +Inherits=TDEConfigSkeleton ItemAccessors=true MemberVariables=private Mutators=true diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp index 5f336a6b..b05b2f4e 100644 --- a/kopete/libkopete/kopetemimetypehandler.cpp +++ b/kopete/libkopete/kopetemimetypehandler.cpp @@ -145,7 +145,7 @@ bool MimeTypeHandler::dispatchToHandler( const KURL &url, const TQString &mimeTy if( !handler->canAcceptRemoteFiles() ) { TQString file; - if( !KIO::NetAccess::download( url, file, Kopete::UI::Global::mainWidget() ) ) + if( !TDEIO::NetAccess::download( url, file, Kopete::UI::Global::mainWidget() ) ) { TQString sorryText; if ( url.isLocalFile() ) @@ -172,7 +172,7 @@ bool MimeTypeHandler::dispatchToHandler( const KURL &url, const TQString &mimeTy handler->handleURL( dest ); // for now, local-only handlers have to be synchronous - KIO::NetAccess::removeTempFile( file ); + TDEIO::NetAccess::removeTempFile( file ); } else { diff --git a/kopete/libkopete/kopetemimetypehandler.h b/kopete/libkopete/kopetemimetypehandler.h index af6f20cd..c113ecd4 100644 --- a/kopete/libkopete/kopetemimetypehandler.h +++ b/kopete/libkopete/kopetemimetypehandler.h @@ -60,7 +60,7 @@ public: /** * Returns true if this handler can accept remote files direcltly; - * If false, remote files are downloaded via KIO::NetAccess before + * If false, remote files are downloaded via TDEIO::NetAccess before * being passed to handleURL */ bool canAcceptRemoteFiles() const; diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp index 5fb1b847..57ff7da3 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -57,12 +57,12 @@ public: } /** Reference count */ int refCount; - /** Group to use for KConfig and KWallet */ + /** Group to use for TDEConfig and KWallet */ const TQString configGroup; /** Is the password being remembered? */ bool remembered; - /** The current password in the KConfig file, or TQString() if no password there */ - TQString passwordFromKConfig; + /** The current password in the TDEConfig file, or TQString() if no password there */ + TQString passwordFromTDEConfig; /** The maximum length allowed for this password, or -1 if there is no limit */ uint maximumLength; /** Is the current password known to be wrong? */ @@ -133,9 +133,9 @@ public: // Before trying to read from the wallet, check if the config file holds a password. // If so, remove it from the config and set it through KWallet instead. TQString pwd; - if ( mPassword.d->remembered && !mPassword.d->passwordFromKConfig.isNull() ) + if ( mPassword.d->remembered && !mPassword.d->passwordFromTDEConfig.isNull() ) { - pwd = mPassword.d->passwordFromKConfig; + pwd = mPassword.d->passwordFromTDEConfig; mPassword.set( pwd ); return pwd; } @@ -143,8 +143,8 @@ public: if ( mWallet && mWallet->readPassword( mPassword.d->configGroup, pwd ) == 0 && !pwd.isNull() ) return pwd; - if ( mPassword.d->remembered && !mPassword.d->passwordFromKConfig.isNull() ) - return mPassword.d->passwordFromKConfig; + if ( mPassword.d->remembered && !mPassword.d->passwordFromTDEConfig.isNull() ) + return mPassword.d->passwordFromTDEConfig; return TQString(); } @@ -276,7 +276,7 @@ public: if ( mWallet && mWallet->writePassword( mPassword.d->configGroup, mNewPass ) == 0 ) { mPassword.d->remembered = true; - mPassword.d->passwordFromKConfig = TQString(); + mPassword.d->passwordFromTDEConfig = TQString(); mPassword.writeConfig(); return true; } @@ -294,13 +294,13 @@ public: "do you want to save the password in the <b>unsafe</b> configuration file instead?</qt>" ), i18n( "Unable to Store Secure Password" ), KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ) ), - TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) != KMessageBox::Continue ) + TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) != KMessageBox::Continue ) { return false; } } mPassword.d->remembered = true; - mPassword.d->passwordFromKConfig = mNewPass; + mPassword.d->passwordFromTDEConfig = mNewPass; mPassword.writeConfig(); return true; } @@ -339,7 +339,7 @@ public: kdDebug( 14010 ) << k_funcinfo << " clearing password" << endl; mPassword.d->remembered = false; - mPassword.d->passwordFromKConfig = TQString(); + mPassword.d->passwordFromTDEConfig = TQString(); mPassword.writeConfig(); if ( mWallet ) mWallet->removeEntry( mPassword.d->configGroup ); @@ -380,14 +380,14 @@ Kopete::Password &Kopete::Password::operator=( Password &other ) void Kopete::Password::readConfig() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( d->configGroup ); TQString passwordCrypted = config->readEntry( "Password" ); if ( passwordCrypted.isNull() ) - d->passwordFromKConfig = TQString(); + d->passwordFromTDEConfig = TQString(); else - d->passwordFromKConfig = KStringHandler::obscure( passwordCrypted ); + d->passwordFromTDEConfig = KStringHandler::obscure( passwordCrypted ); d->remembered = config->readBoolEntry( "RememberPassword", false ); d->isWrong = config->readBoolEntry( "PasswordIsWrong", false ); @@ -395,7 +395,7 @@ void Kopete::Password::readConfig() void Kopete::Password::writeConfig() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); if(!config->hasGroup(d->configGroup)) { //### (KOPETE) @@ -409,8 +409,8 @@ void Kopete::Password::writeConfig() config->setGroup( d->configGroup ); - if ( d->remembered && !d->passwordFromKConfig.isNull() ) - config->writeEntry( "Password", KStringHandler::obscure( d->passwordFromKConfig ) ); + if ( d->remembered && !d->passwordFromTDEConfig.isNull() ) + config->writeEntry( "Password", KStringHandler::obscure( d->passwordFromTDEConfig ) ); else config->deleteEntry( "Password" ); diff --git a/kopete/libkopete/kopetepassword.h b/kopete/libkopete/kopetepassword.h index 19c1643c..bd6826b9 100644 --- a/kopete/libkopete/kopetepassword.h +++ b/kopete/libkopete/kopetepassword.h @@ -41,7 +41,7 @@ namespace Kopete * password for a plugin or account object. * * If the KWallet is active, passwords will be stored in it, otherwise, they - * will be stored in the KConfig, in a slightly mangled form. + * will be stored in the TDEConfig, in a slightly mangled form. */ class KOPETE_EXPORT Password : public TQObject { diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 4322dc34..204e26f0 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -258,7 +258,7 @@ void PluginManager::loadAllPlugins() { // FIXME: We need session management here - Martijn - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); if ( config->hasGroup( TQString::fromLatin1( "Plugins" ) ) ) { TQMap<TQString, bool> pluginsMap; @@ -502,7 +502,7 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /* { TQString pluginId = _pluginId; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "Plugins" ); // FIXME: What is this for? This sort of thing is kconf_update's job - Richard diff --git a/kopete/libkopete/kopeteprefs.h b/kopete/libkopete/kopeteprefs.h index 230da46a..83988b73 100644 --- a/kopete/libkopete/kopeteprefs.h +++ b/kopete/libkopete/kopeteprefs.h @@ -24,7 +24,7 @@ #include "kopete_export.h" -class KConfig; +class TDEConfig; class KOPETE_EXPORT KopetePrefs : public TQObject { @@ -43,14 +43,14 @@ public: static KopetePrefs *prefs(); /** - * Reads all pref-variables from KConfig + * Reads all pref-variables from TDEConfig * usually you don't need this as KopetePrefs loads settings * when an instance is created */ void load(); /** - * Stores all pref-variables into KConfig + * Stores all pref-variables into TDEConfig */ void save(); @@ -237,7 +237,7 @@ private: */ static KopetePrefs *s_prefs; - KConfig *config; + TDEConfig *config; TQString mIconTheme; bool mUseEmoticons; diff --git a/kopete/libkopete/kopetetask.h b/kopete/libkopete/kopetetask.h index 648ed4fc..a299679c 100644 --- a/kopete/libkopete/kopetetask.h +++ b/kopete/libkopete/kopetetask.h @@ -42,7 +42,7 @@ namespace Kopete * \endcode * * Much of the ideas (and some of the documentation and function names) for this - * class come from KIO::Job. + * class come from TDEIO::Job. * @author Richard Smith <kde@metafoo.co.uk> */ class Task : public TQObject diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp index 3f7a9358..27952b9a 100644 --- a/kopete/libkopete/kopetetransfermanager.cpp +++ b/kopete/libkopete/kopetetransfermanager.cpp @@ -51,14 +51,14 @@ Kopete::FileTransferInfo::FileTransferInfo( Kopete::Contact *contact, const TQS Kopete::Transfer::Transfer( const Kopete::FileTransferInfo &kfti, const TQString &localFile, bool showProgressInfo) - : KIO::Job(showProgressInfo), mInfo(kfti) + : TDEIO::Job(showProgressInfo), mInfo(kfti) { KURL targ; targ.setPath( localFile ); init( targ, showProgressInfo ); } Kopete::Transfer::Transfer( const Kopete::FileTransferInfo &kfti, const Kopete::Contact *contact, bool showProgressInfo) - : KIO::Job(showProgressInfo), mInfo(kfti) + : TDEIO::Job(showProgressInfo), mInfo(kfti) { // TODO: use mInfo.url().fileName() after move to protocol-aware filetransfers KURL targ; targ.setPath( mInfo.file() ); @@ -72,7 +72,7 @@ void Kopete::Transfer::init( const KURL &target, bool showProgressInfo ) if( showProgressInfo ) Observer::self()->slotCopying( this, sourceURL(), destinationURL() ); - connect( this, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( slotResultEmitted() ) ); + connect( this, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( slotResultEmitted() ) ); setAutoErrorHandlingEnabled( true, 0 ); } @@ -139,7 +139,7 @@ void Kopete::Transfer::slotError( int error, const TQString &errorText ) void Kopete::Transfer::slotResultEmitted() { - if( error() == KIO::ERR_USER_CANCELED ) + if( error() == TDEIO::ERR_USER_CANCELED ) emit transferCanceled(); } @@ -169,7 +169,7 @@ Kopete::Transfer* Kopete::TransferManager::addTransfer( Kopete::Contact *contac nextID++; Kopete::FileTransferInfo info(contact, file, size, recipient,di, nextID); Kopete::Transfer *trans = new Kopete::Transfer(info, contact); - connect(trans, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotComplete(KIO::Job *))); + connect(trans, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotComplete(TDEIO::Job *))); mTransfersMap.insert(nextID, trans); return trans; } @@ -177,7 +177,7 @@ Kopete::Transfer* Kopete::TransferManager::addTransfer( Kopete::Contact *contac void Kopete::TransferManager::slotAccepted(const Kopete::FileTransferInfo& info, const TQString& filename) { Kopete::Transfer *trans = new Kopete::Transfer(info, filename); - connect(trans, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotComplete(KIO::Job *))); + connect(trans, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotComplete(TDEIO::Job *))); mTransfersMap.insert(info.transferId(), trans); emit accepted(trans,filename); } @@ -206,7 +206,7 @@ void Kopete::TransferManager::removeTransfer( unsigned int id ) //we don't need to delete the job, the job get deleted itself } -void Kopete::TransferManager::slotComplete(KIO::Job *job) +void Kopete::TransferManager::slotComplete(TDEIO::Job *job) { Kopete::Transfer *transfer=dynamic_cast<Kopete::Transfer*>(job); if(!transfer) diff --git a/kopete/libkopete/kopetetransfermanager.h b/kopete/libkopete/kopetetransfermanager.h index 60ce2eac..bd18c3f3 100644 --- a/kopete/libkopete/kopetetransfermanager.h +++ b/kopete/libkopete/kopetetransfermanager.h @@ -118,7 +118,7 @@ signals: private slots: void slotAccepted(const Kopete::FileTransferInfo&, const TQString&); - void slotComplete(KIO::Job*); + void slotComplete(TDEIO::Job*); private: TransferManager( TQObject *parent ); @@ -132,7 +132,7 @@ private: * A KIO job for a kopete file transfer. * @author Richard Smith <kopete@metafoo.co.uk> */ -class KOPETE_EXPORT Transfer : public KIO::Job +class KOPETE_EXPORT Transfer : public TDEIO::Job { Q_OBJECT @@ -184,7 +184,7 @@ public slots: /** * @brief Inform the job that an error has occurred while transferring the file. * - * @param error A member of the KIO::Error enumeration indicating what error occurred. + * @param error A member of the TDEIO::Error enumeration indicating what error occurred. * @param errorText A string to aid understanding of the error, often the offending URL. */ void slotError( int error, const TQString &errorText ); diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 2a5074f8..37f04e02 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -205,7 +205,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi && msg.direction() != Kopete::Message::Internal ) { TQWidget *w=dynamic_cast<TQWidget*>(manager->view(false)); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); if( (!manager->view(false) || !w || manager->view() != d->activeView || config->readBoolEntry("EventIfActive", true) || !w->isActiveWindow()) |