Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

10 files changed, 35 insertions, 35 deletions

diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index a17c340b8..ff8f869b7 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -1276,9 +1276,9 @@ TQImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
   TQImage img;
   if ( !picture.isIntern() && !picture.url().isEmpty() ) {
     TQString tmpFile;
-    if ( KIO::NetAccess::download( picture.url(), tmpFile, 0 /*no widget known*/ ) ) {
+    if ( TDEIO::NetAccess::download( picture.url(), tmpFile, 0 /*no widget known*/ ) ) {
       img.load( tmpFile );
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     }
   } else
     img = picture.data();
@@ -1305,13 +1305,13 @@ TQByteArray Kolab::Contact::loadSoundFromAddressee( const KABC::Sound& sound )
   TQByteArray data;
   if ( !sound.isIntern() && !sound.url().isEmpty() ) {
     TQString tmpFile;
-    if ( KIO::NetAccess::download( sound.url(), tmpFile, 0 /*no widget known*/ ) ) {
+    if ( TDEIO::NetAccess::download( sound.url(), tmpFile, 0 /*no widget known*/ ) ) {
       TQFile f( tmpFile );
       if ( f.open( IO_ReadOnly ) ) {
         data = f.readAll();
         f.close();
       }
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     }
   } else
     data = sound.data();
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index 438696412..ce7c18c42 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -58,7 +58,7 @@ using namespace Kolab;
 class KolabFactory : public KRES::PluginFactoryBase
 {
   public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
       return new KABC::ResourceKolab( config );
     }
@@ -76,7 +76,7 @@ static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contac
 static const char* s_attachmentMimeTypeDistList = "application/x-vnd.kolab.contact.distlist";
 static const char* s_inlineMimeType = "text/x-vcard";
 
-KABC::ResourceKolab::ResourceKolab( const KConfig *config )
+KABC::ResourceKolab::ResourceKolab( const TDEConfig *config )
   : KPIM::ResourceABC( config ),
     Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
     mCachedSubresource( TQString() ), mCachedSubresourceNotFound( false ), mLocked( false )
@@ -96,12 +96,12 @@ KABC::ResourceKolab::~ResourceKolab()
   }
 }
 
