Rename KStandard for enhanced compatibility with KDE4

6 files changed, 10 insertions, 10 deletions

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;