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

---
 kabc/kab2kabc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kabc/kab2kabc.cpp')

diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index 2447229da..11b80639a 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -123,7 +123,7 @@ void importKMailAddressBook( KABC::AddressBook *ab )
   TQString fileName = locateLocal( "data", "kmail/addressbook" );
   TQString kmailConfigName = locate( "config", "kmailrc" );
   if ( !kmailConfigName.isEmpty() ) {
-    KConfig cfg( kmailConfigName );
+    TDEConfig cfg( kmailConfigName );
     cfg.setGroup( "Addressbook" );
     fileName = cfg.readPathEntry( "default", fileName );
   }
@@ -458,7 +458,7 @@ int main( int argc, char **argv )
   if ( args->isSet( "disable-autostart" ) ) {
     kdDebug() << "Disable autostart." << endl;
 
-    KConfig *config = app.config();
+    TDEConfig *config = app.config();
     config->setGroup( "Startup" );
     config->writeEntry( "EnableAutostart", false );
   }
-- 
cgit v1.2.3