Rename KStandard for enhanced compatibility with KDE4

84 files changed, 244 insertions, 244 deletions

diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index cd97d0cc5..add7a7595 100644
--- a/arts/kde/kartsserver.cpp
+++ b/arts/kde/kartsserver.cpp
@@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)
 
 	X11CommConfig.sync();
 	
-	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper"))).data();
+	proc << TQFile::encodeName(TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper"))).data();
 
 	if(rt)
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data();
+		proc << TQFile::encodeName(TDEStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data();
 	else
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))).data();
+		proc << TQFile::encodeName(TDEStandardDirs::findExe(TQString::fromLatin1("artsd"))).data();
 
 	proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
 
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 71006c1a7..4cc9a2553 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -296,7 +296,7 @@ void KNotify::loadConfig() {
         players << "wavplay" << "aplay" << "auplay";
         TQStringList::Iterator it = players.begin();
         while ( d->externalPlayer.isEmpty() && it != players.end() ) {
-            d->externalPlayer = KStandardDirs::findExe( *it );
+            d->externalPlayer = TDEStandardDirs::findExe( *it );
             ++it;
         }
     }
diff --git a/kabc/tdeab2tdeabc.cpp b/kabc/tdeab2tdeabc.cpp
index afb688078..6ee33b895 100644
--- a/kabc/tdeab2tdeabc.cpp
+++ b/kabc/tdeab2tdeabc.cpp
@@ -127,7 +127,7 @@ void importKMailAddressBook( KABC::AddressBook *ab )
     cfg.setGroup( "Addressbook" );
     fileName = cfg.readPathEntry( "default", fileName );
   }
