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/plugins/evolution/resourceevo.cpp | 4 ++--
 kabc/plugins/evolution/resourceevo.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kabc/plugins/evolution')

diff --git a/kabc/plugins/evolution/resourceevo.cpp b/kabc/plugins/evolution/resourceevo.cpp
index 9a44b2adb..415e9928a 100644
--- a/kabc/plugins/evolution/resourceevo.cpp
+++ b/kabc/plugins/evolution/resourceevo.cpp
@@ -17,7 +17,7 @@ using namespace KABC;
 class EvolutionFactory : public KRES::PluginFactoryBase
 {
   public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
       return new ResourceEvolution( config );
     }
@@ -36,7 +36,7 @@ extern "C"
   }
 }
 
-ResourceEvolution::ResourceEvolution( const KConfig* conf )
+ResourceEvolution::ResourceEvolution( const TDEConfig* conf )
     : Resource( conf ), mWrap(0l)
 {
     m_isOpen = false;
diff --git a/kabc/plugins/evolution/resourceevo.h b/kabc/plugins/evolution/resourceevo.h
index 0f5b3a0d2..29e163e1c 100644
--- a/kabc/plugins/evolution/resourceevo.h
+++ b/kabc/plugins/evolution/resourceevo.h
@@ -7,7 +7,7 @@ namespace Evolution {
 namespace KABC {
     class ResourceEvolution : public Resource {
     public:
-        ResourceEvolution( const KConfig* config );
+        ResourceEvolution( const TDEConfig* config );
         ~ResourceEvolution();
 
         bool doOpen();
-- 
cgit v1.2.1