summaryrefslogtreecommitdiffstats
path: root/libkcal/resourcecalendar.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /libkcal/resourcecalendar.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libkcal/resourcecalendar.cpp')
-rw-r--r--libkcal/resourcecalendar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp
index 9f611e75e..36a0932b0 100644
--- a/libkcal/resourcecalendar.cpp
+++ b/libkcal/resourcecalendar.cpp
@@ -32,7 +32,7 @@
using namespace KCal;
-ResourceCalendar::ResourceCalendar( const KConfig *config )
+ResourceCalendar::ResourceCalendar( const TDEConfig *config )
: KRES::Resource( config ), mResolveConflict( false )
{
mException = 0;
@@ -81,7 +81,7 @@ TQString ResourceCalendar::infoText() const
return txt;
}
-void ResourceCalendar::writeConfig( KConfig* config )
+void ResourceCalendar::writeConfig( TDEConfig* config )
{
// kdDebug(5800) << "ResourceCalendar::writeConfig()" << endl;