diff --git a/sftp/kio_sftp.cpp b/sftp/kio_sftp.cpp --- a/sftp/kio_sftp.cpp +++ b/sftp/kio_sftp.cpp @@ -34,22 +34,15 @@ #include #include #include +#include #include #include #include #include #include -#ifdef Q_OS_WIN -#include // for permissions -using namespace std::experimental::filesystem; -#include -#else -#include -#endif - #define KIO_SFTP_SPECIAL_TIMEOUT 30 // How big should each data packet be? Definitely not bigger than 64kb or @@ -387,11 +380,9 @@ if (isBrokenLink) { // It is a link pointing to nowhere fileType = QT_STAT_MASK - 1; -#ifdef Q_OS_WIN - access = static_cast(perms::owner_all | perms::group_all | perms::others_all); -#else - access = S_IRWXU | S_IRWXG | S_IRWXO; -#endif + access = QFileDevice::Permission::ReadOwner | QFileDevice::Permission::WriteOwner | QFileDevice::Permission::ExeOwner + | QFileDevice::Permission::ReadGroup | QFileDevice::Permission::WriteGroup | QFileDevice::Permission::ExeGroup + | QFileDevice::Permission::ReadOther | QFileDevice::Permission::WriteOther | QFileDevice::Permission::ExeOther; size = 0LL; } else { switch (sb->type) { @@ -1763,11 +1754,7 @@ mode_t initialMode; if (permissions != -1) { -#ifdef Q_OS_WIN - initialMode = permissions | static_cast(perms::owner_write | perms::owner_read); -#else - initialMode = permissions | S_IWUSR | S_IRUSR; -#endif + initialMode = permissions | QFileDevice::Permission::WriteOwner | QFileDevice::Permission::ReadOwner; } else { initialMode = 0644; } @@ -1974,11 +1961,7 @@ // otherwise we can be in for a surprise on NFS. mode_t initialMode; if (permissions != -1) -#ifdef Q_OS_WIN - initialMode = permissions | static_cast(perms::owner_write); -#else - initialMode = permissions | S_IWUSR; -#endif + initialMode = permissions | QFileDevice::Permission::WriteOwner; else initialMode = 0666; @@ -2236,11 +2219,9 @@ if (isBrokenLink) { // It is a link pointing to nowhere fileType = QT_STAT_MASK - 1; -#ifdef Q_OS_WIN - access = static_cast(perms::owner_all | perms::group_all | perms::others_all); -#else - access = S_IRWXU | S_IRWXG | S_IRWXO; -#endif + access = QFileDevice::Permission::ReadOwner | QFileDevice::Permission::WriteOwner | QFileDevice::Permission::ExeOwner + | QFileDevice::Permission::ReadGroup | QFileDevice::Permission::WriteGroup | QFileDevice::Permission::ExeGroup + | QFileDevice::Permission::ReadOther | QFileDevice::Permission::WriteOther | QFileDevice::Permission::ExeOther; size = 0LL; } else { switch (dirent->type) {