From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:37:21 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kmail/networkaccount.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kmail/networkaccount.cpp')

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() );
-- 
cgit v1.2.1