diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
| commit | 86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch) | |
| tree | 97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kresources/kolab/kcal/resourcekolab.h | |
| parent | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff) | |
| download | tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kresources/kolab/kcal/resourcekolab.h')
| -rw-r--r-- | kresources/kolab/kcal/resourcekolab.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h index e639d2606..fdf952cc3 100644 --- a/kresources/kolab/kcal/resourcekolab.h +++ b/kresources/kolab/kcal/resourcekolab.h @@ -56,7 +56,7 @@ class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar, friend struct TemporarySilencer; public: - ResourceKolab( const KConfig* ); + ResourceKolab( const TDEConfig* ); virtual ~ResourceKolab(); /// Load resource data. @@ -195,9 +195,9 @@ private: void incidenceUpdated( KCal::IncidenceBase* ); void incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase); - bool openResource( KConfig& config, const char* contentType, + bool openResource( TDEConfig& config, const char* contentType, Kolab::ResourceMap& map ); - void loadSubResourceConfig( KConfig& config, const TQString& name, + void loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable, bool alarmRelevant, Kolab::ResourceMap& subResource ); bool loadSubResource( const TQString& subResource, const char* mimetype ); |