Rename KShared

25 files changed, 92 insertions, 92 deletions

diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 8621f7897..4cdeadefe 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -33,7 +33,7 @@
 264        tdecore (KIconLoader)
 265        tdecore (KIconEffect)
 270        tdeui (KRootPixmap)
-280        tdeui (KSharedPixmap)
+280        tdeui (TDESharedPixmap)
 281        tdeui (TDECModule)
 282        tdeui (KDockWidget)
 290        tdeui (KPixmapIO)
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index d26bbb678..a2a83e436 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -67,7 +67,7 @@ TDEConfig	*TDEGlobal::config()
     return _instance->config();
 }
 
-KSharedConfig *TDEGlobal::sharedConfig()
+TDESharedConfig *TDEGlobal::sharedConfig()
 {
     MYASSERT(_instance);
 
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index 22877c8ce..075f068b7 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -23,7 +23,7 @@
 
 class KCharsets;
 class TDEConfig;
-class KSharedConfig;
+class TDESharedConfig;
 class KIconLoader;
 class TDEHardwareDevices;
 class TDEGlobalNetworkManager;
@@ -71,7 +71,7 @@ public:
      *  Returns the general config object.
      * @return the global configuration object.
      */
-    static KSharedConfig        *sharedConfig();
+    static TDESharedConfig        *sharedConfig();
 
     /**
      *  Returns an iconloader object.
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index abced574e..d985cc8b0 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -43,7 +43,7 @@ public:
     TQString example, screenshot;
     TQString linkOverlay, lockOverlay, zipOverlay, shareOverlay;
     bool hidden;
-    KSharedConfig::Ptr sharedConfig;
+    TDESharedConfig::Ptr sharedConfig;
 };
 
 /**
@@ -136,9 +136,9 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
 	fileName = mDir + "index.theme";
 	mainSection="Icon Theme";
     }
-    // Use KSharedConfig to avoid parsing the file many times, from each kinstance.
+    // Use TDESharedConfig to avoid parsing the file many times, from each kinstance.
     // Need to keep a ref to it to make this useful
-    d->sharedConfig = KSharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ );
+    d->sharedConfig = TDESharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ );
     TDEConfig& cfg = *d->sharedConfig;
     //was: KSimpleConfig cfg(fileName);
 
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index cef932fa1..953b8ffa1 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -65,7 +65,7 @@ public:
     KMimeSourceFactory* mimeSourceFactory;
     TQString configName;
     bool ownAboutdata;
-    KSharedConfig::Ptr sharedConfig;
+    TDESharedConfig::Ptr sharedConfig;
 };
 
 TDEInstance::TDEInstance( const TQCString& name)
@@ -201,7 +201,7 @@ TDEConfig	*TDEInstance::config() const
     if( _config == 0 ) {
         if ( !d->configName.isEmpty() )
         {
-            d->sharedConfig = KSharedConfig::openConfig( d->configName );
+            d->sharedConfig = TDESharedConfig::openConfig( d->configName );
 
             // Check whether custom config files are allowed.
             d->sharedConfig->setGroup( "KDE Action Restrictions" );
@@ -220,10 +220,10 @@ TDEConfig	*TDEInstance::config() const
         if ( d->sharedConfig == 0 )
         {
 	    if ( !_name.isEmpty() ) {
-	        d->sharedConfig = KSharedConfig::openConfig( _name + "rc", m_configReadOnly );
+	        d->sharedConfig = TDESharedConfig::openConfig( _name + "rc", m_configReadOnly );
 	    }
 	    else {
-	        d->sharedConfig = KSharedConfig::openConfig( TQString::null );
+	        d->sharedConfig = TDESharedConfig::openConfig( TQString::null );
 	    }
 	}
 
@@ -244,7 +244,7 @@ TDEConfig	*TDEInstance::config() const
     return _config;
 }
 
-KSharedConfig *TDEInstance::sharedConfig() const
+TDESharedConfig *TDEInstance::sharedConfig() const
 {
     DEBUG_CHECK_ALIVE
     if (_config == 0)
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index 8178fe9c5..24ec92d3f 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -26,7 +26,7 @@ class KCharsets;
 class TQFont;
 class TDEInstancePrivate;
 class KMimeSourceFactory;
-class KSharedConfig;
+class TDESharedConfig;
 class TDEHardwareDevices;
 class TDEGlobalNetworkManager;
 
@@ -94,7 +94,7 @@ class TDECORE_EXPORT TDEInstance
      * Returns the general config object ("appnamerc").
      * @return the TDEConfig object for the instance.
      */
-    KSharedConfig      *sharedConfig() const;
+    TDESharedConfig      *sharedConfig() const;
 
     /**
      * Set a read-only flag on the configuration files
diff --git a/tdecore/klockfile.h b/tdecore/klockfile.h
index 698706554..f3bf0b0bc 100644
--- a/tdecore/klockfile.h
+++ b/tdecore/klockfile.h
@@ -30,10 +30,10 @@
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.3
  */
-class TDECORE_EXPORT KLockFile : public KShared
+class TDECORE_EXPORT KLockFile : public TDEShared
 {
 public:
-   typedef KSharedPtr<KLockFile> Ptr;
+   typedef TDESharedPtr<KLockFile> Ptr;
 
    KLockFile(const TQString &file);
 
diff --git a/tdecore/kmountpoint.h b/tdecore/kmountpoint.h
index e68fb23ab..e35b042e6 100644
--- a/tdecore/kmountpoint.h
+++ b/tdecore/kmountpoint.h
@@ -32,11 +32,11 @@
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.2
  */
-class TDECORE_EXPORT KMountPoint : public KShared
+class TDECORE_EXPORT KMountPoint : public TDEShared
 {
    typedef signed long long int filesize_t;
 public:
-  typedef KSharedPtr<KMountPoint> Ptr;
+  typedef TDESharedPtr<KMountPoint> Ptr;
   typedef TQValueList<Ptr> List;
 public:
    enum { NeedMountOptions = 1, NeedRealDeviceName = 2 };
diff --git a/tdecore/ksharedptr.h b/tdecore/ksharedptr.h
index 16ece722c..60a06a55f 100644
--- a/tdecore/ksharedptr.h
+++ b/tdecore/ksharedptr.h
@@ -15,132 +15,132 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KSharedPTR_H
-#define KSharedPTR_H
+#ifndef TDESharedPTR_H
+#define TDESharedPTR_H
 
 #include "tdelibs_export.h"
 
 /**
  * Reference counting for shared objects.  If you derive your object
  * from this class, then you may use it in conjunction with
- * KSharedPtr to control the lifetime of your object.
+ * TDESharedPtr to control the lifetime of your object.
  *
- * Specifically, all classes that derive from KShared have an internal
+ * Specifically, all classes that derive from TDEShared have an internal
  * counter keeping track of how many other objects have a reference to
- * their object.  If used with KSharedPtr, then your object will
+ * their object.  If used with TDESharedPtr, then your object will
  * not be deleted until all references to the object have been
  * released.
  *
  * You should probably not ever use any of the methods in this class
- * directly -- let the KSharedPtr take care of that.  Just derive
- * your class from KShared and forget about it.
+ * directly -- let the TDESharedPtr take care of that.  Just derive
+ * your class from TDEShared and forget about it.
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
-class TDECORE_EXPORT KShared {
+class TDECORE_EXPORT TDEShared {
 public:
    /**
     * Standard constructor.  This will initialize the reference count
     * on this object to 0.
     */
-   KShared() : count(0) { }
+   TDEShared() : count(0) { }
 
    /**
     * Copy constructor.  This will @em not actually copy the objects
     * but it will initialize the reference count on this object to 0.
     */
-   KShared( const KShared & ) : count(0) { }
+   TDEShared( const TDEShared & ) : count(0) { }
 
    /**
     * Overloaded assignment operator.
     */
-   KShared &operator=(const KShared & ) { return *this; }
+   TDEShared &operator=(const TDEShared & ) { return *this; }
 
    /**
     * Increases the reference count by one.
     */
-   void _KShared_ref() const { count++; }
+   void _TDEShared_ref() const { count++; }
 
    /**
     * Releases a reference (decreases the reference count by one).  If
     * the count goes to 0, this object will delete itself.
     */
-   void _KShared_unref() const { if (!--count) delete this; }
+   void _TDEShared_unref() const { if (!--count) delete this; }
 
    /**
     * Return the current number of references held.
     *
     * @return Number of references
     */
-   int _KShared_count() const { return count; }
+   int _TDEShared_count() const { return count; }
 
 protected:
-   virtual ~KShared() { }
+   virtual ~TDEShared() { }
 private:
    mutable int count;
 };
 
 /**
  * Can be used to control the lifetime of an object that has derived
- * KShared. As long a someone holds a KSharedPtr on some KShared
+ * TDEShared. As long a someone holds a TDESharedPtr on some TDEShared
  * object it won't become deleted but is deleted once its reference
  * count is 0.  This struct emulates C++ pointers virtually perfectly.
  * So just use it like a simple C++ pointer.
  *
- * KShared and KSharedPtr are preferred over QShared / QSharedPtr
+ * TDEShared and TDESharedPtr are preferred over QShared / QSharedPtr
  * since they are more safe.
  *
  * WARNING: Please note that this class template provides an implicit
  * conversion to T*. Do *not* change this pointer or the pointee (don't
- * call delete on it, for instance) behind KSharedPtr's back.
+ * call delete on it, for instance) behind TDESharedPtr's back.
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
 template< class T >
-class KSharedPtr
+class TDESharedPtr
 {
 public:
 /**
  * Creates a null pointer.
  */
-  KSharedPtr()
+  TDESharedPtr()
     : ptr(0) { }
   /**
    * Creates a new pointer.
    * @param t the pointer
    */
-  KSharedPtr( T* t )
-    : ptr(t) { if ( ptr ) ptr->_KShared_ref(); }
+  TDESharedPtr( T* t )
+    : ptr(t) { if ( ptr ) ptr->_TDEShared_ref(); }
 
   /**
    * Copies a pointer.
    * @param p the pointer to copy
    */
-  KSharedPtr( const KSharedPtr& p )
-    : ptr(p.ptr) { if ( ptr ) ptr->_KShared_ref(); }
+  TDESharedPtr( const TDESharedPtr& p )
+    : ptr(p.ptr) { if ( ptr ) ptr->_TDEShared_ref(); }
 
   /**
    * Unreferences the object that this pointer points to. If it was
    * the last reference, the object will be deleted.
    */
-  ~KSharedPtr() { if ( ptr ) ptr->_KShared_unref(); }
+  ~TDESharedPtr() { if ( ptr ) ptr->_TDEShared_unref(); }
 
-  KSharedPtr<T>& operator= ( const KSharedPtr<T>& p ) {
+  TDESharedPtr<T>& operator= ( const TDESharedPtr<T>& p ) {
     if ( ptr == p.ptr ) return *this;
-    if ( ptr ) ptr->_KShared_unref();
+    if ( ptr ) ptr->_TDEShared_unref();
     ptr = p.ptr;
-    if ( ptr ) ptr->_KShared_ref();
+    if ( ptr ) ptr->_TDEShared_ref();
     return *this;
   }
-  KSharedPtr<T>& operator= ( T* p ) {
+  TDESharedPtr<T>& operator= ( T* p ) {
     if ( ptr == p ) return *this;
-    if ( ptr ) ptr->_KShared_unref();
+    if ( ptr ) ptr->_TDEShared_unref();
     ptr = p;
-    if ( ptr ) ptr->_KShared_ref();
+    if ( ptr ) ptr->_TDEShared_ref();
     return *this;
   }
-  bool operator== ( const KSharedPtr<T>& p ) const { return ( ptr == p.ptr ); }
-  bool operator!= ( const KSharedPtr<T>& p ) const { return ( ptr != p.ptr ); }
+  bool operator== ( const TDESharedPtr<T>& p ) const { return ( ptr == p.ptr ); }
+  bool operator!= ( const TDESharedPtr<T>& p ) const { return ( ptr != p.ptr ); }
   bool operator== ( const T* p ) const { return ( ptr == p ); }
   bool operator!= ( const T* p ) const { return ( ptr != p ); }
   bool operator!() const { return ( ptr == 0 ); }
@@ -167,7 +167,7 @@ public:
    * Returns the number of references.
    * @return the number of references
    */
-  int count() const { return ptr->_KShared_count(); } // for debugging purposes
+  int count() const { return ptr->_TDEShared_count(); } // for debugging purposes
 private:
   T* ptr;
 };
diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp
index b46e05dd5..6b21e0392 100644
--- a/tdecore/ktimezones.cpp
+++ b/tdecore/ktimezones.cpp
@@ -203,7 +203,7 @@ bool KTimezone::isValidLongitude(float longitude)
 }
 
 KTimezone::KTimezone(
-    KSharedPtr<KTimezoneSource> db, const TQString& name,
+    TDESharedPtr<KTimezoneSource> db, const TQString& name,
     const TQString &countryCode, float latitude, float longitude,
     const TQString &comment) :
     m_db(db),
@@ -415,7 +415,7 @@ const KTimezones::ZoneMap KTimezones::allZones()
     TQTextStream str(&f);
     TQRegExp lineSeparator("[ \t]");
     TQRegExp ordinateSeparator("[+-]");
-    KSharedPtr<KTimezoneSource> db(new KTimezoneSource(m_zoneinfoDir));
+    TDESharedPtr<KTimezoneSource> db(new KTimezoneSource(m_zoneinfoDir));
     while (!str.atEnd())
     {
         TQString line = str.readLine();
diff --git a/tdecore/ktimezones.h b/tdecore/ktimezones.h
index d24e8ec10..339cbf5bf 100644
--- a/tdecore/ktimezones.h
+++ b/tdecore/ktimezones.h
@@ -49,7 +49,7 @@ class KTimezonesPrivate;
  * @author S.R.Haque <srhaque@iee.org>.
  */
 class TDECORE_EXPORT KTimezoneSource :
-    public KShared
+    public TDEShared
 {
 public:
     KTimezoneSource(const TQString &db);
@@ -114,7 +114,7 @@ public:
      * @param comment description of the timezone, if any.
      */
     KTimezone(
-        KSharedPtr<KTimezoneSource> db, const TQString &name,
+        TDESharedPtr<KTimezoneSource> db, const TQString &name,
         const TQString &countryCode = TQString(), float latitude = UNKNOWN, float longitude = UNKNOWN,
         const TQString &comment = TQString());
     ~KTimezone();
@@ -191,7 +191,7 @@ private:
     KTimezone(const KTimezone&);
     KTimezone& operator=(const KTimezone&);
 
-    KSharedPtr<KTimezoneSource> m_db;
+    TDESharedPtr<KTimezoneSource> m_db;
     TQString m_name;
     TQString m_countryCode;
     float m_latitude;
diff --git a/tdecore/kuser.cpp b/tdecore/kuser.cpp
index 3fffddf4f..6bad14bd0 100644
--- a/tdecore/kuser.cpp
+++ b/tdecore/kuser.cpp
@@ -32,7 +32,7 @@
 #include <grp.h>
 
 
-class KUserPrivate : public KShared
+class KUserPrivate : public TDEShared
 {
 public:
 	bool valid;
@@ -271,7 +271,7 @@ TQStringList KUser::allUserNames() {
 KUser::~KUser() {
 }
 
-class KUserGroupPrivate : public KShared
+class KUserGroupPrivate : public TDEShared
 {
 public:
   bool valid;
diff --git a/tdecore/kuser.h b/tdecore/kuser.h
index 12b511f9f..a48cf124d 100644
--- a/tdecore/kuser.h
+++ b/tdecore/kuser.h
@@ -233,7 +233,7 @@ public:
   static TQStringList allUserNames();
 
 private:
-  KSharedPtr<KUserPrivate> d;
+  TDESharedPtr<KUserPrivate> d;
   void fillPasswd(struct passwd* p);
   void fillName(const char* name);
 };
@@ -375,7 +375,7 @@ public:
   static TQStringList allGroupNames();
   
 private:
-  KSharedPtr<KUserGroupPrivate> d;
+  TDESharedPtr<KUserGroupPrivate> d;
   void fillGroup(struct group* g);
   void fillName(const char* name);
 };
diff --git a/tdecore/tdeconfig.cpp b/tdecore/tdeconfig.cpp
index 62464b81f..bef3d7944 100644
--- a/tdecore/tdeconfig.cpp
+++ b/tdecore/tdeconfig.cpp
@@ -328,14 +328,14 @@ TDEConfig* TDEConfig::copyTo(const TQString &file, TDEConfig *config) const
 void TDEConfig::virtual_hook( int id, void* data )
 { TDEConfigBase::virtual_hook( id, data ); }
 
-static KStaticDeleter< TQValueList<KSharedConfig*> > sd;
-TQValueList<KSharedConfig*> *KSharedConfig::s_list = 0;
+static KStaticDeleter< TQValueList<TDESharedConfig*> > sd;
+TQValueList<TDESharedConfig*> *TDESharedConfig::s_list = 0;
 
-KSharedConfig::Ptr KSharedConfig::openConfig(const TQString& fileName, bool readOnly, bool useKDEGlobals )
+TDESharedConfig::Ptr TDESharedConfig::openConfig(const TQString& fileName, bool readOnly, bool useKDEGlobals )
 {
   if (s_list)
   {
-     for(TQValueList<KSharedConfig*>::ConstIterator it = s_list->begin();
+     for(TQValueList<TDESharedConfig*>::ConstIterator it = s_list->begin();
          it != s_list->end(); ++it)
      {
         if ((*it)->backEnd->fileName() == fileName &&
@@ -344,21 +344,21 @@ KSharedConfig::Ptr KSharedConfig::openConfig(const TQString& fileName, bool read
            return (*it);
      }
   }
-  return new KSharedConfig(fileName, readOnly, useKDEGlobals);
+  return new TDESharedConfig(fileName, readOnly, useKDEGlobals);
 }
 
-KSharedConfig::KSharedConfig( const TQString& fileName, bool readonly, bool usekdeglobals)
+TDESharedConfig::TDESharedConfig( const TQString& fileName, bool readonly, bool usekdeglobals)
  : TDEConfig(fileName, readonly, usekdeglobals)
 {
   if (!s_list)
   {
-    sd.setObject(s_list, new TQValueList<KSharedConfig*>);
+    sd.setObject(s_list, new TQValueList<TDESharedConfig*>);
   }
 
   s_list->append(this);
 }
 
-KSharedConfig::~KSharedConfig()
+TDESharedConfig::~TDESharedConfig()
 {
   if ( s_list )
     s_list->remove(this);
diff --git a/tdecore/tdeconfig.h b/tdecore/tdeconfig.h
index 77a009efa..59f784107 100644
--- a/tdecore/tdeconfig.h
+++ b/tdecore/tdeconfig.h
@@ -267,14 +267,14 @@ private:
 /**
  * TDEConfig variant using shared memory
  *
- * KSharedConfig provides a reference counted, shared memory variant
+ * TDESharedConfig provides a reference counted, shared memory variant
  * of TDEConfig.
  */
-class TDECORE_EXPORT KSharedConfig : public TDEConfig, public KShared
+class TDECORE_EXPORT TDESharedConfig : public TDEConfig, public TDEShared
 {
-  friend class TQValueList<KSharedConfig*>;
+  friend class TQValueList<TDESharedConfig*>;
 public:
-  typedef KSharedPtr<KSharedConfig> Ptr;
+  typedef TDESharedPtr<TDESharedConfig> Ptr;
 
 public:  
   /**
@@ -283,14 +283,14 @@ public:
    * @param readOnly set the config object's read-only status
    * @param bUseKDEGlobals Toggle reading the global KDE configuration file.
    */
-  static KSharedConfig::Ptr openConfig(const TQString& fileName, bool readOnly = false,
+  static TDESharedConfig::Ptr openConfig(const TQString& fileName, bool readOnly = false,
     bool bUseKDEGlobals = true);
 
 private:
-  KSharedConfig( const TQString& fileName, bool readOnly, bool useKDEGlobals );
-  ~KSharedConfig();
+  TDESharedConfig( const TQString& fileName, bool readOnly, bool useKDEGlobals );
+  ~TDESharedConfig();
 
-  static TQValueList<KSharedConfig*> *s_list;
+  static TQValueList<TDESharedConfig*> *s_list;
 };
 
 #endif
diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
index c7f2fd7bd..4069561bb 100644
--- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
+++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
@@ -1220,7 +1220,7 @@ int main( int argc, char **argv )
   if ( !singleton ) {
     h << "    " << className << "(";
     if (cfgFileNameArg)
-       h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " = TDEGlobal::sharedConfig()" : ", ");
+       h << " TDESharedConfig::Ptr config" << (parameters.isEmpty() ? " = TDEGlobal::sharedConfig()" : ", ");
     for (TQValueList<Param>::ConstIterator it = parameters.begin();
          it != parameters.end(); ++it)
     {
@@ -1502,7 +1502,7 @@ int main( int argc, char **argv )
   cpp << className << "::" << className << "( ";
   if ( cfgFileNameArg ) {
     if ( !singleton )
-      cpp << " KSharedConfig::Ptr config";
+      cpp << " TDESharedConfig::Ptr config";
     else
       cpp << " const char *config";
     cpp << (parameters.isEmpty() ? " " : ", ");
diff --git a/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref b/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref
index c0a9ddda5..6181295eb 100644
--- a/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref
@@ -3,7 +3,7 @@
 
 #include "test8a.h"
 
-Test8a::Test8a(  KSharedConfig::Ptr config  )
+Test8a::Test8a(  TDESharedConfig::Ptr config  )
   : TDEConfigSkeleton( config )
 {
   setCurrentGroup( TQString::fromLatin1( "Group" ) );
diff --git a/tdecore/tdeconfig_compiler/tests/test8a.h.ref b/tdecore/tdeconfig_compiler/tests/test8a.h.ref
index 9913cfc49..88686ca1b 100644
--- a/tdecore/tdeconfig_compiler/tests/test8a.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8a.h.ref
@@ -11,7 +11,7 @@ class Test8a : public TDEConfigSkeleton
 {
   public:
 
-    Test8a( KSharedConfig::Ptr config = TDEGlobal::sharedConfig() );
+    Test8a( TDESharedConfig::Ptr config = TDEGlobal::sharedConfig() );
     ~Test8a();
 
     /**
diff --git a/tdecore/tdeconfig_compiler/tests/test8main.cpp b/tdecore/tdeconfig_compiler/tests/test8main.cpp
index 04864a95c..2611a48af 100644
--- a/tdecore/tdeconfig_compiler/tests/test8main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test8main.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 int main( int, char*[] )
 {
   TDEInstance i("test");
-  Test8a *config1 = new Test8a( KSharedConfig::openConfig( TQString::null ) );
+  Test8a *config1 = new Test8a( TDESharedConfig::openConfig( TQString::null ) );
   Test8a *config2 = new Test8a();
   Test8b::self();
   delete config1;
diff --git a/tdecore/tdeconfigbackend.h b/tdecore/tdeconfigbackend.h
index c1092364c..916479643 100644
--- a/tdecore/tdeconfigbackend.h
+++ b/tdecore/tdeconfigbackend.h
@@ -48,7 +48,7 @@ class TDEConfigBackEndPrivate;
 class TDECORE_EXPORT TDEConfigBackEnd
 {
   friend class TDEConfig;
-  friend class KSharedConfig;
+  friend class TDESharedConfig;
 public:
   /**
    * Constructs a configuration back end.
diff --git a/tdecore/tdeconfigbase.h b/tdecore/tdeconfigbase.h
index b9522dcb6..1166703ce 100644
--- a/tdecore/tdeconfigbase.h
+++ b/tdecore/tdeconfigbase.h
@@ -46,7 +46,7 @@ class TDEConfigGroup;
  * abstract base class, meaning that you cannot directly instantiate
  * objects of this class. Either use TDEConfig (for usual %KDE
  * configuration) or KSimpleConfig (for special needs as in ksamba), or
- * even KSharedConfig (stores values in shared memory).
+ * even TDESharedConfig (stores values in shared memory).
  *
  * All configuration entries are key, value pairs.  Each entry also
  * belongs to a specific group of related entries.  All configuration
@@ -65,7 +65,7 @@ class TDEConfigGroup;
  * @see TDEGlobal#config()
  * @see TDEConfig
  * @see KSimpleConfig
- * @see KSharedConfig
+ * @see TDESharedConfig
  */
 class TDECORE_EXPORT TDEConfigBase : public TQObject
 {
diff --git a/tdecore/tdeconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp
index 0990949d0..1abaf388b 100644
--- a/tdecore/tdeconfigskeleton.cpp
+++ b/tdecore/tdeconfigskeleton.cpp
@@ -885,7 +885,7 @@ TDEConfigSkeleton::TDEConfigSkeleton( const TQString &configname )
 
   if ( !configname.isEmpty() )
   {
-    mConfig = KSharedConfig::openConfig( configname );
+    mConfig = TDESharedConfig::openConfig( configname );
   }
   else
   {
@@ -893,7 +893,7 @@ TDEConfigSkeleton::TDEConfigSkeleton( const TQString &configname )
   }
 }
 
-TDEConfigSkeleton::TDEConfigSkeleton(KSharedConfig::Ptr config)
+TDEConfigSkeleton::TDEConfigSkeleton(TDESharedConfig::Ptr config)
   : mCurrentGroup( "No Group" ), mUseDefaults(false)
 {
   kdDebug(177) << "Creating TDEConfigSkeleton (" << (void *)this << ")" << endl;
diff --git a/tdecore/tdeconfigskeleton.h b/tdecore/tdeconfigskeleton.h
index d9424e9df..ccbf4529b 100644
--- a/tdecore/tdeconfigskeleton.h
+++ b/tdecore/tdeconfigskeleton.h
@@ -800,7 +800,7 @@ public:
    * 
    * @param config configuration object to use.
    */
-  TDEConfigSkeleton(KSharedConfig::Ptr config);
+  TDEConfigSkeleton(TDESharedConfig::Ptr config);
 
   /**
    * Destructor
@@ -1215,7 +1215,7 @@ protected:
 private:
   TQString mCurrentGroup;
 
-  KSharedConfig::Ptr mConfig; // pointer to TDEConfig object
+  TDESharedConfig::Ptr mConfig; // pointer to TDEConfig object
 
   TDEConfigSkeletonItem::List mItems;
   TDEConfigSkeletonItem::Dict mItemDict;
diff --git a/tdecore/tdesycocaentry.h b/tdecore/tdesycocaentry.h
index a4e2512e0..d7ddbaf20 100644
--- a/tdecore/tdesycocaentry.h
+++ b/tdecore/tdesycocaentry.h
@@ -34,7 +34,7 @@ class TQDataStream;
  * @internal
  * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdesycoca.html 
  */
-class TDECORE_EXPORT KSycocaEntry : public KShared
+class TDECORE_EXPORT KSycocaEntry : public TDEShared
 {
  
 public:
@@ -42,7 +42,7 @@ public:
    virtual KSycocaType sycocaType() const { return KST_KSycocaEntry; }
 
 public:
-  typedef KSharedPtr<KSycocaEntry> Ptr;
+  typedef TDESharedPtr<KSycocaEntry> Ptr;
   typedef TQValueList<Ptr> List;
 public: // KDoc seems to barf on those typedefs and generates no docs after them
    /**
diff --git a/tdecore/tdesycocafactory.cpp b/tdecore/tdesycocafactory.cpp
index d7d350ddf..bffd12b6a 100644
--- a/tdecore/tdesycocafactory.cpp
+++ b/tdecore/tdesycocafactory.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 
 template class TQDict<KSycocaEntry>;
-template class TQDict<KSharedPtr<KSycocaEntry> >;
+template class TQDict<TDESharedPtr<KSycocaEntry> >;
 
 KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id)
  : m_resourceList(0), m_entryDict(0), m_sycocaDict(0)