From 4df06d8f7ac703a6d48e46e48be66b41af650cae Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sun, 24 Mar 2024 02:43:33 +0200
Subject: [PATCH] generic: adjust to Katie changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kdecore/kde-config.cpp           | 4 ++--
 kdecore/kernel/kcmdlineargs.cpp  | 2 +-
 kdecore/kernel/kstandarddirs.cpp | 2 +-
 kio/kfile/kfilewidget.cpp        | 2 +-
 kio/kio/krun.cpp                 | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kdecore/kde-config.cpp b/kdecore/kde-config.cpp
index 7b158b55..03c0c8a7 100644
--- a/kdecore/kde-config.cpp
+++ b/kdecore/kde-config.cpp
@@ -48,8 +48,8 @@ static void printResult(const QString &s)
     if (s.isEmpty()) {
         printf("\n");
     } else {
-        QString path = QDir::toNativeSeparators( s );
-        printf("%s\n", path.toLocal8Bit().constData());
+        QByteArray path = QFile::encodeName(s);
+        printf("%s\n", path.constData());
     }
 }
 
diff --git a/kdecore/kernel/kcmdlineargs.cpp b/kdecore/kernel/kcmdlineargs.cpp
index 6f76a6ae..143c4f46 100644
--- a/kdecore/kernel/kcmdlineargs.cpp
+++ b/kdecore/kernel/kcmdlineargs.cpp
@@ -1509,7 +1509,7 @@ KUrl KCmdLineArgs::makeURL(const QByteArray &_urlArg)
     QFileInfo fileInfo(urlArg);
     if (!fileInfo.isRelative()) { // i.e. starts with '/', on unix
         KUrl result;
-        result.setPath(QDir::fromNativeSeparators(urlArg));
+        result.setPath(urlArg);
         return result; // Absolute path.
     }
 
diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
index 9ec1acdf..1023abaa 100644
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
@@ -66,7 +66,7 @@ static QString readEnvPath(const char *env)
     const QByteArray c_path = qgetenv(env);
     if (c_path.isEmpty())
         return QString();
-    return QDir::fromNativeSeparators(QFile::decodeName(c_path));
+    return QFile::decodeName(c_path);
 }
 
 // split path using : as delimiters
diff --git a/kio/kfile/kfilewidget.cpp b/kio/kfile/kfilewidget.cpp
index bef729bd..85f1456a 100644
--- a/kio/kfile/kfilewidget.cpp
+++ b/kio/kfile/kfilewidget.cpp
@@ -2662,7 +2662,7 @@ void KFileWidget::readConfig( KConfigGroup& group )
 
 QString KFileWidgetPrivate::locationEditCurrentText() const
 {
-    return QDir::fromNativeSeparators(locationEdit->currentText());
+    return locationEdit->currentText();
 }
 
 KUrl KFileWidgetPrivate::mostLocalUrl(const KUrl &url)
diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp
index f8a1b453..a75b3bda 100644
--- a/kio/kio/krun.cpp
+++ b/kio/kio/krun.cpp
@@ -249,13 +249,13 @@ KRunMX2::subst(int option, const KUrl &url, QStringList &ret)
     switch (option) {
     case 'u':
         ret << ((url.isLocalFile() && !url.hasFragment() && !url.hasQuery()) ?
-                QDir::toNativeSeparators(url.toLocalFile())  : url.url());
+                url.toLocalFile()  : url.url());
         break;
     case 'd':
         ret << url.directory();
         break;
     case 'f':
-        ret << QDir::toNativeSeparators(url.toLocalFile());
+        ret << url.toLocalFile();
         break;
     case 'n':
         ret << url.fileName();