-  if ( !KStandardDirs::exists( fileName ) ) {
+  if ( !TDEStandardDirs::exists( fileName ) ) {
     kdDebug(5700) << "Couldn't find KMail addressbook." << endl;
     return;
   }
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index b00b3553d..e2dc603ba 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -767,7 +767,7 @@ VFolderMenu::locateMenuFile(const TQString &fileName)
 {
    if (!TQDir::isRelativePath(fileName))
    {
-      if (KStandardDirs::exists(fileName))
+      if (TDEStandardDirs::exists(fileName))
          return fileName;
       return TQString::null;
    }
@@ -808,7 +808,7 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName)
 
    if (!TQDir::isRelativePath(fileName))
    {
-      if (KStandardDirs::exists(fileName))
+      if (TDEStandardDirs::exists(fileName))
          return fileName;
       return TQString::null;
    }
@@ -820,7 +820,7 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName)
        ++it)
    {
       tmp = (*it)+fileName;
-      if (KStandardDirs::exists(tmp))
+      if (TDEStandardDirs::exists(tmp))
          return tmp;
    }
 
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 034218546..952e3f48f 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -163,7 +163,7 @@ int main(int argc, char **argv) {
         exe = XMLLINT;
 #endif
         if ( (::access( TQFile::encodeName( exe ), X_OK )!=0) ) {
-            exe = KStandardDirs::findExe( "xmllint" );
+            exe = TDEStandardDirs::findExe( "xmllint" );
             if (exe.isEmpty())
                 exe = locate( "exe", "xmllint" );
         }
diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp
index d6d5f285a..d9f306b43 100644
--- a/kdoctools/tdeio_help.cpp
+++ b/kdoctools/tdeio_help.cpp
@@ -190,7 +190,7 @@ void HelpProtocol::get( const KURL& url )
       }
     } else {
         TQString docbook_file = file.left(file.findRev('/')) + "/index.docbook";
-        if (!KStandardDirs::exists(file)) {
+        if (!TDEStandardDirs::exists(file)) {
             file = docbook_file;
         } else {
             TQFileInfo fi(file);
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index d143e0a06..2eb03cfbc 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -114,7 +114,7 @@ xmlParserInputPtr meinExternalEntityLoader(const char *URL, const char *ID,
 	URL = "docbook/xml-dtd-4.1.2/docbookx.dtd";
 
     TQString file;
-    if (KStandardDirs::exists( TQDir::currentDirPath() + "/" + URL ) )
+    if (TDEStandardDirs::exists( TQDir::currentDirPath() + "/" + URL ) )
         file = TQDir::currentDirPath() + "/" + URL;
     else
         file = locate("dtd", URL);
@@ -186,7 +186,7 @@ void fillInstance(TDEInstance &ins, const TQString &srcdir) {
         catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog");
         catalogs += ':';
         catalogs += ins.dirs()->findResource("data", "ksgmltools2/docbook/xml-dtd-4.2/docbook.cat");
-        ins.dirs()->addResourceType("dtd", KStandardDirs::kde_default("data") + "ksgmltools2");
+        ins.dirs()->addResourceType("dtd", TDEStandardDirs::kde_default("data") + "ksgmltools2");
     } else {
         catalogs += srcdir +"/customization/catalog:" + srcdir + "/docbook/xml-dtd-4.2/docbook.cat";
         ins.dirs()->addResourceDir("dtd", srcdir);
diff --git a/kinit/tdedostartupconfig.cpp b/kinit/tdedostartupconfig.cpp
index d964a900b..bbfdf88a4 100644
--- a/kinit/tdedostartupconfig.cpp
+++ b/kinit/tdedostartupconfig.cpp
@@ -132,7 +132,7 @@ int main()
              ++it )
             {
             TQString cfg = *it + "share/config/" + file;
-            if( KStandardDirs::exists( cfg ))
+            if( TDEStandardDirs::exists( cfg ))
                 startupconfigfiles << cfg << "\n";
             else
                 startupconfigfiles << "!" << cfg << "\n";
diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp
index be1d404b2..aa94559b9 100644
--- a/knewstuff/knewstuffgeneric.cpp
+++ b/knewstuff/knewstuffgeneric.cpp
@@ -134,7 +134,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry )
 {
   TQString file = destinationPath(entry);
 
-  if ( KStandardDirs::exists( file ) ) {
+  if ( TDEStandardDirs::exists( file ) ) {
     int result = KMessageBox::warningContinueCancel( parentWidget(),
         i18n("The file '%1' already exists. Do you want to overwrite it?")
         .arg( file ),
diff --git a/kstyles/kthemestyle/kstyledirs.cpp b/kstyles/kthemestyle/kstyledirs.cpp
index 7e548d0d5..0128dac28 100644
--- a/kstyles/kthemestyle/kstyledirs.cpp
+++ b/kstyles/kthemestyle/kstyledirs.cpp
@@ -1,7 +1,7 @@
 /*
  $Id$
 
- Simple helper routines for style's use of KStandardDirs with TQSettings, etc.
+ Simple helper routines for style's use of TDEStandardDirs with TQSettings, etc.
 
  This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -29,8 +29,8 @@ KStyleDirs* KStyleDirs::instance = 0;
 
 KStyleDirs::KStyleDirs()
 {
-    addResourceType( "themepixmap", KStandardDirs::kde_default( "data" ) + "kstyle/pixmaps/" );
-    addResourceType( "themerc", KStandardDirs::kde_default( "data" ) + "kstyle/themes/" );
+    addResourceType( "themepixmap", TDEStandardDirs::kde_default( "data" ) + "kstyle/pixmaps/" );
+    addResourceType( "themerc", TDEStandardDirs::kde_default( "data" ) + "kstyle/themes/" );
 }
 
 KStyleDirs::~KStyleDirs()
diff --git a/kstyles/kthemestyle/kstyledirs.h b/kstyles/kthemestyle/kstyledirs.h
index 9d2635136..79887cce1 100644
--- a/kstyles/kthemestyle/kstyledirs.h
+++ b/kstyles/kthemestyle/kstyledirs.h
@@ -30,16 +30,16 @@
 /**
 * @short Access to the standard KDE directories for the pixmap style
 * @author Maksim Orlovich<mo002j@mail.rochester.edu> is responsible for this file,
-    but all the interesting work is done by KStandardDirs
+    but all the interesting work is done by TDEStandardDirs
 * @version $Id$
 *
-* This class provides a this wrapper for styles around KStandardDirs,
+* This class provides a this wrapper for styles around TDEStandardDirs,
 * permitting integration with TQSettings and easy loading of pixmaps
 *
 * It add share/apps/kstyle/themes as "themerc",
 *    share/apps/kstyle/pixmaps "themepixmap"
 */
-class KStyleDirs: public KStandardDirs
+class KStyleDirs: public TDEStandardDirs
 {
 public:
     static KStyleDirs* dirs()
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;
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 5803b1ca3..62c93079e 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -883,7 +883,7 @@ void TDEHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
             {
                 // then find the download manager location
                 kdDebug(1000) << "Using: "<<downloadManger <<" as Download Manager" <<endl;
-                TQString cmd = KStandardDirs::findExe(downloadManger);
+                TQString cmd = TDEStandardDirs::findExe(downloadManger);
                 if (cmd.isEmpty())
                 {
                     TQString errMsg=i18n("The Download Manager (%1) could not be found in your $PATH ").arg(downloadManger);
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 1cea041ee..d05591f48 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -479,7 +479,7 @@ int main(int argc, char *argv[])
 
     if (args->isSet("xvfb"))
     {
-        TQString xvfbPath = KStandardDirs::findExe("Xvfb");
+        TQString xvfbPath = TDEStandardDirs::findExe("Xvfb");
         if ( xvfbPath.isEmpty() ) {
             fprintf( stderr, "[test_regression] ERROR: We need Xvfb to be installed for reliable results\n" );
             exit( 1 );
diff --git a/tdeio/kssl/ksslcertificate.cc b/tdeio/kssl/ksslcertificate.cc
index 8e2192f7d..e7310ccdc 100644
--- a/tdeio/kssl/ksslcertificate.cc
+++ b/tdeio/kssl/ksslcertificate.cc
@@ -93,7 +93,7 @@ public:
 KSSLCertificate::KSSLCertificate() {
 	d = new KSSLCertificatePrivate;
 	d->m_stateCached = false;
-	TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", TDEStandardDirs::kde_default("data") + "kssl");
 	#ifdef KSSL_HAVE_SSL
 		d->m_cert = NULL;
 	#endif
@@ -103,7 +103,7 @@ KSSLCertificate::KSSLCertificate() {
 KSSLCertificate::KSSLCertificate(const KSSLCertificate& x) {
 	d = new KSSLCertificatePrivate;
 	d->m_stateCached = false;
-	TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", TDEStandardDirs::kde_default("data") + "kssl");
 	#ifdef KSSL_HAVE_SSL
 		d->m_cert = NULL;
 		setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert()));
diff --git a/tdeio/kssl/ksslkeygen.cc b/tdeio/kssl/ksslkeygen.cc
index 541c63f02..669a76cee 100644
--- a/tdeio/kssl/ksslkeygen.cc
+++ b/tdeio/kssl/ksslkeygen.cc
@@ -166,7 +166,7 @@ int KSSLKeyGen::generateCSR(const TQString& name, const TQString& pass, int bits
 	// back from there.  Yes it's inefficient, but it doesn't happen
 	// often and this way things are uniform.
   
-	TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", TDEStandardDirs::kde_default("data") + "kssl");
 
 	TQString path = TDEGlobal::dirs()->saveLocation("kssl");
 	KTempFile csrFile(path + "csr_", ".der");
diff --git a/tdeio/kssl/ksslsettings.cc b/tdeio/kssl/ksslsettings.cc
index eb91ea9cb..9895a702b 100644
--- a/tdeio/kssl/ksslsettings.cc
+++ b/tdeio/kssl/ksslsettings.cc
@@ -98,7 +98,7 @@ KSSLSettings::KSSLSettings(bool readConfig) {
   d = new KSSLSettingsPrivate;
   m_cfg = new TDEConfig("cryptodefaults", false, false);
 
-  if (!TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) {
+  if (!TDEGlobal::dirs()->addResourceType("kssl", TDEStandardDirs::kde_default("data") + "kssl")) {
     //kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl;
   }
 
diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index aa561cc8b..d41041636 100644
--- a/tdeio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -117,7 +117,7 @@ KSSLD::KSSLD(const TQCString &name) : KDEDModule(name)
 	if (2 != cfg->readNumEntry("policies version", 0)) {
 		::updatePoliciesConfig(cfg);
 	}
-	TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", TDEStandardDirs::kde_default("data") + "kssl");
 	caVerifyUpdate();
 	cacheLoadDefaultPolicies();
 	certList.setAutoDelete(false);
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index a9639ae3d..ad56ca017 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -374,7 +374,7 @@ Application * KNotifyWidget::addApplicationEvents( const TQString& path )
     kdDebug() << "**** knotify: adding path: " << path << endl;
     TQString relativePath = path;
 
-    if ( path.at(0) == '/' && KStandardDirs::exists( path ) )
+    if ( path.at(0) == '/' && TDEStandardDirs::exists( path ) )
         relativePath = makeRelative( path );
 
     if ( !relativePath.isEmpty() )
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp
index d05a94541..ea97b8661 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.cpp
+++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp
@@ -41,7 +41,7 @@ KFileBookmarkHandler::KFileBookmarkHandler( KFileDialog *dialog )
     KBookmarkManager *manager = KBookmarkManager::managerForFile( file, false);
 
     // import old bookmarks
-    if ( !KStandardDirs::exists( file ) ) {
+    if ( !TDEStandardDirs::exists( file ) ) {
         TQString oldFile = locate( "data", "tdefile/bookmarks.html" );
         if ( !oldFile.isEmpty() )
             importOldBookmarks( oldFile, manager );
diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp
index 8e6f9e650..d64918b4f 100644
--- a/tdeio/tdefile/tdefilesharedlg.cpp
+++ b/tdeio/tdefile/tdefilesharedlg.cpp
@@ -237,7 +237,7 @@ void KFileSharePropsPlugin::slotConfigureFileSharing()
     if (d->m_configProc) return;
 
     d->m_configProc = new TDEProcess(this);
-    (*d->m_configProc) << KStandardDirs::findExe("tdesu") << locate("exe", "tdecmshell") << "fileshare";
+    (*d->m_configProc) << TDEStandardDirs::findExe("tdesu") << locate("exe", "tdecmshell") << "fileshare";
     if (!d->m_configProc->start( TDEProcess::NotifyOnExit ))
     {
        delete d->m_configProc;
diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp
index f639a7049..4285e3ec7 100644
--- a/tdeio/tdeio/kmimemagic.cpp
+++ b/tdeio/tdeio/kmimemagic.cpp
@@ -528,7 +528,7 @@ public:
         tmpDirs << TQString::fromLatin1("/tmp"); // default value
 
         // The trick is that we also don't want the user to override globally set
-        // directories. So we have to misuse KStandardDirs :}
+        // directories. So we have to misuse TDEStandardDirs :}
         TQStringList confDirs = TDEGlobal::dirs()->resourceDirs( "config" );
         if ( !confDirs.isEmpty() )
         {
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index c3643c2d9..243388cbc 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -79,7 +79,7 @@ void KMimeType::buildDefaultType()
   else
   {
      errorMissingMimeType( defaultMimeType() );
-     KStandardDirs stdDirs;
+     TDEStandardDirs stdDirs;
      TQString sDefaultMimeType = stdDirs.resourceDirs("mime").first()+defaultMimeType()+".desktop";
      s_pDefaultType = new KMimeType( sDefaultMimeType, defaultMimeType(),
                                      "unknown", "mime", TQStringList() );
@@ -605,9 +605,9 @@ TQString KFolderType::icon( const KURL& _url, bool _is_local ) const
   u.addPath( ".directory" );
 
   TQString icon;
-  // using KStandardDirs as this one checks for path being
+  // using TDEStandardDirs as this one checks for path being
   // a file instead of a directory
-  if ( KStandardDirs::exists( u.path() ) )
+  if ( TDEStandardDirs::exists( u.path() ) )
   {
     KSimpleConfig cfg( u.path(), true );
     cfg.setDesktopGroup();
@@ -985,7 +985,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices
   if ( cfg.hasKey( "TryExec" ) )
   {
       TQString tryexec = cfg.readPathEntry( "TryExec" );
-      TQString exe =  KStandardDirs::findExe( tryexec );
+      TQString exe =  TDEStandardDirs::findExe( tryexec );
       if (exe.isEmpty()) {
           return result;
       }
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index 5810bdda4..ff6f6bbb1 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -1549,7 +1549,7 @@ TDEProcessRunner::slotProcessExited(TDEProcess * p)
     // We can't just rely on that, but it's a good hint.
     // Before assuming its really so, we'll try to find the binName
     // relatively to current directory,  and then in the PATH.
-    if ( !TQFile( binName ).exists() && KStandardDirs::findExe( binName ).isEmpty() )
+    if ( !TQFile( binName ).exists() && TDEStandardDirs::findExe( binName ).isEmpty() )
     {
       kapp->ref();
       KMessageBox::sorry( 0L, i18n("Could not find the program '%1'").arg( binName ) );
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index 2a24743ab..29ce88859 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -202,10 +202,10 @@ KService::init( KDesktopFile *config )
   } else if (config->readBoolEntry("X-TDE-SubstituteUID")) {
     int space = m_strExec.find(" ");
     if (space==-1)
-      m_strExec = KStandardDirs::findExe(m_strExec);
+      m_strExec = TDEStandardDirs::findExe(m_strExec);
     else {
       const TQString command = m_strExec.left(space);
-      m_strExec.replace(command,KStandardDirs::findExe(command));
+      m_strExec.replace(command,TDEStandardDirs::findExe(command));
     }
   }
 
diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp
index 539d88bea..b5a428eee 100644
--- a/tdeio/tdeio/previewjob.cpp
+++ b/tdeio/tdeio/previewjob.cpp
@@ -253,7 +253,7 @@ void PreviewJob::startPreview()
         if (d->width <= 128 && d->height <= 128) d->cacheWidth = d->cacheHeight = 128;
         else d->cacheWidth = d->cacheHeight = 256;
         d->thumbPath = d->thumbRoot + (d->cacheWidth == 128 ? "normal/" : "large/");
-        KStandardDirs::makeDir(d->thumbPath, 0700);
+        TDEStandardDirs::makeDir(d->thumbPath, 0700);
     }
     else
         d->bSave = false;
diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp
index fe6e0bd15..16e281c16 100644
--- a/tdeio/tdeio/tdefileshare.cpp
+++ b/tdeio/tdeio/tdefileshare.cpp
@@ -242,7 +242,7 @@ TQString KFileShare::findExe( const char* exeName )
 {
    // /usr/sbin on Mandrake, $PATH allows flexibility for other distributions
    TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::fromLatin1(":/usr/sbin");
-   TQString exe = KStandardDirs::findExe( exeName, path );
+   TQString exe = TDEStandardDirs::findExe( exeName, path );
    if (exe.isEmpty())
        kdError() << exeName << " not found in " << path << endl;
    return exe;
diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp
index 473ba6840..8e9785c24 100644
--- a/tdeio/tests/kurifiltertest.cpp
+++ b/tdeio/tests/kurifiltertest.cpp
@@ -305,11 +305,11 @@ int main(int argc, char **argv)
     }
 
     filter( "$TDEHOME/share", tdehome+"/share", KURIFilterData::LOCAL_DIR );
-    KStandardDirs::makeDir( tdehome+"/a+plus" );
+    TDEStandardDirs::makeDir( tdehome+"/a+plus" );
     filter( "$TDEHOME/a+plus", tdehome+"/a+plus", KURIFilterData::LOCAL_DIR );
 
     // BR 27788
-    KStandardDirs::makeDir( tdehome+"/share/Dir With Space" );
+    TDEStandardDirs::makeDir( tdehome+"/share/Dir With Space" );
     filter( "$TDEHOME/share/Dir With Space", tdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR );
 
     // support for name filters (BR 93825)
@@ -318,11 +318,11 @@ int main(int argc, char **argv)
     filter( "$TDEHOME/a?c.txt", tdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR );
     filter( "$TDEHOME/?c.txt", tdehome+"/?c.txt", KURIFilterData::LOCAL_DIR );
     // but let's check that a directory with * in the name still works
-    KStandardDirs::makeDir( tdehome+"/share/Dir*With*Stars" );
+    TDEStandardDirs::makeDir( tdehome+"/share/Dir*With*Stars" );
     filter( "$TDEHOME/share/Dir*With*Stars", tdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR );
-    KStandardDirs::makeDir( tdehome+"/share/Dir?QuestionMark" );
+    TDEStandardDirs::makeDir( tdehome+"/share/Dir?QuestionMark" );
     filter( "$TDEHOME/share/Dir?QuestionMark", tdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR );
-    KStandardDirs::makeDir( tdehome+"/share/Dir[Bracket" );
+    TDEStandardDirs::makeDir( tdehome+"/share/Dir[Bracket" );
     filter( "$TDEHOME/share/Dir[Bracket", tdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR );
 
     filter( "$HOME/$TDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp
index 45f94ac3c..7166f3e35 100644
--- a/tdeio/tests/tdesycocatest.cpp
+++ b/tdeio/tests/tdesycocatest.cpp
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
 
    //
    debug("\nTrying findByURL for $TDEDIR/bin/kdesktop");
-   KMimeType::Ptr mf  = KMimeType::findByURL( KStandardDirs::findExe( "kdesktop" ), 0,
+   KMimeType::Ptr mf  = KMimeType::findByURL( TDEStandardDirs::findExe( "kdesktop" ), 0,
 				 true, false );
    assert( mf );
    check( "A binary's mimetype", mf->name(), "application/x-executable" );
diff --git a/tdeioslave/file/file.cc b/tdeioslave/file/file.cc
index c8112c3b5..61be4a521 100644
--- a/tdeioslave/file/file.cc
+++ b/tdeioslave/file/file.cc
@@ -1677,7 +1677,7 @@ bool FileProtocol::pmount(const TQString &dev)
 
 bool FileProtocol::pumount(const TQString &point)
 {
-    TQString real_point = KStandardDirs::realPath(point);
+    TQString real_point = TDEStandardDirs::realPath(point);
 
     KMountPoint::List mtab = KMountPoint::currentMountPoints();
 
@@ -1690,10 +1690,10 @@ bool FileProtocol::pumount(const TQString &point)
     {
         TQString tmp = (*it)->mountedFrom();
         TQString mp = (*it)->mountPoint();
-        mp = KStandardDirs::realPath(mp);
+        mp = TDEStandardDirs::realPath(mp);
 
         if (mp==real_point)
-            dev = KStandardDirs::realPath(tmp);
+            dev = TDEStandardDirs::realPath(tmp);
     }
 
     if (dev.isEmpty()) return false;
diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp
index 96de9f904..34f4c21c9 100644
--- a/tdeparts/browserrun.cpp
+++ b/tdeparts/browserrun.cpp
@@ -384,7 +384,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
         {
             // then find the download manager location
             kdDebug(1000) << "Using: "<<downloadManger <<" as Download Manager" <<endl;
-            TQString cmd=KStandardDirs::findExe(downloadManger);
+            TQString cmd=TDEStandardDirs::findExe(downloadManger);
             if (cmd.isEmpty())
             {
                 TQString errMsg=i18n("The Download Manager (%1) could not be found in your $PATH ").arg(downloadManger);
diff --git a/tdeparts/genericfactory.h b/tdeparts/genericfactory.h
index 40e61be9f..75a5292ed 100644
--- a/tdeparts/genericfactory.h
+++ b/tdeparts/genericfactory.h
@@ -78,7 +78,7 @@ namespace KParts
      *
      * For advanced use you can also inherit from the template and re-implement additionally the
      * virtual TDEInstance *createInstance() method, for example in case you want to extend the
-     * paths of your instance's KStandardDirs object.
+     * paths of your instance's TDEStandardDirs object.
      *
      * If a KParts::ReadOnlyPart is requested through this factory and the template argument
      * implements a KParts::ReadWritePart then setReadWrite( false ) will automatically be
diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp
index e0fd4e138..034dc00b4 100644
--- a/tdeparts/part.cpp
+++ b/tdeparts/part.cpp
@@ -113,7 +113,7 @@ void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins )
   TDEGlobal::locale()->insertCatalogue( inst->instanceName() );
   // install 'instancename'data resource type
   TDEGlobal::dirs()->addResourceType( inst->instanceName() + "data",
-                                    KStandardDirs::kde_default( "data" )
+                                    TDEStandardDirs::kde_default( "data" )
                                     + TQString::fromLatin1( inst->instanceName() ) + '/' );
   if ( bLoadPlugins )
     loadPlugins( m_obj, this, instance() );
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index d444db1f2..5b99c88d9 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -628,7 +628,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
 	TQStringList	comps = TQStringList::split('/', drname, false);
 	TQString	tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
 	TQString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
-	TQString	exe = KStandardDirs::findExe("foomatic-datafile", PATH);
+	TQString	exe = TDEStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
 	{
 		setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
index b628ac6d9..aacf6be8d 100644
--- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp
+++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
@@ -35,7 +35,7 @@ KFoomaticPrinterImpl::~KFoomaticPrinterImpl()
 // look for executable
 TQString KFoomaticPrinterImpl::executable()
 {
-	QString	exe = KStandardDirs::findExe("foomatic-printjob");
+	QString	exe = TDEStandardDirs::findExe("foomatic-printjob");
 	return exe;
 }
 
diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp
index 2f1d80e54..b13637904 100644
--- a/tdeprint/kmvirtualmanager.cpp
+++ b/tdeprint/kmvirtualmanager.cpp
@@ -297,7 +297,7 @@ void KMVirtualManager::triggerSave()
 	QString	filename;
 	if (getuid() == 0)
 	{
-		if (KStandardDirs::makeDir(TQFile::decodeName("/etc/cups")))
+		if (TDEStandardDirs::makeDir(TQFile::decodeName("/etc/cups")))
 			filename = TQFile::decodeName("/etc/cups/lpoptions");
 	}
 	else
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index e81a23b08..0d7b7913c 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -273,7 +273,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 	if (externalPreview && isPS )
 	{
 		exe = conf->readPathEntry("PreviewCommand", "gv");
-		if (KStandardDirs::findExe(exe).isEmpty())
+		if (TDEStandardDirs::findExe(exe).isEmpty())
 		{
 			QString	msg = i18n("The preview program %1 cannot be found. "
 						       "Check that the program is correctly installed and "
diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp
index 2704cc46a..e81b3a8cd 100644
--- a/tdeprint/lpd/klpdprinterimpl.cpp
+++ b/tdeprint/lpd/klpdprinterimpl.cpp
@@ -35,7 +35,7 @@ KLpdPrinterImpl::~KLpdPrinterImpl()
 
 TQString KLpdPrinterImpl::executable()
 {
-	return KStandardDirs::findExe("lpr");
+	return TDEStandardDirs::findExe("lpr");
 }
 
 bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp
index a11f79304..23c0422d0 100644
--- a/tdeprint/lpd/kmlpdmanager.cpp
+++ b/tdeprint/lpd/kmlpdmanager.cpp
@@ -620,9 +620,9 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry)
 	if (entry->arg("sd").isEmpty())
 		entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name;
 	QString	sd = entry->arg("sd");
-	if (!KStandardDirs::exists(sd))
+	if (!TDEStandardDirs::exists(sd))
 	{
-		if (!KStandardDirs::makeDir(sd,0750))
+		if (!TDEStandardDirs::makeDir(sd,0750))
 			return false;
 		struct passwd	*lp_pw = getpwnam("lp");
 		if (lp_pw && chown(TQFile::encodeName(sd),lp_pw->pw_uid,lp_pw->pw_gid) != 0)
diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
index e8ee34fd5..4237bda59 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -47,9 +47,9 @@ void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer)
 // look for executable, starting with "lpr"
 TQString KLpdUnixPrinterImpl::executable()
 {
-	QString	exe = KStandardDirs::findExe("lpr");
+	QString	exe = TDEStandardDirs::findExe("lpr");
 	if (exe.isEmpty())
-		exe = KStandardDirs::findExe("lp");
+		exe = TDEStandardDirs::findExe("lp");
 	return exe;
 }
 
diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp
index 577575e7f..232a49eb0 100644
--- a/tdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -230,7 +230,7 @@ void KMLpdUnixManager::parseEtcPrintcap()
 TQString getEtcPrintersConfName()
 {
 	TQString	printersconf("/etc/printers.conf");
-	if (!TQFile::exists(printersconf) && !KStandardDirs::findExe( "ypcat" ).isEmpty())
+	if (!TQFile::exists(printersconf) && !TDEStandardDirs::findExe( "ypcat" ).isEmpty())
 	{
 		// standard file not found, try NIS
 		printersconf = locateLocal("tmp","printers.conf");
diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp
index f6eb1f8aa..3d144644a 100644
--- a/tdeprint/lpr/apshandler.cpp
+++ b/tdeprint/lpr/apshandler.cpp
@@ -216,7 +216,7 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt)
 		return NULL;
 	}
 	TQString	path = sysconfDir() + "/" + prt->printerName();
-	if (!KStandardDirs::makeDir(path, 0755))
+	if (!TDEStandardDirs::makeDir(path, 0755))
 	{
 		manager()->setErrorMsg(i18n("Unable to create directory %1.").arg(path));
 		return NULL;
diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp
index 92928a0cc..4dbe5e378 100644
--- a/tdeprint/lpr/klprprinterimpl.cpp
+++ b/tdeprint/lpr/klprprinterimpl.cpp
@@ -28,7 +28,7 @@
 KLprPrinterImpl::KLprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KPrinterImpl(parent,name)
 {
-	m_exepath = KStandardDirs::findExe("lpr");
+	m_exepath = TDEStandardDirs::findExe("lpr");
 }
 
 KLprPrinterImpl::~KLprPrinterImpl()
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index 7ea114382..5d73d4d54 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -345,7 +345,7 @@ bool KMLprManager::createPrinter(KMPrinter *prt)
 		return false;
 	}
 	sd.append("/").append(prt->printerName());
-	if (!KStandardDirs::makeDir(sd, 0755))
+	if (!TDEStandardDirs::makeDir(sd, 0755))
 	{
 		setErrorMsg(i18n("Unable to create the spool directory %1. Check that you "
 		                 "have the required permissions for that operation.").arg(sd));
diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp
index 2723eb842..f72901865 100644
--- a/tdeprint/lpr/lpchelper.cpp
+++ b/tdeprint/lpr/lpchelper.cpp
@@ -51,9 +51,9 @@ LpcHelper::LpcHelper(TQObject *parent, const char *name)
 	// add some specific dirs.
 	TQString	PATH = getenv("PATH");
 	PATH.append(":/usr/sbin:/usr/local/sbin:/sbin:/opt/sbin:/opt/local/sbin");
-	m_exepath = KStandardDirs::findExe("lpc", PATH);
-	m_checkpcpath = KStandardDirs::findExe("checkpc", PATH);
-	m_lprmpath = KStandardDirs::findExe("lprm");
+	m_exepath = TDEStandardDirs::findExe("lpc", PATH);
+	m_checkpcpath = TDEStandardDirs::findExe("checkpc", PATH);
+	m_lprmpath = TDEStandardDirs::findExe("lprm");
 }
 
 LpcHelper::~LpcHelper()
diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp
index 52a8d06c5..1c02cafc7 100644
--- a/tdeprint/lpr/lpqhelper.cpp
+++ b/tdeprint/lpr/lpqhelper.cpp
@@ -29,7 +29,7 @@
 LpqHelper::LpqHelper(TQObject *parent, const char *name)
 : TQObject(parent, name)
 {
-	m_exepath = KStandardDirs::findExe("lpq");
+	m_exepath = TDEStandardDirs::findExe("lpq");
 }
 
 LpqHelper::~LpqHelper()
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index 4cabeae98..738f7e178 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -46,10 +46,10 @@ MaticHandler::MaticHandler(KMManager *mgr)
 {
 	TQString	PATH = getenv("PATH");
 	PATH.append(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
-	m_exematicpath = KStandardDirs::findExe("lpdomatic", PATH);
-	m_ncpath = KStandardDirs::findExe("nc");
-	m_smbpath = KStandardDirs::findExe("smbclient");
-	m_rlprpath = KStandardDirs::findExe("rlpr");
+	m_exematicpath = TDEStandardDirs::findExe("lpdomatic", PATH);
+	m_ncpath = TDEStandardDirs::findExe("nc");
+	m_smbpath = TDEStandardDirs::findExe("smbclient");
+	m_rlprpath = TDEStandardDirs::findExe("rlpr");
 }
 
 bool MaticHandler::validate(PrintcapEntry *entry)
@@ -248,7 +248,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
 
 	TQString	tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
 	TQString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
-	TQString	exe = KStandardDirs::findExe("foomatic-datafile", PATH);
+	TQString	exe = TDEStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
 	{
 		manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
@@ -352,7 +352,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename)
 		return true;
 
 	TQString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
-	TQString	exe = KStandardDirs::findExe("foomatic-datafile", PATH);
+	TQString	exe = TDEStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
 	{
 		manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 9c315402f..c101bb270 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -91,7 +91,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
 	if (exestr.isEmpty())
 		msg = i18n("No executable defined for the creation of the "
 		           "driver database. This operation is not implemented.");
-	else if (KStandardDirs::findExe(exestr).isEmpty())
+	else if (TDEStandardDirs::findExe(exestr).isEmpty())
 		msg = i18n("The executable %1 could not be found in your "
 		           "PATH. Check that this program exists and is "
 			   "accessible in your PATH variable.").arg(exestr);
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index 5e927a940..8ca1c6569 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -47,7 +47,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 	QString	host(rpr->option("host")), queue(rpr->option("queue"));
 	if (!host.isEmpty() && !queue.isEmpty())
 	{
-		QString		exestr = KStandardDirs::findExe("rlpr");
+		QString		exestr = TDEStandardDirs::findExe("rlpr");
 		if (exestr.isEmpty())
 		{
 			printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("rlpr"));
diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp
index 92178f0f4..a1985e804 100644
--- a/tdeprint/tdeprintcheck.cpp
+++ b/tdeprint/tdeprintcheck.cpp
@@ -80,7 +80,7 @@ bool KdeprintChecker::checkURL(const KURL& url)
 	else if (prot == "exec")
 		return checkExec(url);
 	else if (prot == "file" || prot == "dir")
-		return KStandardDirs::exists(url.url());
+		return TDEStandardDirs::exists(url.url());
 	else if (prot == "service")
 		return checkService(url);
 	return false;
@@ -117,7 +117,7 @@ bool KdeprintChecker::checkConfig(const KURL& url)
 bool KdeprintChecker::checkExec(const KURL& url)
 {
 	QString	execname(url.path().mid(1));
-	return !(KStandardDirs::findExe(execname).isEmpty());
+	return !(TDEStandardDirs::findExe(execname).isEmpty());
 }
 
 bool KdeprintChecker::checkService(const KURL& url)
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index d9a1e2a72..de54f2de1 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -173,7 +173,7 @@ void EscpWidget::startCommand(const TQString& arg)
 		return;
 	}
 
-	TQString	exestr = KStandardDirs::findExe("escputil");
+	TQString	exestr = TDEStandardDirs::findExe("escputil");
 	if (exestr.isEmpty())
 	{
 		KMessageBox::error(this, i18n("The executable escputil cannot be found in your "
diff --git a/tdesu/client.cpp b/tdesu/client.cpp
index cbdc640e6..8eaf86af8 100644
--- a/tdesu/client.cpp
+++ b/tdesu/client.cpp
@@ -389,7 +389,7 @@ static TQString findDaemon()
 {
     TQString daemon = locate("bin", "tdesud");
     if (daemon.isEmpty()) // if not in TDEDIRS, rely on PATH
-	daemon = KStandardDirs::findExe("tdesud");
+	daemon = TDEStandardDirs::findExe("tdesud");
 
     if (daemon.isEmpty())
     {
diff --git a/tdesu/process.cpp b/tdesu/process.cpp
index a8d2478a5..28e3bb110 100644
--- a/tdesu/process.cpp
+++ b/tdesu/process.cpp
@@ -375,7 +375,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args)
         path = command;
     else 
     {
-        TQString file = KStandardDirs::findExe(command);
+        TQString file = TDEStandardDirs::findExe(command);
         if (file.isEmpty()) 
         {
             kdError(900) << k_lineinfo << command << " not found\n"; 
diff --git a/tdesu/tdesu_pty.cpp b/tdesu/tdesu_pty.cpp
index d3392ec5e..207c0a3e2 100644
--- a/tdesu/tdesu_pty.cpp
+++ b/tdesu/tdesu_pty.cpp
@@ -214,7 +214,7 @@ int PTY::grantpt()
 	return 0;
 
     // Use konsole_grantpty:
-    if (KStandardDirs::findExe("konsole_grantpty").isEmpty())
+    if (TDEStandardDirs::findExe("konsole_grantpty").isEmpty())
     {
 	kdError(900) << k_lineinfo << "konsole_grantpty not found.\n";
 	return -1;
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index 1812487c1..a6267b039 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -491,7 +491,7 @@ bool KBugReport::sendBugReport()
   TQString command;
   command = locate("exe", "tdesendbugmail");
   if (command.isEmpty())
-      command = KStandardDirs::findExe( TQString::fromLatin1("tdesendbugmail") );
+      command = TDEStandardDirs::findExe( TQString::fromLatin1("tdesendbugmail") );
 
   KTempFile outputfile;
   outputfile.close();
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 63c4bc2b2..5f9d71c0f 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -816,7 +816,7 @@ void KEditToolbarWidget::setupLayout()
 
   // "change icon" button
   d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this );
-  TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog"));
+  TQString kdialogExe = TDEStandardDirs::findExe(TQString::fromLatin1("kdialog"));
   d->m_hasKDialog = !kdialogExe.isEmpty();
   d->m_changeIcon->setEnabled( d->m_hasKDialog );
 
@@ -1382,7 +1382,7 @@ void KEditToolbarWidget::slotChangeIcon()
         return;
   
   d->m_kdialogProcess = new KProcIO;
-  TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog"));
+  TQString kdialogExe = TDEStandardDirs::findExe(TQString::fromLatin1("kdialog"));
   (*d->m_kdialogProcess) << kdialogExe;
   (*d->m_kdialogProcess) << "--embed";
   (*d->m_kdialogProcess) << TQString::number( (ulong)topLevelWidget()->winId() );
diff --git a/tdeui/ktip.h b/tdeui/ktip.h
index d18efd27e..a506902bf 100644
--- a/tdeui/ktip.h
+++ b/tdeui/ktip.h
@@ -131,7 +131,7 @@ public:
      *
      * @param parent Parent widget of TipDialog.
      * @param tipFile The name of the tip file. It has be relative to the "data"
-     *                resource of KStandardDirs
+     *                resource of TDEStandardDirs
      * @param force If true, the dialog is show, even when the users
      *              disabled it.
      */
@@ -144,7 +144,7 @@ public:
      *
      * @param parent Parent widget of TipDialog.
      * @param tipFiles A List of tip files. Each has be relative to the "data"
-     *                resource of KStandardDirs
+     *                resource of TDEStandardDirs
      * @param force If true, the dialog is show, even when the users
      *              disabled it.
      */
diff --git a/tdeutils/kplugininfo.h b/tdeutils/kplugininfo.h
index 0ba051d2c..8a4d79c8b 100644
--- a/tdeutils/kplugininfo.h
+++ b/tdeutils/kplugininfo.h
@@ -74,7 +74,7 @@ class KUTILS_EXPORT KPluginInfo
          *
          * @param filename  The filename of the .desktop file.
          * @param resource  If filename is relative, you need to specify a resource type
-         * (e.g. "service", "apps"... KStandardDirs). Otherwise,
+         * (e.g. "service", "apps"... TDEStandardDirs). Otherwise,
          * resource isn't used.
          */
         KPluginInfo( const TQString & filename, const char* resource = 0 );
@@ -125,7 +125,7 @@ class KUTILS_EXPORT KPluginInfo
         /**
          * @return A list of KPluginInfo objects constructed from a list of
          * filenames. If you make a lookup using, for example,
-         * KStandardDirs::findAllResources() you pass the list of files to this
+         * TDEStandardDirs::findAllResources() you pass the list of files to this
          * function.
          */
         static KPluginInfo::List fromFiles( const TQStringList & files, TDEConfig * config = 0, const TQString & group = TQString::null );
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index d124db091..473b8a667 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -355,7 +355,7 @@ void TDECModuleProxy::runAsRoot()
 		cmd = TQString(cmd.remove(0,8)).stripWhiteSpace();
 
 	/* Run the process */
-	TQString tdesu = KStandardDirs::findExe("tdesu");
+	TQString tdesu = TDEStandardDirs::findExe("tdesu");
 	if (!tdesu.isEmpty())
 	{