diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-04 09:52:39 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-05 10:56:12 +0200 |
| commit | 8759ac2fc072738ac841117de2cda1c7f4fb5c55 (patch) | |
| tree | 689b66459edc1f80df4aba63097b90441917ecf1 /examples | |
| parent | ab683bcbde7e01c74a46d7b6222fd406c9325428 (diff) | |
Introduce nullptr
Apply Fixits by Qt Creator.
Introduce more member initialization.
Change-Id: I81c6860188f0e1592c4df2435ff7f91500456741
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/winextras/iconextractor/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/winextras/iconextractor/main.cpp b/examples/winextras/iconextractor/main.cpp index 0d7ebbd..cee5728 100644 --- a/examples/winextras/iconextractor/main.cpp +++ b/examples/winextras/iconextractor/main.cpp @@ -99,7 +99,7 @@ static PixmapEntryList extractIcons(const QString &sourceFile, bool large) { const QString nativeName = QDir::toNativeSeparators(sourceFile); const wchar_t *sourceFileC = reinterpret_cast<const wchar_t *>(nativeName.utf16()); - const UINT iconCount = ExtractIconEx(sourceFileC, -1, 0, 0, 0); + const UINT iconCount = ExtractIconEx(sourceFileC, -1, nullptr, nullptr, 0); if (!iconCount) { std::wcerr << sourceFile << " does not appear to contain icons.\n"; return PixmapEntryList(); @@ -107,8 +107,8 @@ static PixmapEntryList extractIcons(const QString &sourceFile, bool large) QScopedArrayPointer<HICON> icons(new HICON[iconCount]); const UINT extractedIconCount = large ? - ExtractIconEx(sourceFileC, 0, icons.data(), 0, iconCount) : - ExtractIconEx(sourceFileC, 0, 0, icons.data(), iconCount); + ExtractIconEx(sourceFileC, 0, icons.data(), nullptr, iconCount) : + ExtractIconEx(sourceFileC, 0, nullptr, icons.data(), iconCount); if (!extractedIconCount) { qErrnoWarning("Failed to extract icons from %s", qPrintable(sourceFile)); return PixmapEntryList(); @@ -145,7 +145,7 @@ static QPixmap pixmapFromShellImageList(int iImageList, const SHFILEINFO &info) if (FAILED(SHGetImageList(iImageList, iID_IImageList, reinterpret_cast<void **>(&imageList)))) return result; - HICON hIcon = 0; + HICON hIcon = nullptr; if (SUCCEEDED(imageList->GetIcon(info.iIcon, ILD_TRANSPARENT, &hIcon))) { result = QtWin::fromHICON(hIcon); DestroyIcon(hIcon); |