summaryrefslogtreecommitdiffstats
path: root/kabc/resource.cpp
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/resource.cpp
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/resource.cpp')
-rw-r--r--kabc/resource.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kabc/resource.cpp b/kabc/resource.cpp
index d43c68320..57c8588e8 100644
--- a/kabc/resource.cpp
+++ b/kabc/resource.cpp
@@ -197,7 +197,7 @@ bool Resource::ConstIterator::operator!=( const ConstIterator &it )
}
-Resource::Resource( const KConfig *config )
+Resource::Resource( const TDEConfig *config )
: KRES::Resource( config ), mAddressBook( 0 )
{
}
@@ -236,7 +236,7 @@ Resource::ConstIterator Resource::end() const
return it;
}
-void Resource::writeConfig( KConfig *config )
+void Resource::writeConfig( TDEConfig *config )
{
KRES::Resource::writeConfig( config );
}