Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-24 10:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: replace foreach macro

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-05-14 09:55:55 +03:00
parent 198fbd19cf
commit bbfaaef31d
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/java/JavaUtils.cpp
View File

@ -365,13 +365,13 @@ QList<QString> JavaUtils::FindJavaPaths()
javas.append("/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java"); javas.append("/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java");
QDir libraryJVMDir("/Library/Java/JavaVirtualMachines/"); QDir libraryJVMDir("/Library/Java/JavaVirtualMachines/");
QStringList libraryJVMJavas = libraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); QStringList libraryJVMJavas = libraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
foreach (const QString& java, libraryJVMJavas) { for (const QString& java : libraryJVMJavas) {
javas.append(libraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java"); javas.append(libraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
javas.append(libraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/jre/bin/java"); javas.append(libraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/jre/bin/java");
} }
QDir systemLibraryJVMDir("/System/Library/Java/JavaVirtualMachines/"); QDir systemLibraryJVMDir("/System/Library/Java/JavaVirtualMachines/");
QStringList systemLibraryJVMJavas = systemLibraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); QStringList systemLibraryJVMJavas = systemLibraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
foreach (const QString& java, systemLibraryJVMJavas) { for (const QString& java : systemLibraryJVMJavas) {
javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java"); javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java"); javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java");
} }
@ -381,14 +381,14 @@ QList<QString> JavaUtils::FindJavaPaths()
// javas downloaded by sdkman // javas downloaded by sdkman
QDir sdkmanDir(FS::PathCombine(home, ".sdkman/candidates/java")); QDir sdkmanDir(FS::PathCombine(home, ".sdkman/candidates/java"));
QStringList sdkmanJavas = sdkmanDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); QStringList sdkmanJavas = sdkmanDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
foreach (const QString& java, sdkmanJavas) { for (const QString& java : sdkmanJavas) {
javas.append(sdkmanDir.absolutePath() + "/" + java + "/bin/java"); javas.append(sdkmanDir.absolutePath() + "/" + java + "/bin/java");
} }
// java in user library folder (like from intellij downloads) // java in user library folder (like from intellij downloads)
QDir userLibraryJVMDir(FS::PathCombine(home, "Library/Java/JavaVirtualMachines/")); QDir userLibraryJVMDir(FS::PathCombine(home, "Library/Java/JavaVirtualMachines/"));
QStringList userLibraryJVMJavas = userLibraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); QStringList userLibraryJVMJavas = userLibraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
foreach (const QString& java, userLibraryJVMJavas) { for (const QString& java : userLibraryJVMJavas) {
javas.append(userLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java"); javas.append(userLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
javas.append(userLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java"); javas.append(userLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java");
} }

2
launcher/ui/widgets/CheckComboBox.cpp
View File

@ -178,7 +178,7 @@ QStringList CheckComboBox::checkedItems() const
void CheckComboBox::setCheckedItems(const QStringList& items) void CheckComboBox::setCheckedItems(const QStringList& items)
{ {
foreach (auto text, items) { for (auto text : items) {
auto index = findText(text); auto index = findText(text);
setItemCheckState(index, index != -1 ? Qt::Checked : Qt::Unchecked); setItemCheckState(index, index != -1 ? Qt::Checked : Qt::Unchecked);
} }

4
launcher/ui/widgets/InfoFrame.cpp
View File

@ -287,7 +287,7 @@ void InfoFrame::setDescription(QString text)
QChar rem('\n'); QChar rem('\n');
QString finaltext; QString finaltext;
finaltext.reserve(intermediatetext.size()); finaltext.reserve(intermediatetext.size());
foreach (const QChar& c, intermediatetext) { for (const QChar& c : intermediatetext) {
if (c == rem && prev) { if (c == rem && prev) {
continue; continue;
} }
@ -341,7 +341,7 @@ void InfoFrame::setLicense(QString text)
QChar rem('\n'); QChar rem('\n');
QString finaltext; QString finaltext;
finaltext.reserve(intermediatetext.size()); finaltext.reserve(intermediatetext.size());
foreach (const QChar& c, intermediatetext) { for (const QChar& c : intermediatetext) {
if (c == rem && prev) { if (c == rem && prev) {
continue; continue;
} }

2
launcher/updater/MacSparkleUpdater.mm
View File

@ -166,7 +166,7 @@ void MacSparkleUpdater::setAllowedChannels(const QSet<QString>& channels) {
QString channelsConfig = ""; QString channelsConfig = "";
// Convert QSet<QString> -> NSSet<NSString> // Convert QSet<QString> -> NSSet<NSString>
NSMutableSet<NSString*>* nsChannels = [NSMutableSet setWithCapacity:channels.count()]; NSMutableSet<NSString*>* nsChannels = [NSMutableSet setWithCapacity:channels.count()];
foreach (const QString channel, channels) { for (const QString channel : channels) {
[nsChannels addObject:channel.toNSString()]; [nsChannels addObject:channel.toNSString()];
channelsConfig += channel + " "; channelsConfig += channel + " ";
} }