diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-03-19 11:55:02 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-03-19 11:55:02 +0200 |
| commit | 8c448f77a00d01e24e4d083d9684c275b3efdd04 (patch) | |
| tree | c75af0ceed6555249c6a2413dc5c0ff0aec928bb /src/libs/installer/fileutils.cpp | |
| parent | 2beb45ea0317d0bed9d6085bd927f5a55dff25d5 (diff) | |
| parent | 407b19ff904244e287d62c7d02ca2a0779fc7b09 (diff) | |
Merge branch '3.1' into master
Change-Id: I2ac4e385ee771892369d98495ceceb09c481c018
Diffstat (limited to 'src/libs/installer/fileutils.cpp')
| -rw-r--r-- | src/libs/installer/fileutils.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp index c142b55f1..4347c67da 100644 --- a/src/libs/installer/fileutils.cpp +++ b/src/libs/installer/fileutils.cpp @@ -130,14 +130,14 @@ QString QInstaller::humanReadableSize(const qint64 &size, int precision) static QStringList measures; if (measures.isEmpty()) measures << QCoreApplication::translate("QInstaller", "bytes") - << QCoreApplication::translate("QInstaller", "KiB") - << QCoreApplication::translate("QInstaller", "MiB") - << QCoreApplication::translate("QInstaller", "GiB") - << QCoreApplication::translate("QInstaller", "TiB") - << QCoreApplication::translate("QInstaller", "PiB") - << QCoreApplication::translate("QInstaller", "EiB") - << QCoreApplication::translate("QInstaller", "ZiB") - << QCoreApplication::translate("QInstaller", "YiB"); + << QCoreApplication::translate("QInstaller", "KB") + << QCoreApplication::translate("QInstaller", "MB") + << QCoreApplication::translate("QInstaller", "GB") + << QCoreApplication::translate("QInstaller", "TB") + << QCoreApplication::translate("QInstaller", "PB") + << QCoreApplication::translate("QInstaller", "EB") + << QCoreApplication::translate("QInstaller", "ZB") + << QCoreApplication::translate("QInstaller", "YB"); QStringListIterator it(measures); QString measure(it.next()); @@ -239,7 +239,7 @@ void QInstaller::removeDirectory(const QString &path, bool ignoreErrors) class RemoveDirectoryThread : public QThread { public: - explicit RemoveDirectoryThread(const QString &path, bool ignoreErrors = false, QObject *parent = 0) + explicit RemoveDirectoryThread(const QString &path, bool ignoreErrors = false, QObject *parent = nullptr) : QThread(parent) , p(path) , ignore(ignoreErrors) @@ -411,7 +411,7 @@ QString QInstaller::getShortPathName(const QString &name) // Determine length, then convert. const LPCTSTR nameC = reinterpret_cast<LPCTSTR>(name.utf16()); // MinGW - const DWORD length = GetShortPathName(nameC, NULL, 0); + const DWORD length = GetShortPathName(nameC, nullptr, 0); if (length == 0) return name; QScopedArrayPointer<TCHAR> buffer(new TCHAR[length]); @@ -427,7 +427,7 @@ QString QInstaller::getLongPathName(const QString &name) // Determine length, then convert. const LPCTSTR nameC = reinterpret_cast<LPCTSTR>(name.utf16()); // MinGW - const DWORD length = GetLongPathName(nameC, NULL, 0); + const DWORD length = GetLongPathName(nameC, nullptr, 0); if (length == 0) return name; QScopedArrayPointer<TCHAR> buffer(new TCHAR[length]); |