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 --- kmail/accountmanager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kmail/accountmanager.cpp') diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index 0610622f7..a2bb384ff 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -49,10 +49,10 @@ AccountManager::~AccountManager() //----------------------------------------------------------------------------- void AccountManager::writeConfig( bool withSync ) { - KConfig* config = KMKernel::config(); + TDEConfig* config = KMKernel::config(); TQString groupName; - KConfigGroupSaver saver(config, "General"); + TDEConfigGroupSaver saver(config, "General"); config->writeEntry("accounts", mAcctList.count()); // first delete all account groups in the config file: @@ -66,7 +66,7 @@ void AccountManager::writeConfig( bool withSync ) int i = 1; for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it, ++i ) { groupName.sprintf("Account %d", i); - KConfigGroupSaver saver(config, groupName); + TDEConfigGroupSaver saver(config, groupName); (*it)->writeConfig(*config); } if (withSync) config->sync(); @@ -76,7 +76,7 @@ void AccountManager::writeConfig( bool withSync ) //----------------------------------------------------------------------------- void AccountManager::readConfig(void) { - KConfig* config = KMKernel::config(); + TDEConfig* config = KMKernel::config(); KMAccount* acct; TQString acctType, acctName; TQCString groupName; @@ -87,13 +87,13 @@ void AccountManager::readConfig(void) delete *it; mAcctList.clear(); - KConfigGroup general(config, "General"); + TDEConfigGroup general(config, "General"); num = general.readNumEntry("accounts", 0); for (i=1; i<=num; i++) { groupName.sprintf("Account %d", i); - KConfigGroupSaver saver(config, groupName); + TDEConfigGroupSaver saver(config, groupName); acctType = config->readEntry("Type"); // Provide backwards compatibility if (acctType == "advanced pop" || acctType == "experimental pop") -- cgit v1.2.1