Rename KStandard for enhanced compatibility with KDE4

26 files changed, 153 insertions, 153 deletions

diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index b0d6cddfb..e12e29d27 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -28,7 +28,7 @@ resources provided by the system were located under $TDEDIR and user-
 specific resources were located under $HOME/.trinity.
 
 In KDE2 resource management has been largely abstracted by the introduction
-of the KStandardDirs class and has become much more flexible. The user /
+of the TDEStandardDirs class and has become much more flexible. The user /
 administrator can now specify a variable number of locations where resources
 can be found. A list of locations can either be specified via $TDEDIRS
 (notice the extra 'S'), via /etc/kderc and even via the kdeglobals config 
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index bd17e972a..fb8dfcf6d 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -1013,7 +1013,7 @@ void TDEApplication::init(bool GUIenabled)
 	setReverseLayout( !rtl );
 
   // install appdata resource type
-  TDEGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data")
+  TDEGlobal::dirs()->addResourceType("appdata", TDEStandardDirs::kde_default("data")
                                    + TQString::fromLatin1(name()) + '/');
   pSessionConfig = 0L;
   bSessionManagement = true;
@@ -1346,7 +1346,7 @@ static void checkRestartVersion( TQSessionManager& sm )
             }
         }
     }
-    TQString wrapper = KStandardDirs::findExe( "trinity" );
+    TQString wrapper = TDEStandardDirs::findExe( "trinity" );
     TQStringList restartCommand = sm.restartCommand();
     restartCommand.prepend( wrapper );
     sm.setRestartCommand( restartCommand );
@@ -1451,9 +1451,9 @@ void TDEApplication::startKdeinit()
          return; // whoever held the lock has already started dcopserver
   }
   // Try to launch tdeinit.
-  TQString srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"));
+  TQString srv = TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit"));
   if (srv.isEmpty())
-     srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"), TDEGlobal::dirs()->kfsstnd_defaultbindir());
+     srv = TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit"), TDEGlobal::dirs()->kfsstnd_defaultbindir());
   if (srv.isEmpty())
      return;
   if (kapp && (Tty != kapp->type()))
diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp
index f6c29be7d..cd7145ac7 100644
--- a/tdecore/kapplication_win.cpp
+++ b/tdecore/kapplication_win.cpp
@@ -79,7 +79,7 @@ void TDEApplication::invokeHelp( const TQString& anchor,
 {
 	if (!d->qassistantclient) {
 		d->qassistantclient = new QAssistantClient(
-			KStandardDirs::findExe( "assistant" ), 0);
+			TDEStandardDirs::findExe( "assistant" ), 0);
 		TQStringList args;
 		args << "-profile";
 		args << TQDir::convertSeparators( locate("html", TQString(name())+"/"+TQString(name())+".adp") );
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index a30b2046b..41d7a3d41 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -133,7 +133,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path)
   if (TQDir::isRelativePath(path))
      return true; // Relative paths are ok.
      
-  KStandardDirs *dirs = TDEGlobal::dirs();
+  TDEStandardDirs *dirs = TDEGlobal::dirs();
   if (TQDir::isRelativePath( dirs->relativeLocation("apps", path) ))
      return true;
   if (TQDir::isRelativePath( dirs->relativeLocation("xdgdata-apps", path) ))
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index a2a83e436..7b492b5a8 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -53,7 +53,7 @@
 
 static void kglobal_init();
 
-KStandardDirs *TDEGlobal::dirs()
+TDEStandardDirs *TDEGlobal::dirs()
 {
     MYASSERT(_instance);
 
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index 075f068b7..4b727b281 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -28,7 +28,7 @@ class KIconLoader;
 class TDEHardwareDevices;
 class TDEGlobalNetworkManager;
 class KLocale;
-class KStandardDirs;
+class TDEStandardDirs;
 class KStaticDeleterBase;
 class KStaticDeleterList;
 class KStringDict;
@@ -59,7 +59,7 @@ public:
      *  Returns the application standard dirs object.
      * @return the global standard dir object
      */
-    static KStandardDirs	*dirs();
+    static TDEStandardDirs	*dirs();
 
     /**
      *  Returns the general config object.
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index e63f09d0f..ba0dffb3f 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -127,7 +127,7 @@ static TQValueList< KIconLoaderDebug > *kiconloaders;
 
 /*** KIconLoader: the icon loader ***/
 
-KIconLoader::KIconLoader(const TQString& _appname, KStandardDirs *_dirs)
+KIconLoader::KIconLoader(const TQString& _appname, TDEStandardDirs *_dirs)
 {
 #ifdef KICONLOADER_CHECKS
     if( kiconloaders == NULL )
@@ -159,7 +159,7 @@ KIconLoader::KIconLoader(const TQString& _appname, KStandardDirs *_dirs)
     init( _appname, _dirs );
 }
 
-void KIconLoader::reconfigure( const TQString& _appname, KStandardDirs *_dirs )
+void KIconLoader::reconfigure( const TQString& _appname, TDEStandardDirs *_dirs )
 {
     d->links.clear();
     d->imgDict.clear();
@@ -171,7 +171,7 @@ void KIconLoader::reconfigure( const TQString& _appname, KStandardDirs *_dirs )
     init( _appname, _dirs );
 }
 
-void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
+void KIconLoader::init( const TQString& _appname, TDEStandardDirs *_dirs )
 {
     // If this is unequal to 0, the iconloader is initialized
     // successfully.
@@ -236,10 +236,10 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
     }
 
     // Insert application specific themes at the top.
-    d->mpDirs->addResourceType("appicon", KStandardDirs::kde_default("data") +
+    d->mpDirs->addResourceType("appicon", TDEStandardDirs::kde_default("data") +
 		appname + "/pics/");
     // ################## KDE4: consider removing the toolbar directory
-    d->mpDirs->addResourceType("appicon", KStandardDirs::kde_default("data") +
+    d->mpDirs->addResourceType("appicon", TDEStandardDirs::kde_default("data") +
 		appname + "/toolbar/");
 
     // Add legacy icon dirs.
@@ -294,10 +294,10 @@ bool KIconLoader::isDelayedIconSetLoadingEnabled() const
 
 void KIconLoader::addAppDir(const TQString& appname)
 {
-    d->mpDirs->addResourceType("appicon", KStandardDirs::kde_default("data") +
+    d->mpDirs->addResourceType("appicon", TDEStandardDirs::kde_default("data") +
 		appname + "/pics/");
     // ################## KDE4: consider removing the toolbar directory
-    d->mpDirs->addResourceType("appicon", KStandardDirs::kde_default("data") +
+    d->mpDirs->addResourceType("appicon", TDEStandardDirs::kde_default("data") +
 		appname + "/toolbar/");
     addAppThemes(appname);
 }
@@ -362,8 +362,8 @@ void KIconLoader::addExtraDesktopThemes()
 	TQStringList::ConstIterator it2;
 	for (it2=lst.begin(); it2!=lst.end(); ++it2)
 	{
-	    if (!KStandardDirs::exists(*it + *it2 + "/index.desktop")
-		&& !KStandardDirs::exists(*it + *it2 + "/index.theme"))
+	    if (!TDEStandardDirs::exists(*it + *it2 + "/index.desktop")
+		&& !TDEStandardDirs::exists(*it + *it2 + "/index.theme"))
 		continue;
 	    r=readlink( TQFile::encodeName(*it + *it2) , buf, sizeof(buf)-1);
 	    if ( r>0 )
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index 2357aef13..86fa77679 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -35,7 +35,7 @@ struct KIconGroup;
 class KIconThemeNode;
 class TDEConfig;
 struct KIconLoaderPrivate;
-class KStandardDirs;
+class TDEStandardDirs;
 class KIconEffect;
 
 
@@ -83,7 +83,7 @@ public:
      * @param appname Add the data directories of this application to the
      * icon search path for the "User" group. The default argument adds the
      * directories of the current application.
-     * @param dirs the KStandardDirs object to use. If null the global one is used
+     * @param dirs the TDEStandardDirs object to use. If null the global one is used
      *
      * Usually, you use the default iconloader, which can be accessed via
      * TDEGlobal::iconLoader(), so you hardly ever have to create an
@@ -92,7 +92,7 @@ public:
      * @see TDEGlobal::iconLoader()
      * @see TDEInstance::iconLoader()
      */
-    KIconLoader(const TQString& appname=TQString::null, KStandardDirs *dirs = 0);
+    KIconLoader(const TQString& appname=TQString::null, TDEStandardDirs *dirs = 0);
 
     /**
      * Cleanup
@@ -301,7 +301,7 @@ public:
      * @param _dirs the new standard directories. If 0, the directories
      *              from TDEGlobal will be taken.
      */
-    void reconfigure( const TQString& _appname, KStandardDirs *_dirs );
+    void reconfigure( const TQString& _appname, TDEStandardDirs *_dirs );
 
     /**
      * Returns the unknown icon. An icon that is used when no other icon
@@ -368,7 +368,7 @@ public:
     /**
      * @internal
      */
-    void init( const TQString& _appname, KStandardDirs *_dirs );
+    void init( const TQString& _appname, TDEStandardDirs *_dirs );
 
     /**
      * @internal
diff --git a/tdecore/kiconloader_p.h b/tdecore/kiconloader_p.h
index 4a7695390..4c3c87339 100644
--- a/tdecore/kiconloader_p.h
+++ b/tdecore/kiconloader_p.h
@@ -40,7 +40,7 @@ public:
     TQStringList mThemesInTree;
     KIconGroup *mpGroups;
     KIconThemeNode *mpThemeRoot;
-    KStandardDirs *mpDirs;
+    TDEStandardDirs *mpDirs;
     KIconLoader *q;
     KIconEffect mpEffect;
     TQDict<TQImage> imgDict;
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index d985cc8b0..f967dc36c 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -113,11 +113,11 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
     for (it=icnlibs.begin(); it!=icnlibs.end(); ++it)
     {
         cDir = *it + name + "/";
-        if (KStandardDirs::exists(cDir))
+        if (TDEStandardDirs::exists(cDir))
         {
             themeDirs += cDir;
 	    if (mDir.isEmpty()
-		    && (KStandardDirs::exists( cDir + "index.desktop") || KStandardDirs::exists( cDir + "index.theme")))
+		    && (TDEStandardDirs::exists( cDir + "index.desktop") || TDEStandardDirs::exists( cDir + "index.theme")))
 		mDir = cDir;
         }
     }
@@ -166,7 +166,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
 	cfg.setGroup(*it);
 	for (itDir=themeDirs.begin(); itDir!=themeDirs.end(); ++itDir)
 	{
-	    if (KStandardDirs::exists(*itDir + *it + "/"))
+	    if (TDEStandardDirs::exists(*itDir + *it + "/"))
 	    {
 	        KIconThemeDir *dir = new KIconThemeDir(*itDir + *it, &cfg);
 	        if (!dir->isValid())
@@ -487,7 +487,7 @@ TQStringList KIconTheme::list()
         {
             if ((*it2 == ".") || (*it2 == "..") || (*it2).startsWith("default.") )
                 continue;
-            if (!KStandardDirs::exists(*it + *it2 + "/index.desktop") && !KStandardDirs::exists(*it + *it2 + "/index.theme"))
+            if (!TDEStandardDirs::exists(*it + *it2 + "/index.desktop") && !TDEStandardDirs::exists(*it + *it2 + "/index.theme"))
                 continue;
 		KIconTheme oink(*it2);
 	    if (!oink.isValid()) continue;
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index 953b8ffa1..308ea7782 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -172,11 +172,11 @@ TDEInstance::~TDEInstance()
 }
 
 
-KStandardDirs *TDEInstance::dirs() const
+TDEStandardDirs *TDEInstance::dirs() const
 {
     DEBUG_CHECK_ALIVE
     if( _dirs == 0 ) {
-	_dirs = new KStandardDirs( );
+	_dirs = new TDEStandardDirs( );
         if (_config) {
             if (_dirs->addCustomized(_config))
                 _config->reparseConfiguration();
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index 24ec92d3f..759581080 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -18,7 +18,7 @@
 #ifndef _KINSTANCE_H
 #define _KINSTANCE_H
 
-class KStandardDirs;
+class TDEStandardDirs;
 class TDEAboutData;
 class TDEConfig;
 class KIconLoader;
@@ -44,7 +44,7 @@ class TDEGlobalNetworkManager;
  */
 class TDECORE_EXPORT TDEInstance
 {
-    friend class KStandardDirs;
+    friend class TDEStandardDirs;
 
  public:
     /**
@@ -80,9 +80,9 @@ class TDECORE_EXPORT TDEInstance
 
     /**
      * Returns the application standard dirs object.
-     * @return The KStandardDirs of the application.
+     * @return The TDEStandardDirs of the application.
      */
-    KStandardDirs	*dirs() const;
+    TDEStandardDirs	*dirs() const;
 
     /**
      * Returns the general config object ("appnamerc").
@@ -163,7 +163,7 @@ protected:
     void setConfigName(const TQString &name);
 
 private:
-    mutable KStandardDirs       *_dirs;
+    mutable TDEStandardDirs       *_dirs;
 
     mutable TDEConfig             *_config;
     mutable KIconLoader         *_iconLoader;
diff --git a/tdecore/kmountpoint.cpp b/tdecore/kmountpoint.cpp
index 764f085a0..a9be89e76 100644
--- a/tdecore/kmountpoint.cpp
+++ b/tdecore/kmountpoint.cpp
@@ -158,7 +158,7 @@ KMountPoint::List KMountPoint::possibleMountPoints(int infoNeeded)
       if (infoNeeded & NeedRealDeviceName)
       {
          if (mp->m_mountedFrom.startsWith("/"))
-            mp->m_device = KStandardDirs::realPath(mp->m_mountedFrom);
+            mp->m_device = TDEStandardDirs::realPath(mp->m_mountedFrom);
       }
       // TODO: Strip trailing '/' ?
       result.append(mp);
@@ -209,7 +209,7 @@ KMountPoint::List KMountPoint::possibleMountPoints(int infoNeeded)
       if (infoNeeded & NeedRealDeviceName)
       {
          if (mp->m_mountedFrom.startsWith("/"))
-            mp->m_device = KStandardDirs::realPath(mp->m_mountedFrom);
+            mp->m_device = TDEStandardDirs::realPath(mp->m_mountedFrom);
       }
       // TODO: Strip trailing '/' ?
       result.append(mp);
@@ -256,7 +256,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded)
       if (infoNeeded & NeedRealDeviceName)
       {
          if (mp->m_mountedFrom.startsWith("/"))
-            mp->m_device = KStandardDirs::realPath(mp->m_mountedFrom);
+            mp->m_device = TDEStandardDirs::realPath(mp->m_mountedFrom);
       }
       // TODO: Strip trailing '/' ?
       result.append(mp);
@@ -320,7 +320,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded)
             if (infoNeeded & NeedRealDeviceName)
             {
                if (mp->m_mountedFrom.startsWith("/"))
-                  mp->m_device = KStandardDirs::realPath(mp->m_mountedFrom);
+                  mp->m_device = TDEStandardDirs::realPath(mp->m_mountedFrom);
             }
             
             result.append(mp);
@@ -363,7 +363,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded)
       if (infoNeeded & NeedRealDeviceName)
       {
          if (mp->m_mountedFrom.startsWith("/"))
-            mp->m_device = KStandardDirs::realPath(mp->m_mountedFrom);
+            mp->m_device = TDEStandardDirs::realPath(mp->m_mountedFrom);
       }
       // TODO: Strip trailing '/' ?
       result.append(mp);
diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp
index cddf44bc5..fdf47daf9 100644
--- a/tdecore/ksavefile.cpp
+++ b/tdecore/ksavefile.cpp
@@ -44,7 +44,7 @@ KSaveFile::KSaveFile(const TQString &filename, int mode)
  : mTempFile(true)
 {
    // follow symbolic link, if any
-   TQString real_filename = KStandardDirs::realFilePath(filename);
+   TQString real_filename = TDEStandardDirs::realFilePath(filename);
 
    // we only check here if the directory can be written to
    // the actual filename isn't written to, but replaced later
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index c44f60458..dc9ca909a 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -57,10 +57,10 @@
 
 template class TQDict<TQStringList>;
 
-class KStandardDirs::KStandardDirsPrivate
+class TDEStandardDirs::TDEStandardDirsPrivate
 {
 public:
-   KStandardDirsPrivate()
+   TDEStandardDirsPrivate()
     : restrictionsActive(false),
       dataRestrictionActive(false),
       checkRestrictions(true)
@@ -76,20 +76,20 @@ public:
 
 // Singleton, with data shared by all kstandarddirs instances.
 // Used in static methods like findExe()
-class KStandardDirsSingleton
+class TDEStandardDirsSingleton
 {
 public:
    TQString defaultprefix;
    TQString defaultbindir;
-   static KStandardDirsSingleton* self();
+   static TDEStandardDirsSingleton* self();
 private:
-   static KStandardDirsSingleton* s_self;
+   static TDEStandardDirsSingleton* s_self;
 };
-static KStaticDeleter<KStandardDirsSingleton> kstds_sd;
-KStandardDirsSingleton* KStandardDirsSingleton::s_self = 0;
-KStandardDirsSingleton* KStandardDirsSingleton::self() {
+static KStaticDeleter<TDEStandardDirsSingleton> kstds_sd;
+TDEStandardDirsSingleton* TDEStandardDirsSingleton::s_self = 0;
+TDEStandardDirsSingleton* TDEStandardDirsSingleton::self() {
     if ( !s_self )
-        kstds_sd.setObject( s_self, new KStandardDirsSingleton );
+        kstds_sd.setObject( s_self, new TDEStandardDirsSingleton );
     return s_self;
 }
 
@@ -105,9 +105,9 @@ static const char* const types[] = {"html", "html-bundle", "icon", "apps", "soun
 static int tokenize( TQStringList& token, const TQString& str,
 		const TQString& delim );
 
-KStandardDirs::KStandardDirs( ) : addedCustoms(false)
+TDEStandardDirs::TDEStandardDirs( ) : addedCustoms(false)
 {
-    d = new KStandardDirsPrivate;
+    d = new TDEStandardDirsPrivate;
     dircache.setAutoDelete(true);
     relatives.setAutoDelete(true);
     absolutes.setAutoDelete(true);
@@ -115,12 +115,12 @@ KStandardDirs::KStandardDirs( ) : addedCustoms(false)
     addKDEDefaults();
 }
 
-KStandardDirs::~KStandardDirs()
+TDEStandardDirs::~TDEStandardDirs()
 {
     delete d;
 }
 
-bool KStandardDirs::isRestrictedResource(const char *type, const TQString& relPath) const
+bool TDEStandardDirs::isRestrictedResource(const char *type, const TQString& relPath) const
 {
    if (!d || !d->restrictionsActive)
       return false;
@@ -140,7 +140,7 @@ bool KStandardDirs::isRestrictedResource(const char *type, const TQString& relPa
    return false;
 }
 
-void KStandardDirs::applyDataRestrictions(const TQString &relPath) const
+void TDEStandardDirs::applyDataRestrictions(const TQString &relPath) const
 {
    TQString key;
    int i = relPath.find(QChar('/'));
@@ -154,7 +154,7 @@ void KStandardDirs::applyDataRestrictions(const TQString &relPath) const
 }
 
 
-TQStringList KStandardDirs::allTypes() const
+TQStringList TDEStandardDirs::allTypes() const
 {
     TQStringList list;
     for (int i = 0; types[i] != 0; ++i)
@@ -177,12 +177,12 @@ static void priorityAdd(TQStringList &prefixes, const TQString& dir, bool priori
     }
 }
 
-void KStandardDirs::addPrefix( const TQString& _dir )
+void TDEStandardDirs::addPrefix( const TQString& _dir )
 {
     addPrefix(_dir, false);
 }
 
-void KStandardDirs::addPrefix( const TQString& _dir, bool priority )
+void TDEStandardDirs::addPrefix( const TQString& _dir, bool priority )
 {
     if (_dir.isEmpty())
 	return;
@@ -197,12 +197,12 @@ void KStandardDirs::addPrefix( const TQString& _dir, bool priority )
     }
 }
 
-void KStandardDirs::addXdgConfigPrefix( const TQString& _dir )
+void TDEStandardDirs::addXdgConfigPrefix( const TQString& _dir )
 {
     addXdgConfigPrefix(_dir, false);
 }
 
-void KStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
+void TDEStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
 {
     if (_dir.isEmpty())
 	return;
@@ -217,12 +217,12 @@ void KStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
     }
 }
 
-void KStandardDirs::addXdgDataPrefix( const TQString& _dir )
+void TDEStandardDirs::addXdgDataPrefix( const TQString& _dir )
 {
     addXdgDataPrefix(_dir, false);
 }
 
-void KStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
+void TDEStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
 {
     if (_dir.isEmpty())
 	return;
@@ -237,27 +237,27 @@ void KStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
     }
 }
 
-TQString KStandardDirs::kfsstnd_prefixes()
+TQString TDEStandardDirs::kfsstnd_prefixes()
 {
    return prefixes.join(TQChar(KPATH_SEPARATOR));
 }
 
-TQString KStandardDirs::kfsstnd_xdg_conf_prefixes()
+TQString TDEStandardDirs::kfsstnd_xdg_conf_prefixes()
 {
    return d->xdgconf_prefixes.join(TQChar(KPATH_SEPARATOR));
 }
 
-TQString KStandardDirs::kfsstnd_xdg_data_prefixes()
+TQString TDEStandardDirs::kfsstnd_xdg_data_prefixes()
 {
    return d->xdgdata_prefixes.join(TQChar(KPATH_SEPARATOR));
 }
 
-bool KStandardDirs::addResourceType( const char *type,
+bool TDEStandardDirs::addResourceType( const char *type,
 				     const TQString& relativename )
 {
     return addResourceType(type, relativename, true);
 }
-bool KStandardDirs::addResourceType( const char *type,
+bool TDEStandardDirs::addResourceType( const char *type,
 				     const TQString& relativename,
 				     bool priority )
 {
@@ -283,14 +283,14 @@ bool KStandardDirs::addResourceType( const char *type,
     return false;
 }
 
-bool KStandardDirs::addResourceDir( const char *type,
+bool TDEStandardDirs::addResourceDir( const char *type,
 				    const TQString& absdir)
 {
     // KDE4: change priority to bring in line with addResourceType
     return addResourceDir(type, absdir, false);
 }
 
-bool KStandardDirs::addResourceDir( const char *type,
+bool TDEStandardDirs::addResourceDir( const char *type,
 				    const TQString& absdir,
 				    bool priority)
 {
@@ -314,7 +314,7 @@ bool KStandardDirs::addResourceDir( const char *type,
     return false;
 }
 
-TQString KStandardDirs::findResource( const char *type,
+TQString TDEStandardDirs::findResource( const char *type,
 				     const TQString& filename ) const
 {
 	if (!TQDir::isRelativePath(filename))
@@ -349,7 +349,7 @@ static TQ_UINT32 updateHash(const TQString &file, TQ_UINT32 hash)
     return hash;
 }
 
-TQ_UINT32 KStandardDirs::calcResourceHash( const char *type,
+TQ_UINT32 TDEStandardDirs::calcResourceHash( const char *type,
 			      const TQString& filename, bool deep) const
 {
     TQ_UINT32 hash = 0;
@@ -375,7 +375,7 @@ TQ_UINT32 KStandardDirs::calcResourceHash( const char *type,
 }
 
 
-TQStringList KStandardDirs::findDirs( const char *type,
+TQStringList TDEStandardDirs::findDirs( const char *type,
                                      const TQString& reldir ) const
 {
     TQDir testdir;
@@ -409,12 +409,12 @@ TQStringList KStandardDirs::findDirs( const char *type,
     return list;
 }
 
-TQString KStandardDirs::findResourceDir( const char *type,
+TQString TDEStandardDirs::findResourceDir( const char *type,
 					const TQString& filename) const
 {
 #ifndef NDEBUG
     if (filename.isEmpty()) {
-      fprintf(stderr, "filename for type %s in KStandardDirs::findResourceDir is not supposed to be empty!!", type);
+      fprintf(stderr, "filename for type %s in TDEStandardDirs::findResourceDir is not supposed to be empty!!", type);
       return TQString::null;
     }
 #endif
@@ -430,7 +430,7 @@ TQString KStandardDirs::findResourceDir( const char *type,
 #ifdef Q_WS_WIN //this ensures we're using installed .la files
           if ((*it).isEmpty() && filename.right(3)==".la") {
 #ifndef NDEBUG
-              fprintf(stderr, "KStandardDirs::findResourceDir() found .la in cwd: skipping. (fname=%s)\n", filename.ascii());
+              fprintf(stderr, "TDEStandardDirs::findResourceDir() found .la in cwd: skipping. (fname=%s)\n", filename.ascii());
 #endif
               continue;
           }
@@ -447,7 +447,7 @@ TQString KStandardDirs::findResourceDir( const char *type,
     return TQString::null;
 }
 
-bool KStandardDirs::exists(const TQString &fullPath)
+bool TDEStandardDirs::exists(const TQString &fullPath)
 {
     KDE_struct_stat buff;
     if ((access(TQFile::encodeName(fullPath), R_OK) == 0) && (KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0)) {
@@ -620,7 +620,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 }
 
 TQStringList
-KStandardDirs::findAllResources( const char *type,
+TDEStandardDirs::findAllResources( const char *type,
 			         const TQString& filter,
 				 bool recursive,
 			         bool unique,
@@ -676,7 +676,7 @@ KStandardDirs::findAllResources( const char *type,
 }
 
 TQStringList
-KStandardDirs::findAllResources( const char *type,
+TDEStandardDirs::findAllResources( const char *type,
 			         const TQString& filter,
 				 bool recursive,
 			         bool unique) const
@@ -686,7 +686,7 @@ KStandardDirs::findAllResources( const char *type,
 }
 
 TQString
-KStandardDirs::realPath(const TQString &dirname)
+TDEStandardDirs::realPath(const TQString &dirname)
 {
     char realpath_buffer[MAXPATHLEN + 1];
     memset(realpath_buffer, 0, MAXPATHLEN + 1);
@@ -704,7 +704,7 @@ KStandardDirs::realPath(const TQString &dirname)
 }
 
 TQString
-KStandardDirs::realFilePath(const TQString &filename)
+TDEStandardDirs::realFilePath(const TQString &filename)
 {
     char realpath_buffer[MAXPATHLEN + 1];
     memset(realpath_buffer, 0, MAXPATHLEN + 1);
@@ -718,7 +718,7 @@ KStandardDirs::realFilePath(const TQString &filename)
     return filename;
 }
 
-void KStandardDirs::createSpecialResource(const char *type)
+void TDEStandardDirs::createSpecialResource(const char *type)
 {
    char hostname[256];
    hostname[0] = 0;
@@ -792,17 +792,17 @@ void KStandardDirs::createSpecialResource(const char *type)
    addResourceDir(type, dir+QChar('/'));
 }
 
-TQStringList KStandardDirs::resourceDirs(const char *type) const
+TQStringList TDEStandardDirs::resourceDirs(const char *type) const
 {
     TQStringList *candidates = dircache.find(type);
 
     if (!candidates) { // filling cache
         if (strcmp(type, "socket") == 0)
-           const_cast<KStandardDirs *>(this)->createSpecialResource(type);
+           const_cast<TDEStandardDirs *>(this)->createSpecialResource(type);
         else if (strcmp(type, "tmp") == 0)
-           const_cast<KStandardDirs *>(this)->createSpecialResource(type);
+           const_cast<TDEStandardDirs *>(this)->createSpecialResource(type);
         else if (strcmp(type, "cache") == 0)
-           const_cast<KStandardDirs *>(this)->createSpecialResource(type);
+           const_cast<TDEStandardDirs *>(this)->createSpecialResource(type);
 
         TQDir testdir;
 
@@ -883,7 +883,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const
   return *candidates;
 }
 
-TQStringList KStandardDirs::systemPaths( const TQString& pstr )
+TQStringList TDEStandardDirs::systemPaths( const TQString& pstr )
 {
     TQStringList tokens;
     TQString p = pstr;
@@ -929,7 +929,7 @@ TQStringList KStandardDirs::systemPaths( const TQString& pstr )
 }
 
 
-TQString KStandardDirs::findExe( const TQString& appname,
+TQString TDEStandardDirs::findExe( const TQString& appname,
 				const TQString& pstr, bool ignore)
 {
 #ifdef Q_WS_WIN
@@ -978,7 +978,7 @@ TQString KStandardDirs::findExe( const TQString& appname,
     return TQString::null;
 }
 
-int KStandardDirs::findAllExe( TQStringList& list, const TQString& appname,
+int TDEStandardDirs::findAllExe( TQStringList& list, const TQString& appname,
 			const TQString& pstr, bool ignore )
 {
 #ifdef Q_WS_WIN
@@ -1033,7 +1033,7 @@ static int tokenize( TQStringList& tokens, const TQString& str,
     return tokens.count();
 }
 
-TQString KStandardDirs::kde_default(const char *type) {
+TQString TDEStandardDirs::kde_default(const char *type) {
     if (!strcmp(type, "data"))
 	return "share/apps/";
     if (!strcmp(type, "html-bundle"))
@@ -1096,7 +1096,7 @@ TQString KStandardDirs::kde_default(const char *type) {
     return TQString::null;
 }
 
-TQString KStandardDirs::saveLocation(const char *type,
+TQString TDEStandardDirs::saveLocation(const char *type,
 				    const TQString& suffix,
 				    bool create) const
 {
@@ -1127,7 +1127,7 @@ TQString KStandardDirs::saveLocation(const char *type,
        else {
           dirs = absolutes.find(type);
           if (!dirs)
-             tqFatal("KStandardDirs: The resource type %s is not registered", type);
+             tqFatal("TDEStandardDirs: The resource type %s is not registered", type);
           pPath = new TQString(realPath(dirs->last()));
        }
 
@@ -1151,7 +1151,7 @@ TQString KStandardDirs::saveLocation(const char *type,
     return fullPath;
 }
 
-TQString KStandardDirs::relativeLocation(const char *type, const TQString &absPath)
+TQString TDEStandardDirs::relativeLocation(const char *type, const TQString &absPath)
 {
     TQString fullPath = absPath;
     int i = absPath.findRev('/');
@@ -1173,7 +1173,7 @@ TQString KStandardDirs::relativeLocation(const char *type, const TQString &absPa
 }
 
 
-bool KStandardDirs::makeDir(const TQString& dir, int mode)
+bool TDEStandardDirs::makeDir(const TQString& dir, int mode)
 {
     // we want an absolute path
     if (TQDir::isRelativePath(dir))
@@ -1254,9 +1254,9 @@ static TQString executablePrefix()
 }
 #endif
 
-TQString KStandardDirs::kfsstnd_defaultprefix()
+TQString TDEStandardDirs::kfsstnd_defaultprefix()
 {
-   KStandardDirsSingleton* s = KStandardDirsSingleton::self();
+   TDEStandardDirsSingleton* s = TDEStandardDirsSingleton::self();
    if (!s->defaultprefix.isEmpty())
       return s->defaultprefix;
 #ifdef Q_WS_WIN
@@ -1269,14 +1269,14 @@ TQString KStandardDirs::kfsstnd_defaultprefix()
    s->defaultprefix = TDEDIR;
 #endif
    if (s->defaultprefix.isEmpty()) {
-      fprintf(stderr, "KStandardDirs::kfsstnd_defaultprefix(): default TDE prefix not found!\n");
+      fprintf(stderr, "TDEStandardDirs::kfsstnd_defaultprefix(): default TDE prefix not found!\n");
    }
    return s->defaultprefix;
 }
 
-TQString KStandardDirs::kfsstnd_defaultbindir()
+TQString TDEStandardDirs::kfsstnd_defaultbindir()
 {
-   KStandardDirsSingleton* s = KStandardDirsSingleton::self();
+   TDEStandardDirsSingleton* s = TDEStandardDirsSingleton::self();
    if (!s->defaultbindir.isEmpty())
       return s->defaultbindir;
 #ifdef Q_WS_WIN
@@ -1287,12 +1287,12 @@ TQString KStandardDirs::kfsstnd_defaultbindir()
       s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #endif
    if (s->defaultbindir.isEmpty()) {
-      fprintf(stderr, "KStandardDirs::kfsstnd_defaultbindir(): default binary TDE dir not found!\n");
+      fprintf(stderr, "TDEStandardDirs::kfsstnd_defaultbindir(): default binary TDE dir not found!\n");
    }
   return s->defaultbindir;
 }
 
-void KStandardDirs::addKDEDefaults()
+void TDEStandardDirs::addKDEDefaults()
 {
     TQStringList tdedirList;
 
@@ -1459,10 +1459,10 @@ void KStandardDirs::addKDEDefaults()
     addResourceDir("locale", "/usr/share/locale-langpack/", true);
 }
 
-void KStandardDirs::checkConfig() const
+void TDEStandardDirs::checkConfig() const
 {
     if (!addedCustoms && TDEGlobal::_instance && TDEGlobal::_instance->_config)
-        const_cast<KStandardDirs*>(this)->addCustomized(TDEGlobal::_instance->_config);
+        const_cast<TDEStandardDirs*>(this)->addCustomized(TDEGlobal::_instance->_config);
 }
 
 static TQStringList lookupProfiles(const TQString &mapFile)
@@ -1534,7 +1534,7 @@ static TQStringList lookupProfiles(const TQString &mapFile)
 
 extern bool kde_kiosk_admin;
 
-bool KStandardDirs::addCustomized(TDEConfig *config)
+bool TDEStandardDirs::addCustomized(TDEConfig *config)
 {
     if (addedCustoms && !d->checkRestrictions) // there are already customized entries
         return false; // we just quit and hope they are the right ones
@@ -1666,19 +1666,19 @@ bool KStandardDirs::addCustomized(TDEConfig *config)
     return configDirsChanged;
 }
 
-TQString KStandardDirs::localtdedir() const
+TQString TDEStandardDirs::localtdedir() const
 {
     // Return the prefix to use for saving
     return prefixes.first();
 }
 
-TQString KStandardDirs::localxdgdatadir() const
+TQString TDEStandardDirs::localxdgdatadir() const
 {
     // Return the prefix to use for saving
     return d->xdgdata_prefixes.first();
 }
 
-TQString KStandardDirs::localxdgconfdir() const
+TQString TDEStandardDirs::localxdgconfdir() const
 {
     // Return the prefix to use for saving
     return d->xdgconf_prefixes.first();
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index b561c78d5..c07b9c682 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -29,7 +29,7 @@
 #include <kglobal.h>
 
 class TDEConfig;
-class KStandardDirsPrivate;
+class TDEStandardDirsPrivate;
 
 /**
  * @short Site-independent access to standard KDE directories.
@@ -45,12 +45,12 @@ class KStandardDirsPrivate;
  * and applications always refer to a file with a resource type
  * (e.g. icon) and a filename (e.g. khexdit.xpm). In an ideal world
  * the application would make no assumption where this file is and
- * leave it up to KStandardDirs::findResource("apps", "Home.desktop")
+ * leave it up to TDEStandardDirs::findResource("apps", "Home.desktop")
  * to apply this knowledge to return /opt/kde/share/applnk/Home.desktop
  * or ::locate("data", "kgame/background.jpg") to return
  * /opt/kde/share/apps/kgame/background.jpg
  *
- * The main idea behind KStandardDirs is that there are several
+ * The main idea behind TDEStandardDirs is that there are several
  * toplevel prefixes below which the files lie. One of these prefixes is
  * the one where the user installed tdelibs, one is where the
  * application was installed, and one is $HOME/.trinity, but there
@@ -61,7 +61,7 @@ class KStandardDirsPrivate;
  * So the search algorithm basically appends to each prefix each registered
  * suffix and tries to locate the file there.
  * To make the thing even more complex, it's also possible to register
- * absolute paths that KStandardDirs looks up after not finding anything
+ * absolute paths that TDEStandardDirs looks up after not finding anything
  * in the former steps. They can be useful if the user wants to provide
  * specific directories that aren't in his $HOME/.trinity directory for,
  * for example, icons.
@@ -97,13 +97,13 @@ class KStandardDirsPrivate;
  * So while you had to ::locate("data", "appname/filename") so you can
  * also write ::locate("appdata", "filename") if your TDEApplication instance
  * is called "appname" (as set via TDEApplication's constructor or TDEAboutData, if
- * you use the global KStandardDirs object TDEGlobal::dirs()).
+ * you use the global TDEStandardDirs object TDEGlobal::dirs()).
  * Please note though that you cannot use the "appdata"
  * type if you intend to use it in an applet for Kicker because 'appname' would
  * be "Kicker" instead of the applet's name. Therefore, for applets, you've got
  * to work around this by using ::locate("data", "appletname/filename").
  *
- * <b>KStandardDirs supports the following environment variables:</b>
+ * <b>TDEStandardDirs supports the following environment variables:</b>
  *
  * @li TDEDIRS: This may set an additional number of directory prefixes to
  *          search for resources. The directories should be separated
@@ -122,18 +122,18 @@ class KStandardDirsPrivate;
  *
  * @see TDEGlobalSettings
  */
-class TDECORE_EXPORT KStandardDirs
+class TDECORE_EXPORT TDEStandardDirs
 {
 public:
         /**
-	 * KStandardDirs' constructor. It just initializes the caches.
+	 * TDEStandardDirs' constructor. It just initializes the caches.
 	 **/
-	KStandardDirs( );
+	TDEStandardDirs( );
 
 	/**
-	 * KStandardDirs' destructor.
+	 * TDEStandardDirs' destructor.
 	 */
-	virtual ~KStandardDirs();
+	virtual ~TDEStandardDirs();
 
 	/**
 	 * Adds another search dir to front of the @p fsstnd list.
@@ -211,7 +211,7 @@ public:
 	 *
 	 * The filename should be a filename relative to the base dir
 	 * for resources. So is a way to get the path to libtdecore.la
-	 * to findResource("lib", "libtdecore.la"). KStandardDirs will
+	 * to findResource("lib", "libtdecore.la"). TDEStandardDirs will
 	 * then look into the subdir lib of all elements of all prefixes
 	 * ($TDEDIRS) for a file libtdecore.la and return the path to
 	 * the first one it finds (e.g. /opt/kde/lib/libtdecore.la)
@@ -443,7 +443,7 @@ public:
 	TQStringList resourceDirs(const char *type) const;
 
 	/**
-	 * This function will return a list of all the types that KStandardDirs
+	 * This function will return a list of all the types that TDEStandardDirs
 	 * supports.
 	 *
 	 * @return All types that KDE supports
@@ -545,7 +545,7 @@ public:
 	TQString kfsstnd_xdg_data_prefixes();
 
 	/**
-	 * Returns the toplevel directory in which KStandardDirs
+	 * Returns the toplevel directory in which TDEStandardDirs
 	 * will store things. Most likely $HOME/.trinity
 	 * Don't use this function if you can use locateLocal
 	 * @return the toplevel directory
@@ -617,13 +617,13 @@ public:
 	mutable TQDict<TQString> savelocations;
 
 	// Disallow assignment and copy-construction
-	KStandardDirs( const KStandardDirs& );
-	KStandardDirs& operator= ( const KStandardDirs& );
+	TDEStandardDirs( const TDEStandardDirs& );
+	TDEStandardDirs& operator= ( const TDEStandardDirs& );
 
 	bool addedCustoms;
 
-	class KStandardDirsPrivate;
-	KStandardDirsPrivate *d;
+	class TDEStandardDirsPrivate;
+	TDEStandardDirsPrivate *d;
 
 	void checkConfig() const;
 	void applyDataRestrictions(const TQString &) const;
@@ -696,14 +696,14 @@ public:
  **/
 
 /*!
- * \relates KStandardDirs
+ * \relates TDEStandardDirs
  * This function is just for convenience. It simply calls
- *instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename).
+ *instance->dirs()->\link TDEStandardDirs::findResource() findResource\endlink(type, filename).
  **/
 TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::instance() );
 
 /*!
- * \relates KStandardDirs
+ * \relates TDEStandardDirs
  * This function is much like locate. However it returns a
  * filename suitable for writing to. No check is made if the
  * specified filename actually exists. Missing directories
@@ -714,7 +714,7 @@ TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, cons
 TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::instance() );
 
 /*!
- * \relates KStandardDirs
+ * \relates TDEStandardDirs
  * This function is much like locate. No check is made if the
  * specified filename actually exists. Missing directories
  * are created if @p createDir is true. If filename is only
diff --git a/tdecore/ktempdir.h b/tdecore/ktempdir.h
index de4b97f6c..33bb825d0 100644
--- a/tdecore/ktempdir.h
+++ b/tdecore/ktempdir.h
@@ -45,7 +45,7 @@ class KTempDirPrivate;
  *
  * KTempFile does not create any missing directories, but locateLocal() does.
  *
- * See also KStandardDirs
+ * See also TDEStandardDirs
  *
  * @since 3.2
  * @author Joseph Wenninger <jowenn@kde.org>
diff --git a/tdecore/ktempfile.h b/tdecore/ktempfile.h
index 38cd8b5aa..abc78ffbf 100644
--- a/tdecore/ktempfile.h
+++ b/tdecore/ktempfile.h
@@ -48,7 +48,7 @@ class KTempFilePrivate;
  *
  * KTempFile does not create any missing directories, but locateLocal() does.
  *
- * See also KStandardDirs
+ * See also TDEStandardDirs
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index 41075685e..dd5e33f23 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -317,7 +317,7 @@ namespace
   {
     if (herrno)
       {
-	tqDebug("KStandardWorker::processResults: got error %d", herrno);
+	tqDebug("TDEStandardWorker::processResults: got error %d", herrno);
 	switch (herrno)
 	  {
 	  case HOST_NOT_FOUND:
@@ -368,9 +368,9 @@ namespace
       {
 	sa.setHost(KIpAddress(he->h_addr_list[i], he->h_addrtype == AF_INET ? 4 : 6));
 	results.prepend(KResolverEntry(sa, socktype, proto, canon, m_hostname));
-	// tqDebug("KStandardWorker::processResults: adding %s", sa.toString().latin1());
+	// tqDebug("TDEStandardWorker::processResults: adding %s", sa.toString().latin1());
       }
-    //  tqDebug("KStandardWorker::processResults: added %d entries", i);
+    //  tqDebug("TDEStandardWorker::processResults: added %d entries", i);
   }
 
 #else  // HAVE_GETADDRINFO
@@ -540,7 +540,7 @@ namespace
 #endif // HAVE_GETADDRINFO
 } // namespace
 
-bool KStandardWorker::sanityCheck()
+bool TDEStandardWorker::sanityCheck()
 {
   // check that the requested values are sensible
 
@@ -580,7 +580,7 @@ bool KStandardWorker::sanityCheck()
   return true;			// it's sane
 }
 
-bool KStandardWorker::resolveScopeId()
+bool TDEStandardWorker::resolveScopeId()
 {
   // we must test the original name, not the encoded one
   scopeid = 0;
@@ -606,7 +606,7 @@ bool KStandardWorker::resolveScopeId()
   return true;
 }
 
-bool KStandardWorker::resolveService()
+bool TDEStandardWorker::resolveService()
 {
   // find the service first
   bool ok;
@@ -656,7 +656,7 @@ bool KStandardWorker::resolveService()
   return true;
 }
 
-KResolver::ErrorCodes KStandardWorker::addUnix()
+KResolver::ErrorCodes TDEStandardWorker::addUnix()
 {
   // before trying to add, see if the user wants Unix sockets
   if ((familyMask() & KResolver::UnixFamily) == 0)
@@ -691,7 +691,7 @@ KResolver::ErrorCodes KStandardWorker::addUnix()
   return KResolver::NoError;
 }
 
-bool KStandardWorker::resolveNumerically()
+bool TDEStandardWorker::resolveNumerically()
 {
   // if the NoResolve flag is active, our result from this point forward
   // will always be true, even if the resolution failed.
@@ -793,7 +793,7 @@ bool KStandardWorker::resolveNumerically()
   return ok || (flags() & KResolver::NoResolve);
 }
 
-bool KStandardWorker::preprocess()
+bool TDEStandardWorker::preprocess()
 {
   // check sanity
   if (!sanityCheck())
@@ -841,7 +841,7 @@ bool KStandardWorker::preprocess()
   return true;			// it's ok
 }
 
-bool KStandardWorker::run()
+bool TDEStandardWorker::run()
 {
 #ifndef HAVE_GETADDRINFO
   // check the scope id first
@@ -900,7 +900,7 @@ bool KStandardWorker::run()
   return true;
 }
 
-bool KStandardWorker::postprocess()
+bool TDEStandardWorker::postprocess()
 {
   if (results.count())
     return true;		// no need
@@ -1020,7 +1020,7 @@ bool KGetAddrinfoWorker::wantThis(int family)
 void KNetwork::Internal::initStandardWorkers()
 {
   //KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KBlacklistWorker>);
-  KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KStandardWorker>);
+  KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<TDEStandardWorker>);
 
 #ifdef HAVE_GETADDRINFO
   KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KGetAddrinfoWorker>);
diff --git a/tdecore/network/kresolverstandardworkers_p.h b/tdecore/network/kresolverstandardworkers_p.h
index 2db460bef..95d21bbc0 100644
--- a/tdecore/network/kresolverstandardworkers_p.h
+++ b/tdecore/network/kresolverstandardworkers_p.h
@@ -62,7 +62,7 @@ namespace KNetwork { namespace Internal
   /** @internal
    * Standard worker.
    */
-  class KStandardWorker: public KNetwork::KResolverWorkerBase
+  class TDEStandardWorker: public KNetwork::KResolverWorkerBase
   {
   protected:
     mutable TQCString m_encodedName;
@@ -90,7 +90,7 @@ namespace KNetwork { namespace Internal
    *
    * This class does not do post-processing.
    */
-  class KGetAddrinfoWorker: public KStandardWorker
+  class KGetAddrinfoWorker: public TDEStandardWorker
   {
   public:
     KGetAddrinfoWorker()
diff --git a/tdecore/tdeconfig.cpp b/tdecore/tdeconfig.cpp
index bef3d7944..28f25e61a 100644
--- a/tdecore/tdeconfig.cpp
+++ b/tdecore/tdeconfig.cpp
@@ -63,7 +63,7 @@ TDEConfig::TDEConfig( const TQString& fileName,
   // read initial information off disk
   reparseConfiguration();
 
-  // we let KStandardDirs add custom user config files. It will do
+  // we let TDEStandardDirs add custom user config files. It will do
   // this only once. So only the first call ever to this constructor
   // will anything else than return here We have to reparse here as
   // configuration files may appear after customized directories have
diff --git a/tdecore/tdeconfig.h b/tdecore/tdeconfig.h
index 59f784107..19cd3bdf5 100644
--- a/tdecore/tdeconfig.h
+++ b/tdecore/tdeconfig.h
@@ -57,7 +57,7 @@ public:
    *        object will automatically become read-only if either the user does not have
    *        write permission to @p fileName or if no file was specified.
    * @param bUseKDEGlobals Toggle reading the global KDE configuration file.
-   * @param resType the place to look in (config, data, etc) See KStandardDirs.
+   * @param resType the place to look in (config, data, etc) See TDEStandardDirs.
    */
   TDEConfig( const TQString& fileName = TQString::null,
           bool bReadOnly = false, bool bUseKDEGlobals = true, const char *resType="config");
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index 5074f8d22..e48bd8cc9 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -333,7 +333,7 @@ bool TDEConfigINIBackEnd::parseConfigFiles()
         KURL path;
         path.setPath(mLocalFileName);
         TQString dir=path.directory();
-        KStandardDirs::makeDir(dir);
+        TDEStandardDirs::makeDir(dir);
 
         if (checkAccess(mLocalFileName, W_OK))
         {
@@ -806,7 +806,7 @@ void TDEConfigINIBackEnd::sync(bool bMerge)
        KURL path;
        path.setPath(mLocalFileName);
        TQString dir=path.directory();
-       KStandardDirs::makeDir(dir);
+       TDEStandardDirs::makeDir(dir);
     }
 
     // Can we allow the write? We can, if the program
@@ -1177,7 +1177,7 @@ bool TDEConfigBackEnd::checkConfigFilesWritable(bool warnUser)
   {
     // Note: We don't ask the user if we should not ask this question again because we can't save the answer.
     errorMsg += i18n("Please contact your system administrator.");
-    TQString cmdToExec = KStandardDirs::findExe(TQString("kdialog"));
+    TQString cmdToExec = TDEStandardDirs::findExe(TQString("kdialog"));
     TDEApplication *app = kapp;
     if (!cmdToExec.isEmpty() && app)
     {
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp
index 5044aab8e..d0164a3b2 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehardwaredevices.cpp
@@ -2764,7 +2764,7 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ
 	return disktype;
 }
 
-	// KStandardDirs::kde_default
+	// TDEStandardDirs::kde_default
 
 typedef TQMap<TQString, TQString> TDEConfigMap;
 
diff --git a/tdecore/tdesycoca.h b/tdecore/tdesycoca.h
index bf41da415..4b43d4607 100644
--- a/tdecore/tdesycoca.h
+++ b/tdecore/tdesycoca.h
@@ -136,7 +136,7 @@ public:
    /**
     * When you receive a "databaseChanged" signal, you can query here if
     * a change has occurred in a specific resource type.
-    * @see KStandardDirs for the various resource types.
+    * @see TDEStandardDirs for the various resource types.
     */
    static bool isChanged(const char *type);
 
diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/kstddirstest.cpp
index 399282f14..75c326280 100644
--- a/tdecore/tests/kstddirstest.cpp
+++ b/tdecore/tests/kstddirstest.cpp
@@ -7,7 +7,7 @@
 int main(int argc, char **argv)
 {
   TDEApplication a(argc, argv, "whatever", false);
-  KStandardDirs t;
+  TDEStandardDirs t;
   TDEConfig config; // to add custom entries - a bit tricky :/
 
   TQStringList list;