-void KABC::ResourceKolab::loadSubResourceConfig( KConfig& config,
+void KABC::ResourceKolab::loadSubResourceConfig( TDEConfig& config,
                                                  const TQString& name,
                                                  const TQString& label,
                                                  bool writable )
 {
-  KConfigGroup group( &config, name );
+  TDEConfigGroup group( &config, name );
   bool active = group.readBoolEntry( "Active", true );
   int completionWeight = group.readNumEntry( "CompletionWeight", 80 );
   mSubResources.insert( name, Kolab::SubResource( active, writable, label,
@@ -110,7 +110,7 @@ void KABC::ResourceKolab::loadSubResourceConfig( KConfig& config,
 
 bool KABC::ResourceKolab::doOpen()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
 
   // Read the calendar entries
   TQValueList<KMailICalIface::SubResource> subResources;
@@ -527,7 +527,7 @@ void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( "Contact" );
   loadSubResourceConfig( config, subResource, label, writable );
   loadSubResource( subResource );
@@ -547,7 +547,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
   // Ok, it's our job, and we have it here
   mSubResources.erase( subResource );
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.deleteGroup( subResource );
   config.sync();
 
@@ -681,7 +681,7 @@ bool KABC::ResourceKolab::removeSubresource( const TQString& id )
 
 void KABC::ResourceKolab::writeConfig()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
 
   Kolab::ResourceMap::ConstIterator it;
   for ( it = mSubResources.constBegin(); it != mSubResources.constEnd(); ++it ) {
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index d27a97c92..3a142b209 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -59,7 +59,7 @@ public:
   /**
    * Constructor
    */
-  ResourceKolab( const KConfig* );
+  ResourceKolab( const TDEConfig* );
 
   /**
    * Destructor.
@@ -155,7 +155,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 );
   TQString loadContact( const TQString& contactData, const TQString& subResource,
diff --git a/kresources/kolab/kabc/resourcekolab_plugin.cpp b/kresources/kolab/kabc/resourcekolab_plugin.cpp
index db69b8969..55ac64205 100644
--- a/kresources/kolab/kabc/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kabc/resourcekolab_plugin.cpp
@@ -37,7 +37,7 @@ using namespace Kolab;
 class KolabFactory : public KRES::PluginFactoryBase
 {
   public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
       return new KABC::ResourceKolab( config );
     }
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index edd94303c..44c13fd2b 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -68,7 +68,7 @@ static const char* journalAttachmentMimeType = "application/x-vnd.kolab.journal"
 static const char* incidenceInlineMimeType = "text/calendar";
 
 
-ResourceKolab::ResourceKolab( const KConfig *config )
+ResourceKolab::ResourceKolab( const TDEConfig *config )
   : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ),
     mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
         "mResourceChangedTimer" ), mBatchAddingInProgress( false )
@@ -90,20 +90,20 @@ ResourceKolab::~ResourceKolab()
   }
 }
 
-void ResourceKolab::loadSubResourceConfig( KConfig& config,
+void ResourceKolab::loadSubResourceConfig( TDEConfig& config,
                                            const TQString& name,
                                            const TQString& label,
                                            bool writable,
                                            bool alarmRelevant,
                                            ResourceMap& subResource )
 {
-  KConfigGroup group( &config, name );
+  TDEConfigGroup group( &config, name );
   bool active = group.readBoolEntry( "Active", true );
   subResource.insert( name, Kolab::SubResource( active, writable,
                                                 alarmRelevant, label ) );
 }
 
-bool ResourceKolab::openResource( KConfig& config, const char* contentType,
+bool ResourceKolab::openResource( TDEConfig& config, const char* contentType,
                                   ResourceMap& map )
 {
   // Read the subresource entries from KMail
@@ -125,7 +125,7 @@ bool ResourceKolab::doOpen()
     return true;
   mOpen = true;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( "General" );
   mProgressDialogIncidenceLimit = config.readNumEntry("ProgressDialogIncidenceLimit", 200);
 
@@ -134,7 +134,7 @@ bool ResourceKolab::doOpen()
     && openResource( config, kmailJournalContentsType, mJournalSubResources );
 }
 
-static void writeResourceConfig( KConfig& config, ResourceMap& map )
+static void writeResourceConfig( TDEConfig& config, ResourceMap& map )
 {
   ResourceMap::ConstIterator it;
   for ( it = map.begin(); it != map.end(); ++it ) {
@@ -1077,7 +1077,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( subResource );
 
   bool active = config.readBoolEntry( subResource, true );
@@ -1100,7 +1100,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
     return;
 
   // Delete from the config file
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.deleteGroup( subResource );
   config.sync();
 
@@ -1322,7 +1322,7 @@ TQString ResourceKolab::subresourceType( const TQString &resource )
 
 void ResourceKolab::writeConfig()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   writeResourceConfig( config, mEventSubResources );
   writeResourceConfig( config, mTodoSubResources );
   writeResourceConfig( config, mJournalSubResources );
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 );
diff --git a/kresources/kolab/kcal/resourcekolab_plugin.cpp b/kresources/kolab/kcal/resourcekolab_plugin.cpp
index 151fa9f3d..eb56897ae 100644
--- a/kresources/kolab/kcal/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kcal/resourcekolab_plugin.cpp
@@ -35,7 +35,7 @@
 class KolabFactory : public KRES::PluginFactoryBase
 {
 public:
-  KRES::Resource *resource( const KConfig *config )
+  KRES::Resource *resource( const TDEConfig *config )
   {
     return new KCal::ResourceKolab( config );
   }
diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp
index b92a723a5..a28a51b27 100644
--- a/kresources/kolab/knotes/resourcekolab.cpp
+++ b/kresources/kolab/knotes/resourcekolab.cpp
@@ -50,7 +50,7 @@ static const char* kmailContentsType = "Note";
 static const char* attachmentMimeType = "application/x-vnd.kolab.note";
 static const char* inlineMimeType = "text/calendar";
 
-ResourceKolab::ResourceKolab( const KConfig *config )
+ResourceKolab::ResourceKolab( const TDEConfig *config )
   : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ),
     mCalendar( TQString::fromLatin1("UTC") )
 {
@@ -66,7 +66,7 @@ ResourceKolab::~ResourceKolab()
 
 bool ResourceKolab::doOpen()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
 
   // Get the list of Notes folders from KMail
@@ -88,7 +88,7 @@ bool ResourceKolab::doOpen()
 
 void ResourceKolab::doClose()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
   Kolab::ResourceMap::ConstIterator it;
   for ( it = mSubResources.constBegin(); it != mSubResources.constEnd(); ++it )
@@ -356,7 +356,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
 
   bool active = config.readBoolEntry( subResource, true );
@@ -379,7 +379,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
   // Ok, it's our job, and we have it here
   mSubResources.erase( subResource );
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
   config.deleteEntry( subResource );
   config.sync();
diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h
index f596d8f70..fb0d191b9 100644
--- a/kresources/kolab/knotes/resourcekolab.h
+++ b/kresources/kolab/knotes/resourcekolab.h
@@ -57,7 +57,7 @@ class KDE_EXPORT ResourceKolab : public ResourceNotes,
   
 
 public:
-  ResourceKolab( const KConfig* );
+  ResourceKolab( const TDEConfig* );
   virtual ~ResourceKolab();
 
   /// Load resource data.
diff --git a/kresources/kolab/knotes/resourcekolab_plugin.cpp b/kresources/kolab/knotes/resourcekolab_plugin.cpp
index fa187d2b9..f589986cb 100644
--- a/kresources/kolab/knotes/resourcekolab_plugin.cpp
+++ b/kresources/kolab/knotes/resourcekolab_plugin.cpp
@@ -35,7 +35,7 @@
 class KolabFactory : public KRES::PluginFactoryBase
 {
 public:
-  KRES::Resource *resource( const KConfig *config )
+  KRES::Resource *resource( const TDEConfig *config )
   {
     return new Kolab::ResourceKolab( config );
   }