Rename KStandard for enhanced compatibility with KDE4

15 files changed, 24 insertions, 24 deletions

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" );