3 files changed, 13 insertions, 13 deletions
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index eeebb32f..a757c81f 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -61,7 +61,7 @@ static const char* journalAttachmentMimeType = "application/x-vnd.kolab.journal"
 static const char* incidenceInlineMimeType = "text/calendar";
 
 
-ResourceScalix::ResourceScalix( const KConfig *config )
+ResourceScalix::ResourceScalix( const TDEConfig *config )
   : ResourceCalendar( config ), ResourceScalixBase( "ResourceScalix-libkcal" ),
     mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
 {
@@ -79,18 +79,18 @@ ResourceScalix::~ResourceScalix()
   }
 }
 
-void ResourceScalix::loadSubResourceConfig( KConfig& config,
+void ResourceScalix::loadSubResourceConfig( TDEConfig& config,
                                            const TQString& name,
                                            const TQString& label,
                                            bool writable,
                                            ResourceMap& subResource )
 {
-  KConfigGroup group( &config, name );
+  TDEConfigGroup group( &config, name );
   bool active = group.readBoolEntry( "Active", true );
   subResource.insert( name, Scalix::SubResource( active, writable, label ) );
 }
 
-bool ResourceScalix::openResource( KConfig& config, const char* contentType,
+bool ResourceScalix::openResource( TDEConfig& config, const char* contentType,
                                   ResourceMap& map )
 {
   // Read the subresource entries from KMail
@@ -111,7 +111,7 @@ bool ResourceScalix::doOpen()
     return true;
   mOpen = true;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( "General" );
   mProgressDialogIncidenceLimit = config.readNumEntry("ProgressDialogIncidenceLimit", 200);
 
@@ -120,7 +120,7 @@ bool ResourceScalix::doOpen()
     && openResource( config, kmailJournalContentsType, mJournalSubResources );
 }
 
-static void closeResource( KConfig& config, ResourceMap& map )
+static void closeResource( TDEConfig& config, ResourceMap& map )
 {
   ResourceMap::ConstIterator it;
   for ( it = map.begin(); it != map.end(); ++it ) {
@@ -136,7 +136,7 @@ void ResourceScalix::doClose()
     return;
   mOpen = false;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   closeResource( config, mEventSubResources );
   closeResource( config, mTodoSubResources );
   closeResource( config, mJournalSubResources );
@@ -745,7 +745,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( subResource );
 
   bool active = config.readBoolEntry( subResource, true );
@@ -767,7 +767,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
     return;
 
   // Delete from the config file
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.deleteGroup( subResource );
   config.sync();
 
diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index cfcf7140..dcd78397 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -55,7 +55,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar,
     friend struct TemporarySilencer;
 
 public:
-  ResourceScalix( const KConfig* );
+  ResourceScalix( const TDEConfig* );
   virtual ~ResourceScalix();
 
   /// Load resource data.
@@ -167,9 +167,9 @@ private:
   /// Reimplemented from IncidenceBase::Observer to know when an incidence was changed
   void incidenceUpdated( KCal::IncidenceBase* );
 
-  bool openResource( KConfig& config, const char* contentType,
+  bool openResource( TDEConfig& config, const char* contentType,
                      Scalix::ResourceMap& map );
-  void loadSubResourceConfig( KConfig& config, const TQString& name,
+  void loadSubResourceConfig( TDEConfig& config, const TQString& name,
                               const TQString& label, bool writable,
                               Scalix::ResourceMap& subResource );
   bool loadSubResource( const TQString& subResource, const char* mimetype );
diff --git a/kresources/scalix/kcal/resourcescalix_plugin.cpp b/kresources/scalix/kcal/resourcescalix_plugin.cpp
index 728dc280..036c2f45 100644
--- a/kresources/scalix/kcal/resourcescalix_plugin.cpp
+++ b/kresources/scalix/kcal/resourcescalix_plugin.cpp
@@ -36,7 +36,7 @@
 class ScalixFactory : public KRES::PluginFactoryBase
 {
 public:
-  KRES::Resource *resource( const KConfig *config )
+  KRES::Resource *resource( const TDEConfig *config )
   {
     return new KCal::ResourceScalix( config );
   }