diff options
| author | hjk <hjk@qt.io> | 2020-01-17 15:50:46 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-01-20 10:09:23 +0000 |
| commit | 7e19d1af7c356dae703e110f9d24b75429ef8fb5 (patch) | |
| tree | b51b30d023ab285d8b4185806220596a9b1bd5df /src/libs/utils/savefile.cpp | |
| parent | a3447f6eb23870f3051868a0363301e982deb64e (diff) | |
Use even less nullptr for default flags
Change-Id: I5ec30de3e41dfc1c7bf6d5f5e36991eadcbbfb72
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/utils/savefile.cpp')
| -rw-r--r-- | src/libs/utils/savefile.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libs/utils/savefile.cpp b/src/libs/utils/savefile.cpp index 8d07603ad87..3466667509b 100644 --- a/src/libs/utils/savefile.cpp +++ b/src/libs/utils/savefile.cpp @@ -36,7 +36,7 @@ namespace Utils { -QFile::Permissions SaveFile::m_umask = nullptr; +static QFile::Permissions m_umask = {}; SaveFile::SaveFile(const QString &filename) : m_finalFileName(filename) @@ -207,15 +207,15 @@ void SaveFile::initializeUmask() mode_t mask = umask(0); // get current umask umask(mask); // set it back - m_umask = ((mask & S_IRUSR) ? QFile::ReadOwner : QFlags<QFile::Permission>(nullptr)) - | ((mask & S_IWUSR) ? QFile::WriteOwner : QFlags<QFile::Permission>(nullptr)) - | ((mask & S_IXUSR) ? QFile::ExeOwner : QFlags<QFile::Permission>(nullptr)) - | ((mask & S_IRGRP) ? QFile::ReadGroup : QFlags<QFile::Permission>(nullptr)) - | ((mask & S_IWGRP) ? QFile::WriteGroup : QFlags<QFile::Permission>(nullptr)) - | ((mask & S_IXGRP) ? QFile::ExeGroup : QFlags<QFile::Permission>(nullptr)) - | ((mask & S_IROTH) ? QFile::ReadOther : QFlags<QFile::Permission>(nullptr)) - | ((mask & S_IWOTH) ? QFile::WriteOther : QFlags<QFile::Permission>(nullptr)) - | ((mask & S_IXOTH) ? QFile::ExeOther : QFlags<QFile::Permission>(nullptr)); + m_umask = ((mask & S_IRUSR) ? QFile::ReadOwner : QFlags<QFile::Permission>()) + | ((mask & S_IWUSR) ? QFile::WriteOwner : QFlags<QFile::Permission>()) + | ((mask & S_IXUSR) ? QFile::ExeOwner : QFlags<QFile::Permission>()) + | ((mask & S_IRGRP) ? QFile::ReadGroup : QFlags<QFile::Permission>()) + | ((mask & S_IWGRP) ? QFile::WriteGroup : QFlags<QFile::Permission>()) + | ((mask & S_IXGRP) ? QFile::ExeGroup : QFlags<QFile::Permission>()) + | ((mask & S_IROTH) ? QFile::ReadOther : QFlags<QFile::Permission>()) + | ((mask & S_IWOTH) ? QFile::WriteOther : QFlags<QFile::Permission>()) + | ((mask & S_IXOTH) ? QFile::ExeOther : QFlags<QFile::Permission>()); #endif } |