Commit 7c1f68f1 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix some compile qt6 error

parent ba66b1d6
Pipeline #183082 passed with stage
in 9 minutes and 27 seconds
......@@ -18,6 +18,7 @@
#include <QMap>
#include <QQueue>
#include <QVariant>
using namespace Akonadi;
......@@ -81,8 +82,8 @@ void CompactChangeHelperPrivate::processNextItem()
item.setRemoteId(nextItem.remoteId());
auto job = new ItemFetchJob(item);
job->setProperty("oldRemoteId", item.remoteId());
job->setProperty("newRemoteId", nextItem.attribute<FileStore::EntityCompactChangeAttribute>()->remoteId());
job->setProperty("oldRemoteId", QVariant(item.remoteId()));
job->setProperty("newRemoteId", QVariant(nextItem.attribute<FileStore::EntityCompactChangeAttribute>()->remoteId()));
QObject::connect(job, &ItemFetchJob::result, q, [this](KJob *job) {
itemFetchResult(job);
});
......
......@@ -1181,13 +1181,13 @@ bool MixedMaildirStorePrivate::visit(FileStore::CollectionModifyJob *job)
}
const QFileInfo fileInfo(path);
const QFileInfo subDirInfo = Maildir::subDirPathForFolderPath(path);
const QFileInfo subDirInfo = QFileInfo(Maildir::subDirPathForFolderPath(path));
QDir parentDir(path);
parentDir.cdUp();
const QFileInfo targetFileInfo(parentDir, collectionName);
const QFileInfo targetSubDirInfo = Maildir::subDirPathForFolderPath(targetFileInfo.absoluteFilePath());
const QFileInfo targetSubDirInfo = QFileInfo(Maildir::subDirPathForFolderPath(targetFileInfo.absoluteFilePath()));
if (targetFileInfo.exists() || (subDirInfo.exists() && targetSubDirInfo.exists())) {
errorText = i18nc("@info:status", "Cannot rename folder %1", collection.name());
......
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