summaryrefslogtreecommitdiffstats
path: root/kmail/kmfoldermgr.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kmail/kmfoldermgr.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmfoldermgr.cpp')
-rw-r--r--kmail/kmfoldermgr.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 34958e5a7..2c3d10a5a 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -59,8 +59,8 @@ KMFolderMgr::~KMFolderMgr()
//-----------------------------------------------------------------------------
void KMFolderMgr::expireAll() {
- KConfig *config = KMKernel::config();
- KConfigGroupSaver saver(config, "General");
+ TDEConfig *config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "General");
int ret = KMessageBox::Continue;
if (config->readBoolEntry("warn-before-expire", true)) {
@@ -314,8 +314,8 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr,
if (know_type == false)
{
know_type = true;
- KConfig *config = KMKernel::config();
- KConfigGroupSaver saver(config, "General");
+ TDEConfig *config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "General");
if (config->hasKey("default-mailbox-format"))
{
if (config->readNumEntry("default-mailbox-format", 1) == 0)