diff options
Diffstat (limited to 'src/modules/addon')
| -rw-r--r-- | src/modules/addon/AddonFunctions.cpp | 8 | ||||
| -rw-r--r-- | src/modules/addon/libkviaddon.cpp | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp index 88a7b0fdd..5ffd5466c 100644 --- a/src/modules/addon/AddonFunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -91,9 +91,9 @@ namespace AddonFunctions return notAValidAddonPackage(szError); // make sure the default fields exist - for(int i = 0; i < 6; i++) + for(auto & check_field : check_fields) { - pValue = pInfoFields->find(check_fields[i]); + pValue = pInfoFields->find(check_field); if(!pValue) return notAValidAddonPackage(szError); } @@ -340,10 +340,8 @@ namespace AddonFunctions return false; } - for(QFileInfoList::Iterator it = ls.begin(); it != ls.end(); ++it) + for(auto & inf : ls) { - const QFileInfo & inf = *it; - if(inf.isDir()) { if(!pw.addDirectory(inf.absoluteFilePath(), QString("%1/").arg(inf.fileName()))) diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index 6b96a0cf0..bc3ce94e2 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -730,9 +730,9 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) KviFileUtils::makeDir(szTargetPath); - for(QStringList::Iterator it = lExpandedEntries.begin(); it != lExpandedEntries.end(); ++it) + for(auto & lExpandedEntrie : lExpandedEntries) { - QFileInfo inf(*it); + QFileInfo inf(lExpandedEntrie); if(!inf.exists()) { qDebug("ERROR: file %s doesn't exist, but it should...", inf.fileName().toUtf8().data()); @@ -743,9 +743,9 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) g_pApp->getLocalKvircDirectory(szTargetPath, KviApplication::None, szEntry); if(!bQuiet) - c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(*it).arg(szTargetPath)); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(lExpandedEntrie).arg(szTargetPath)); - KviFileUtils::copyFile(*it, szTargetPath); + KviFileUtils::copyFile(lExpandedEntrie, szTargetPath); a->addInstalledFile(szEntry); } |