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

Use UDSEntry::fastInsert

Browse source
This commit is contained in:
Nicolas Fella 2019-07-17 21:37:19 +00:00
parent 749dcfa148
commit 99aad18e7a
2 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -35,7 +35,7 @@ if (SAILFISHOS)
include_directories(${QCA2_INCLUDEDIR}) include_directories(${QCA2_INCLUDEDIR})
add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
else() else()
set(KF5_MIN_VERSION "5.42.0") set(KF5_MIN_VERSION "5.48.0")
set(QT_MIN_VERSION "5.10.0") set(QT_MIN_VERSION "5.10.0")
set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service) set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service)
set(KF5_OPTIONAL_COMPONENTS DocTools) set(KF5_OPTIONAL_COMPONENTS DocTools)

52
kio/kiokdeconnect.cpp
View file

@ -41,7 +41,7 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char** argv)
{ {
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
app.setApplicationName(QStringLiteral("kio_kdeconnect")); app.setApplicationName(QStringLiteral("kio_kdeconnect"));
if (argc != 4) { if (argc != 4) {
fprintf(stderr, "Usage: kio_kdeconnect protocol pool app\n"); fprintf(stderr, "Usage: kio_kdeconnect protocol pool app\n");
exit(-1); exit(-1);
@ -55,15 +55,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_SLAVE_DEFINED; return KIO::ERR_SLAVE_DEFINED;
@ -108,22 +108,22 @@ void KioKdeconnect::listAllDevices()
KIO::UDSEntry entry; KIO::UDSEntry entry;
entry.reserve(6); entry.reserve(6);
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.reserve(4); entry.reserve(4);
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(""));
@ -195,22 +195,22 @@ void KioKdeconnect::listDevice(const QString& device)
KIO::UDSEntry entry; KIO::UDSEntry entry;
entry.reserve(6); entry.reserve(6);
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, 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.reserve(4); entry.reserve(4);
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);
@ -245,14 +245,14 @@ 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);
QString currentDevice = url.host(); QString currentDevice = url.host();
if (!currentDevice.isEmpty()) { if (!currentDevice.isEmpty()) {
SftpDbusInterface interface(currentDevice); SftpDbusInterface interface(currentDevice);
if (interface.isValid()) { if (interface.isValid()) {
entry.insert(KIO::UDSEntry::UDS_LOCAL_PATH, interface.mountPoint()); entry.fastInsert(KIO::UDSEntry::UDS_LOCAL_PATH, interface.mountPoint());
if (!interface.isMounted()) { if (!interface.isMounted()) {
interface.mount(); interface.mount();