diff options
Diffstat (limited to 'examples/winextras/iconextractor/main.cpp')
| -rw-r--r-- | examples/winextras/iconextractor/main.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/examples/winextras/iconextractor/main.cpp b/examples/winextras/iconextractor/main.cpp index d630f9b..0d7ebbd 100644 --- a/examples/winextras/iconextractor/main.cpp +++ b/examples/winextras/iconextractor/main.cpp @@ -189,17 +189,15 @@ static PixmapEntryList extractShellIcons(const QString &sourceFile, bool addOver if (!QFileInfo(sourceFile).isDir()) baseFlags |= SHGFI_USEFILEATTRIBUTES; - const size_t modeEntryCount = sizeof(modeEntries) / sizeof(modeEntries[0]); - const size_t standardSizeEntryCount = sizeof(standardSizeEntries) / sizeof(standardSizeEntries[0]); PixmapEntryList result; - for (size_t m = 0; m < modeEntryCount; ++m) { - const unsigned modeFlags = baseFlags | modeEntries[m].flags; + for (auto modeEntry : modeEntries) { + const unsigned modeFlags = baseFlags | modeEntry.flags; QString modePrefix = QLatin1String("_shell_"); - if (modeEntries[m].name[0]) - modePrefix += QLatin1String(modeEntries[m].name) + QLatin1Char('_'); - for (size_t s = 0; s < standardSizeEntryCount; ++s) { - const unsigned flags = modeFlags | standardSizeEntries[s].flags; - const QString prefix = modePrefix + QLatin1String(standardSizeEntries[s].name) + if (modeEntry.name[0]) + modePrefix += QLatin1String(modeEntry.name) + QLatin1Char('_'); + for (auto standardSizeEntry : standardSizeEntries) { + const unsigned flags = modeFlags | standardSizeEntry.flags; + const QString prefix = modePrefix + QLatin1String(standardSizeEntry.name) + QLatin1Char('_'); ZeroMemory(&info, sizeof(SHFILEINFO)); const HRESULT hr = SHGetFileInfo(sourceFileC, 0, &info, sizeof(SHFILEINFO), flags); @@ -280,7 +278,7 @@ int main(int argc, char *argv[]) const QCommandLineOption shellOverlayOption(QStringLiteral("overlay"), QStringLiteral("Extract shell overlay icons")); parser.addOption(shellOverlayOption); parser.addPositionalArgument(QStringLiteral("file"), QStringLiteral("The file to open.")); - parser.addPositionalArgument(QStringLiteral("image file folder"), QStringLiteral("The folder to store the images.")); + parser.addPositionalArgument(QStringLiteral("image_file_folder"), QStringLiteral("The folder to store the images.")); parser.process(app); const QStringList &positionalArguments = parser.positionalArguments(); if (positionalArguments.isEmpty()) @@ -299,9 +297,9 @@ int main(int argc, char *argv[]) ? extractShellIcons(sourceFile, parser.isSet(shellOverlayOption)) : extractIcons(sourceFile, parser.isSet(largeIconOption)); - for (int i = 0, count = pixmaps.size(); i < count; ++i) { - const QString fileName = imageFileRoot + pixmaps.at(i).name + QLatin1String(".png"); - if (!pixmaps.at(i).pixmap.save(fileName)) { + for (const auto &entry : pixmaps) { + const QString fileName = imageFileRoot + entry.name + QLatin1String(".png"); + if (!entry.pixmap.save(fileName)) { std::wcerr << "Error writing image file " << fileName << ".\n"; return 1; } |