Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: adjust to Katie changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-24 02:43:33 +02:00
parent 6e654af2b3
commit 4df06d8f7a
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kdecore/kde-config.cpp
View file

@ -48,8 +48,8 @@ static void printResult(const QString &s)
if (s.isEmpty()) { if (s.isEmpty()) {
printf("\n"); printf("\n");
} else { } else {
QString path = QDir::toNativeSeparators( s ); QByteArray path = QFile::encodeName(s);
printf("%s\n", path.toLocal8Bit().constData()); printf("%s\n", path.constData());
} }
} }

2
kdecore/kernel/kcmdlineargs.cpp
View file

@ -1509,7 +1509,7 @@ KUrl KCmdLineArgs::makeURL(const QByteArray &_urlArg)
QFileInfo fileInfo(urlArg); QFileInfo fileInfo(urlArg);
if (!fileInfo.isRelative()) { // i.e. starts with '/', on unix if (!fileInfo.isRelative()) { // i.e. starts with '/', on unix
KUrl result; KUrl result;
result.setPath(QDir::fromNativeSeparators(urlArg)); result.setPath(urlArg);
return result; // Absolute path. return result; // Absolute path.
} }

2
kdecore/kernel/kstandarddirs.cpp
View file

@ -66,7 +66,7 @@ static QString readEnvPath(const char *env)
const QByteArray c_path = qgetenv(env); const QByteArray c_path = qgetenv(env);
if (c_path.isEmpty()) if (c_path.isEmpty())
return QString(); return QString();
return QDir::fromNativeSeparators(QFile::decodeName(c_path)); return QFile::decodeName(c_path);
} }
// split path using : as delimiters // split path using : as delimiters

2
kio/kfile/kfilewidget.cpp
View file

@ -2662,7 +2662,7 @@ void KFileWidget::readConfig( KConfigGroup& group )
QString KFileWidgetPrivate::locationEditCurrentText() const QString KFileWidgetPrivate::locationEditCurrentText() const
{ {
return QDir::fromNativeSeparators(locationEdit->currentText()); return locationEdit->currentText();
} }
KUrl KFileWidgetPrivate::mostLocalUrl(const KUrl &url) KUrl KFileWidgetPrivate::mostLocalUrl(const KUrl &url)

4
kio/kio/krun.cpp
View file

@ -249,13 +249,13 @@ KRunMX2::subst(int option, const KUrl &url, QStringList &ret)
switch (option) { switch (option) {
case 'u': case 'u':
ret << ((url.isLocalFile() && !url.hasFragment() && !url.hasQuery()) ? ret << ((url.isLocalFile() && !url.hasFragment() && !url.hasQuery()) ?
QDir::toNativeSeparators(url.toLocalFile()) : url.url()); url.toLocalFile() : url.url());
break; break;
case 'd': case 'd':
ret << url.directory(); ret << url.directory();
break; break;
case 'f': case 'f':
ret << QDir::toNativeSeparators(url.toLocalFile()); ret << url.toLocalFile();
break; break;
case 'n': case 'n':
ret << url.fileName(); ret << url.fileName();