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

1 files changed, 11 insertions, 11 deletions

diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index b60e9cdc8..d532602ea 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -13,7 +13,7 @@
 #include "kmmsgbase.h" // for KMMsgStatus
 
 class KMMessage;
-class KConfig;
+class TDEConfig;
 class DwBoyerMoore;
 class DwString;
 
@@ -70,7 +70,7 @@ public:
       rules within a single config group. This function does no
       validation of the data obtained from the config file. You should
       call isEmpty yourself if you need valid rules. */
-  static KMSearchRule* createInstanceFromConfig( const KConfig * config, int aIdx );
+  static KMSearchRule* createInstanceFromConfig( const TDEConfig * config, int aIdx );
 
   virtual ~KMSearchRule() {};
 
@@ -104,7 +104,7 @@ public:
       rules within a single config group. This function will happily
       write itself even when it's not valid, assuming higher layers to
       Do The Right Thing(TM). */
-  void writeConfig( KConfig * config, int aIdx ) const;
+  void writeConfig( TDEConfig * config, int aIdx ) const;
 
   /** Return filter function. This can be any of the operators
       defined in Function. */
@@ -290,8 +290,8 @@ public:
 /** This class is an abstraction of a search over messages.  It is
     intended to be used inside a KFilter (which adds KFilterAction's),
     as well as in KMSearch. It can read and write itself into a
-    KConfig group and there is a constructor, mainly used by KMFilter
-    to initialize from a preset KConfig-Group.
+    TDEConfig group and there is a constructor, mainly used by KMFilter
+    to initialize from a preset TDEConfig-Group.
 
     From a class hierarchy point of view, it is a TQPtrList of
     KMSearchRule's that adds the boolean operators (see Operator)
@@ -315,7 +315,7 @@ public:
       any of it's rules matches.
   */
   enum Operator { OpAnd, OpOr };
-  /** Constructor that initializes from a given KConfig group, if
+  /** Constructor that initializes from a given TDEConfig group, if
       given. This feature is mainly (solely?) used in KMFilter,
       as we don't allow to store search patterns in the config (yet).
       If config is 0, provides a pattern with minimal, but
@@ -323,7 +323,7 @@ public:
       to match any KMMessage. You can query for such an empty
       rule by using isEmpty, which is inherited from TQPtrList.
   */
-  KMSearchPattern( const KConfig * config=0 );
+  KMSearchPattern( const TDEConfig * config=0 );
 
   /** Destructor. Deletes all stored rules! */
   ~KMSearchPattern();
@@ -351,7 +351,7 @@ public:
   */
   void purify();
 
-  /** Reads a search pattern from a KConfig.  The group has to be
+  /** Reads a search pattern from a TDEConfig.  The group has to be
       preset. If it does not find a valid saerch pattern in the preset
       group, initializes the pattern as if it were constructed using
       the default constructor.
@@ -363,14 +363,14 @@ public:
       Derived classes reimplementing readConfig() should also call this
       method, or else the rules will not be loaded.
   */
-  void readConfig( const KConfig * config );
+  void readConfig( const TDEConfig * config );
   /** Writes itself into @p config. The group has to be preset. Tries
       to delete old-style keys by overwriting them with TQString().
 
       Derived classes reimplementing writeConfig() should also call this
       method, or else the rules will not be stored.
   */
-  void writeConfig( KConfig * config ) const;
+  void writeConfig( TDEConfig * config ) const;
 
   /** Get the name of the search pattern. */
   TQString name() const { return mName; }
@@ -397,7 +397,7 @@ private:
       and also makes sure that this method is called from an initialized
       object.
   */
-  void importLegacyConfig( const KConfig * config );
+  void importLegacyConfig( const TDEConfig * config );
   /** Initializes the object. Clears the list of rules, sets the name
       to "<i18n("unnamed")>", and the boolean operator to @p OpAnd. */
   void init();