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/scalix/kabc/resourcescalix.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/scalix/kabc/resourcescalix.h')
| -rw-r--r-- | kresources/scalix/kabc/resourcescalix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h index 82c238196..dbb0b93c6 100644 --- a/kresources/scalix/kabc/resourcescalix.h +++ b/kresources/scalix/kabc/resourcescalix.h @@ -60,7 +60,7 @@ public: /** * Constructor */ - ResourceScalix( const KConfig* ); + ResourceScalix( const TDEConfig* ); /** * Destructor. @@ -149,7 +149,7 @@ protected: void doClose(); - void loadSubResourceConfig( KConfig& config, const TQString& name, + void loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable ); bool loadSubResource( const TQString& subResource ); bool loadSubResourceHelper( const TQString& subResource, const char* mimetype, KMailICalIface::StorageFormat format ); |