Commit e31a7794 authored by David Faure's avatar David Faure
Browse files

Revert "trash:/ set the UDS_LOCAL_PATH"

This reverts commit 4984b268.

See !854 (comment 463427)
parent 3b4da7e4
Pipeline #187083 passed with stage
in 12 minutes and 23 seconds
......@@ -468,7 +468,7 @@ bool TrashProtocol::createUDSEntry(const QString &physicalPath,
KIO::UDSEntry &entry,
const TrashedFileInfo &info)
{
entry.reserve(14);
entry.reserve(13);
QByteArray physicalPath_c = QFile::encodeName(physicalPath);
QT_STATBUF buff;
if (QT_LSTAT(physicalPath_c.constData(), &buff) == -1) {
......@@ -505,7 +505,6 @@ bool TrashProtocol::createUDSEntry(const QString &physicalPath,
entry.fastInsert(KIO::UDSEntry::UDS_NAME, internalFileName); // internal filename, like "0-foo"
entry.fastInsert(KIO::UDSEntry::UDS_DISPLAY_NAME, displayFileName); // user-visible filename, like "foo"
entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, type);
entry.fastInsert(KIO::UDSEntry::UDS_LOCAL_PATH, physicalPath);
// if ( !url.isEmpty() )
// entry.insert( KIO::UDSEntry::UDS_URL, url );
......
......@@ -761,7 +761,7 @@ void TestTrash::mostLocalUrlTest()
url.setPath(QLatin1String("0-") + file);
KIO::StatJob *statJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
QVERIFY(statJob->exec());
QCOMPARE(QUrl::fromLocalFile(m_trashDir + QStringLiteral("/files/") + file), statJob->mostLocalUrl());
QCOMPARE(url, statJob->mostLocalUrl());
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment