summaryrefslogtreecommitdiffstats
path: root/kmail/networkaccount.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:37:21 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kmail/networkaccount.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/networkaccount.cpp')
-rw-r--r--kmail/networkaccount.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 145ab2b2d..e0b682746 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -38,7 +38,7 @@
#include <kmessagebox.h>
#include <kdebug.h>
#include <kwallet.h>
-using KIO::MetaData;
+using TDEIO::MetaData;
using KWallet::Wallet;
#include <climits>
@@ -147,7 +147,7 @@ namespace KMail {
//
//
- void NetworkAccount::readConfig( /*const*/ KConfig/*Base*/ & config ) {
+ void NetworkAccount::readConfig( /*const*/ TDEConfig/*Base*/ & config ) {
KMAccount::readConfig( config );
setLogin( config.readEntry( "login" ) );
@@ -195,7 +195,7 @@ namespace KMail {
mSieveConfig.readConfig( config );
}
- void NetworkAccount::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
+ void NetworkAccount::writeConfig( TDEConfig/*Base*/ & config ) /*const*/ {
KMAccount::writeConfig( config );
config.writeEntry( "login", login() );