summaryrefslogtreecommitdiffstats
path: root/kabc/plugins/evolution
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /kabc/plugins/evolution
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kabc/plugins/evolution')
-rw-r--r--kabc/plugins/evolution/resourceevo.cpp4
-rw-r--r--kabc/plugins/evolution/resourceevo.h2
2 files changed, 3 insertions, 3 deletions
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();