tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix deprecation warning from KIO

Browse source
This commit is contained in:
Albert Vaca 2018-08-05 17:44:42 +02:00
parent 027c147671
commit 52040ca02b
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
kio/kiokdeconnect.cpp
View file

@ -45,15 +45,15 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char** argv)
//Some useful error mapping //Some useful error mapping
KIO::Error toKioError(const QDBusError::ErrorType type) KIO::Error toKioError(const QDBusError::ErrorType type)
{ {
switch (type) switch (type)
{ {
case QDBusError::NoError: case QDBusError::NoError:
return KIO::Error(KJob::NoError); return KIO::Error(KJob::NoError);
case QDBusError::NoMemory: case QDBusError::NoMemory:
return KIO::ERR_OUT_OF_MEMORY; return KIO::ERR_OUT_OF_MEMORY;
case QDBusError::Timeout: case QDBusError::Timeout:
return KIO::ERR_SERVER_TIMEOUT; return KIO::ERR_SERVER_TIMEOUT;
case QDBusError::TimedOut: case QDBusError::TimedOut:
return KIO::ERR_SERVER_TIMEOUT; return KIO::ERR_SERVER_TIMEOUT;
default: default:
return KIO::ERR_INTERNAL; return KIO::ERR_INTERNAL;
@ -97,21 +97,21 @@ void KioKdeconnect::listAllDevices()
const QString icon = QStringLiteral("kdeconnect"); const QString icon = QStringLiteral("kdeconnect");
KIO::UDSEntry entry; KIO::UDSEntry entry;
entry.insert(KIO::UDSEntry::UDS_NAME, name); entry.fastInsert(KIO::UDSEntry::UDS_NAME, name);
entry.insert(KIO::UDSEntry::UDS_ICON_NAME, icon); entry.fastInsert(KIO::UDSEntry::UDS_ICON_NAME, icon);
entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); entry.fastInsert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, QLatin1String("")); entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, QLatin1String(""));
entry.insert(KIO::UDSEntry::UDS_URL, path); entry.fastInsert(KIO::UDSEntry::UDS_URL, path);
listEntry(entry); listEntry(entry);
} }
// We also need a non-null and writable UDSentry for "." // We also need a non-null and writable UDSentry for "."
KIO::UDSEntry entry; KIO::UDSEntry entry;
entry.insert(KIO::UDSEntry::UDS_NAME, QStringLiteral(".")); entry.fastInsert(KIO::UDSEntry::UDS_NAME, QStringLiteral("."));
entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
entry.insert(KIO::UDSEntry::UDS_SIZE, 0); entry.fastInsert(KIO::UDSEntry::UDS_SIZE, 0);
entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH); entry.fastInsert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH);
listEntry(entry); listEntry(entry);
infoMessage(QLatin1String("")); infoMessage(QLatin1String(""));
@ -152,22 +152,22 @@ void KioKdeconnect::listDevice()
const QString icon = QStringLiteral("folder"); const QString icon = QStringLiteral("folder");
KIO::UDSEntry entry; KIO::UDSEntry entry;
entry.insert(KIO::UDSEntry::UDS_NAME, QStringLiteral("files")); entry.fastInsert(KIO::UDSEntry::UDS_NAME, QStringLiteral("files"));
entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, name); entry.fastInsert(KIO::UDSEntry::UDS_DISPLAY_NAME, name);
entry.insert(KIO::UDSEntry::UDS_ICON_NAME, icon); entry.fastInsert(KIO::UDSEntry::UDS_ICON_NAME, icon);
entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); entry.fastInsert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, QLatin1String("")); entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, QLatin1String(""));
entry.insert(KIO::UDSEntry::UDS_URL, QUrl::fromLocalFile(path).toString()); entry.fastInsert(KIO::UDSEntry::UDS_URL, QUrl::fromLocalFile(path).toString());
listEntry(entry); listEntry(entry);
} }
// We also need a non-null and writable UDSentry for "." // We also need a non-null and writable UDSentry for "."
KIO::UDSEntry entry; KIO::UDSEntry entry;
entry.insert(KIO::UDSEntry::UDS_NAME, QStringLiteral(".")); entry.fastInsert(KIO::UDSEntry::UDS_NAME, QStringLiteral("."));
entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
entry.insert(KIO::UDSEntry::UDS_SIZE, 0); entry.fastInsert(KIO::UDSEntry::UDS_SIZE, 0);
entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH); entry.fastInsert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH);
listEntry(entry); listEntry(entry);
infoMessage(QLatin1String("")); infoMessage(QLatin1String(""));
@ -203,7 +203,7 @@ void KioKdeconnect::stat(const QUrl& url)
qCDebug(KDECONNECT_KIO) << "Stat: " << url; qCDebug(KDECONNECT_KIO) << "Stat: " << url;
KIO::UDSEntry entry; KIO::UDSEntry entry;
entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
statEntry(entry); statEntry(entry);
finished(); finished();