From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 17 Oct 2015 15:57:24 +0000 (+0300)
Subject: generic: adjust to KStandardDirs changes
X-Git-Tag: 4.22.0~1633
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9ec8609680b324ec4385b51e642d7925d94d41f8;p=kde%2Fkde-workspace.git

generic: adjust to KStandardDirs changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/kcontrol/autostart/autostart.cpp b/kcontrol/autostart/autostart.cpp
index 97c07b69..a2d6d5b3 100644
--- a/kcontrol/autostart/autostart.cpp
+++ b/kcontrol/autostart/autostart.cpp
@@ -168,7 +168,7 @@ void Autostart::load()
     widget->listCMD->expandItem( m_scriptItem );
 
     foreach (const QString& path, m_paths) {
-        if (! KStandardDirs::exists(path))
+        if (! KGlobal::dirs()->exists(path))
             KStandardDirs::makeDir(path);
 
         QDir autostartdir( path );
diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp
index 6bff1a55..9f4b4dbe 100644
--- a/kioslave/cgi/cgi.cpp
+++ b/kioslave/cgi/cgi.cpp
@@ -89,7 +89,7 @@ void CgiProtocol::get( const KUrl& url )
     if ( !(*it).endsWith('/') )
         cmd += '/';
     cmd += file;
-    if ( KStandardDirs::exists( cmd ) ) {
+    if ( KGlobal::dirs()->exists( cmd ) ) {
       forwardFile = false;
       stripHeader = true;
       break;
diff --git a/kioslave/desktop/kio_desktop.cpp b/kioslave/desktop/kio_desktop.cpp
index 43eba011..d729cd4f 100644
--- a/kioslave/desktop/kio_desktop.cpp
+++ b/kioslave/desktop/kio_desktop.cpp
@@ -177,7 +177,7 @@ QString DesktopProtocol::desktopFile(KIO::UDSEntry &entry) const
 
     if (entry.isDir()) {
         url.addPath(".directory");
-        if (!KStandardDirs::exists(url.path()))
+        if (!KGlobal::dirs()->exists(url.path()))
             return QString();
 
         return url.path();
diff --git a/kstartupconfig/kstartupconfig.cpp b/kstartupconfig/kstartupconfig.cpp
index 153d28b9..09743eb7 100644
--- a/kstartupconfig/kstartupconfig.cpp
+++ b/kstartupconfig/kstartupconfig.cpp
@@ -150,7 +150,7 @@ int main( int argc, char **argv )
              ++it )
             {
             QString cfg = *it + "share/config/" + file;
-            if( KStandardDirs::exists( cfg ))
+            if( KGlobal::dirs()->exists( cfg ))
                 startupconfigfiles << cfg << "\n";
             else
                 startupconfigfiles << "!" << cfg << "\n";