From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kresources/lib/kcal_resourcegroupwarebase.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kresources/lib/kcal_resourcegroupwarebase.h') diff --git a/kresources/lib/kcal_resourcegroupwarebase.h b/kresources/lib/kcal_resourcegroupwarebase.h index 5691c19d6..f6b46dbf7 100644 --- a/kresources/lib/kcal_resourcegroupwarebase.h +++ b/kresources/lib/kcal_resourcegroupwarebase.h @@ -28,7 +28,7 @@ #include #include -namespace KIO { +namespace TDEIO { class Job; } @@ -56,11 +56,11 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached public: ResourceGroupwareBase(); - ResourceGroupwareBase( const KConfig * ); + ResourceGroupwareBase( const TDEConfig * ); virtual ~ResourceGroupwareBase(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); KPIM::GroupwarePrefsBase *prefs(); KPIM::FolderLister *folderLister() { return mFolderLister; } @@ -92,8 +92,8 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached virtual KPIM::GroupwareUploadJob *createUploadJob( CalendarAdaptor *adaptor ); protected slots: - void slotLoginJobResult( KIO::Job *job ); - void slotLogoffJobResult( KIO::Job *job ); + void slotLoginJobResult( TDEIO::Job *job ); + void slotLogoffJobResult( TDEIO::Job *job ); void slotDownloadJobResult( KPIM::GroupwareJob * ); void slotUploadJobResult( KPIM::GroupwareJob * ); -- cgit v1.2.1