diff --git a/iso/iso.cpp b/iso/iso.cpp --- a/iso/iso.cpp +++ b/iso/iso.cpp @@ -512,7 +512,7 @@ QString path = url.path(); REPLACE_DIR_SEP2(path); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN if (path.startsWith(DIR_SEPARATOR)) { int p = 1; while (p < path.length() && path[ p ] == DIR_SEPARATOR_CHAR) diff --git a/iso/libisofs/iso_fs.h b/iso/libisofs/iso_fs.h --- a/iso/libisofs/iso_fs.h +++ b/iso/libisofs/iso_fs.h @@ -26,7 +26,7 @@ #include "bswap.h" -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #define DIR_SEPARATOR "/" #define DIR_SEPARATOR2 "\\" #define DIR_SEPARATOR_CHAR '/' diff --git a/krArc/krarc.h b/krArc/krarc.h --- a/krArc/krarc.h +++ b/krArc/krarc.h @@ -124,7 +124,7 @@ QTextCodec * codec; }; -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #define DIR_SEPARATOR "/" #define DIR_SEPARATOR2 "\\" #define DIR_SEPARATOR_CHAR '/' diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp --- a/krArc/krarc.cpp +++ b/krArc/krarc.cpp @@ -1162,15 +1162,15 @@ mode_t mode = 0; // file type if (perm[0] == 'd') mode |= S_IFDIR; -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN if (perm[0] == 'l') mode |= S_IFLNK; #endif if (perm[0] == '-') mode |= S_IFREG; // owner permissions if (perm[1] != '-') mode |= S_IRUSR; if (perm[2] != '-') mode |= S_IWUSR; if (perm[3] != '-') mode |= S_IXUSR; -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN // group permissions if (perm[4] != '-') mode |= S_IRGRP; if (perm[5] != '-') mode |= S_IWGRP; @@ -1333,7 +1333,7 @@ owner = nextWord(line); group = nextWord(line); // symlink destination -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN if (S_ISLNK(mode)) { // ignore the next 3 fields nextWord(line); nextWord(line); nextWord(line); @@ -1695,7 +1695,7 @@ } } // checking if it's an absolute path -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN if (cmd.length() > 2 && cmd[ 0 ].isLetter() && cmd[ 1 ] == ':') return true; #else @@ -1921,7 +1921,7 @@ QString path = url.adjusted(options).path(); REPLACE_DIR_SEP2(path); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN if (path.startsWith(DIR_SEPARATOR)) { int p = 1; while (p < path.length() && path[ p ] == DIR_SEPARATOR_CHAR) diff --git a/krusader/FileSystem/defaultfilesystem.cpp b/krusader/FileSystem/defaultfilesystem.cpp --- a/krusader/FileSystem/defaultfilesystem.cpp +++ b/krusader/FileSystem/defaultfilesystem.cpp @@ -323,7 +323,7 @@ bool DefaultFileSystem::refreshLocal(const QUrl &directory, bool onlyScan) { const QString path = KrServices::urlToLocalPath(directory); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN if (!path.contains("/")) { // change C: to C:/ path = path + QString("/"); } diff --git a/krusader/FileSystem/krpermhandler.cpp b/krusader/FileSystem/krpermhandler.cpp --- a/krusader/FileSystem/krpermhandler.cpp +++ b/krusader/FileSystem/krpermhandler.cpp @@ -71,7 +71,7 @@ int groupNo = getgroups(200, groupList); // In kdewin32 implementation as of 4.1.2, getpwent always returns the same struct -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN // fill the UID cache struct passwd *pass; while ((pass = getpwent()) != nullptr) { diff --git a/krusader/defaults.h b/krusader/defaults.h --- a/krusader/defaults.h +++ b/krusader/defaults.h @@ -315,7 +315,7 @@ #define _ImmediateContextMenu true // Root directory -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #define DIR_SEPARATOR "/" #define DIR_SEPARATOR2 "\\" #define DIR_SEPARATOR_CHAR '/' diff --git a/krusader/krservices.cpp b/krusader/krservices.cpp --- a/krusader/krservices.cpp +++ b/krusader/krservices.cpp @@ -294,7 +294,7 @@ QString path = fileUrl.toLocalFile(); REPLACE_DIR_SEP2(path); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN if (path.startsWith(DIR_SEPARATOR)) { int p = 1; while (p < path.length() && path[ p ] == DIR_SEPARATOR_CHAR)