dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: fix some codeql warnings

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-06-05 09:26:00 +03:00
parent 0136c2e82a
commit 7ea15c31a1
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
18 changed files with 72 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
launcher/minecraft/mod/ResourcePack.h
View file

@ -24,5 +24,5 @@ class ResourcePack : public DataPack {
/** Gets, respectively, the lower and upper versions supported by the set pack format. */
[[nodiscard]] std::pair<Version, Version> compatibleVersions() const override;
virtual QString directory() { return "/assets"; }
virtual QString directory() override { return "/assets"; }
};

1
launcher/modplatform/atlauncher/ATLPackIndex.h
View file

@ -45,3 +45,4 @@ void loadIndexedPack(IndexedPack& m, QJsonObject& obj);
} // namespace ATLauncher
Q_DECLARE_METATYPE(ATLauncher::IndexedPack)
Q_DECLARE_METATYPE(QList<ATLauncher::IndexedVersion>)

1
launcher/modplatform/flame/FlamePackIndex.h
View file

@ -50,3 +50,4 @@ void loadIndexedPackVersions(IndexedPack& m, QJsonArray& arr);
} // namespace Flame
Q_DECLARE_METATYPE(Flame::IndexedPack)
Q_DECLARE_METATYPE(QList<Flame::IndexedVersion>)

1
launcher/modplatform/modrinth/ModrinthPackManifest.h
View file

@ -124,3 +124,4 @@ auto validateDownloadUrl(QUrl) -> bool;
Q_DECLARE_METATYPE(Modrinth::Modpack)
Q_DECLARE_METATYPE(Modrinth::ModpackVersion)
Q_DECLARE_METATYPE(QList<Modrinth::ModpackVersion>)

6
launcher/ui/pages/instance/McResolver.cpp
View file

@ -37,9 +37,9 @@ void McResolver::pingWithDomainSRV(QString domain, int port)
}
const auto& firstRecord = records.at(0);
QString domain = firstRecord.target();
int port = firstRecord.port();
pingWithDomainA(domain, port);
QString newDomain = firstRecord.target();
int newPort = firstRecord.port();
pingWithDomainA(newDomain, newPort);
});
lookup->lookup();

13
launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.cpp
View file

@ -68,7 +68,10 @@ bool FilterModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParen
return true;
}
QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
ATLauncher::IndexedPack pack = sourceModel()->data(index, Qt::UserRole).value<ATLauncher::IndexedPack>();
QVariant raw = sourceModel()->data(index, Qt::UserRole);
Q_ASSERT(raw.canConvert<ATLauncher::IndexedPack>());
auto pack = raw.value<ATLauncher::IndexedPack>();
if (searchTerm.startsWith("#"))
return QString::number(pack.id) == searchTerm.mid(1);
return pack.name.contains(searchTerm, Qt::CaseInsensitive);
@ -76,8 +79,12 @@ bool FilterModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParen
bool FilterModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
{
ATLauncher::IndexedPack leftPack = sourceModel()->data(left, Qt::UserRole).value<ATLauncher::IndexedPack>();
ATLauncher::IndexedPack rightPack = sourceModel()->data(right, Qt::UserRole).value<ATLauncher::IndexedPack>();
QVariant leftRaw = sourceModel()->data(left, Qt::UserRole);
Q_ASSERT(leftRaw.canConvert<ATLauncher::IndexedPack>());
auto leftPack = leftRaw.value<ATLauncher::IndexedPack>();
QVariant rightRaw = sourceModel()->data(right, Qt::UserRole);
Q_ASSERT(rightRaw.canConvert<ATLauncher::IndexedPack>());
auto rightPack = rightRaw.value<ATLauncher::IndexedPack>();
if (currentSorting == ByPopularity) {
return leftPack.position > rightPack.position;

4
launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp
View file

@ -143,7 +143,9 @@ void AtlPage::onSelectionChanged(QModelIndex first, [[maybe_unused]] QModelIndex
return;
}
selected = filterModel->data(first, Qt::UserRole).value<ATLauncher::IndexedPack>();
QVariant raw = filterModel->data(first, Qt::UserRole);
Q_ASSERT(raw.canConvert<ATLauncher::IndexedPack>());
selected = raw.value<ATLauncher::IndexedPack>();
ui->packDescription->setHtml(StringUtils::htmlListPatch(selected.description.replace("\n", "<br>")));

1
launcher/ui/pages/modplatform/flame/FlameModel.cpp
View file

@ -79,6 +79,7 @@ bool ListModel::setData(const QModelIndex& index, const QVariant& value, [[maybe
if (pos >= modpacks.size() || pos < 0 || !index.isValid())
return false;
Q_ASSERT(value.canConvert<Flame::IndexedPack>());
modpacks[pos] = value.value<Flame::IndexedPack>();
return true;

4
launcher/ui/pages/modplatform/flame/FlamePage.cpp
View file

@ -166,7 +166,9 @@ void FlamePage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelInde
return;
}
current = listModel->data(curr, Qt::UserRole).value<Flame::IndexedPack>();
QVariant raw = listModel->data(curr, Qt::UserRole);
Q_ASSERT(raw.canConvert<Flame::IndexedPack>());
current = raw.value<Flame::IndexedPack>();
if (!current.versionsLoaded || m_filterWidget->changed()) {
qDebug() << "Loading flame modpack versions";

7
launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
View file

@ -103,13 +103,16 @@ void ImportFTBPage::suggestCurrent()
dialog->setSuggestedIconFromFile(FS::PathCombine(selected.path, "folder.jpg"), editedLogoName);
}
void ImportFTBPage::onPublicPackSelectionChanged(QModelIndex now, QModelIndex prev)
void ImportFTBPage::onPublicPackSelectionChanged(QModelIndex now, QModelIndex)
{
if (!now.isValid()) {
onPackSelectionChanged();
return;
}
Modpack selectedPack = currentModel->data(now, Qt::UserRole).value<Modpack>();
QVariant raw = currentModel->data(now, Qt::UserRole);
Q_ASSERT(raw.canConvert<Modpack>());
auto selectedPack = raw.value<Modpack>();
onPackSelectionChanged(&selectedPack);
}

12
launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
View file

@ -143,8 +143,12 @@ FilterModel::FilterModel(QObject* parent) : QSortFilterProxyModel(parent)
bool FilterModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
{
Modpack leftPack = sourceModel()->data(left, Qt::UserRole).value<Modpack>();
Modpack rightPack = sourceModel()->data(right, Qt::UserRole).value<Modpack>();
QVariant leftRaw = sourceModel()->data(left, Qt::UserRole);
Q_ASSERT(leftRaw.canConvert<Modpack>());
auto leftPack = leftRaw.value<Modpack>();
QVariant rightRaw = sourceModel()->data(right, Qt::UserRole);
Q_ASSERT(rightRaw.canConvert<Modpack>());
auto rightPack = rightRaw.value<Modpack>();
if (m_currentSorting == Sorting::ByGameVersion) {
Version lv(leftPack.mcVersion);
@ -166,7 +170,9 @@ bool FilterModel::filterAcceptsRow([[maybe_unused]] int sourceRow, [[maybe_unuse
return true;
}
QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
Modpack pack = sourceModel()->data(index, Qt::UserRole).value<Modpack>();
QVariant raw = sourceModel()->data(index, Qt::UserRole);
Q_ASSERT(raw.canConvert<Modpack>());
auto pack = raw.value<Modpack>();
return pack.name.contains(m_searchTerm, Qt::CaseInsensitive);
}

12
launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
View file

@ -61,8 +61,12 @@ FilterModel::FilterModel(QObject* parent) : QSortFilterProxyModel(parent)
bool FilterModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
{
Modpack leftPack = sourceModel()->data(left, Qt::UserRole).value<Modpack>();
Modpack rightPack = sourceModel()->data(right, Qt::UserRole).value<Modpack>();
QVariant leftRaw = sourceModel()->data(left, Qt::UserRole);
Q_ASSERT(leftRaw.canConvert<Modpack>());
auto leftPack = leftRaw.value<Modpack>();
QVariant rightRaw = sourceModel()->data(right, Qt::UserRole);
Q_ASSERT(rightRaw.canConvert<Modpack>());
auto rightPack = rightRaw.value<Modpack>();
if (currentSorting == Sorting::ByGameVersion) {
Version lv(leftPack.mcVersion);
@ -84,7 +88,9 @@ bool FilterModel::filterAcceptsRow([[maybe_unused]] int sourceRow, [[maybe_unuse
return true;
}
QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
Modpack pack = sourceModel()->data(index, Qt::UserRole).value<Modpack>();
QVariant raw = sourceModel()->data(index, Qt::UserRole);
Q_ASSERT(raw.canConvert<Modpack>());
auto pack = raw.value<Modpack>();
if (searchTerm.startsWith("#"))
return pack.packCode == searchTerm.mid(1);
return pack.name.contains(searchTerm, Qt::CaseInsensitive);

16
launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
View file

@ -233,7 +233,9 @@ void Page::onPublicPackSelectionChanged(QModelIndex now, [[maybe_unused]] QModel
onPackSelectionChanged();
return;
}
Modpack selectedPack = publicFilterModel->data(now, Qt::UserRole).value<Modpack>();
QVariant raw = publicFilterModel->data(now, Qt::UserRole);
Q_ASSERT(raw.canConvert<Modpack>());
auto selectedPack = raw.value<Modpack>();
onPackSelectionChanged(&selectedPack);
}
@ -243,7 +245,9 @@ void Page::onThirdPartyPackSelectionChanged(QModelIndex now, [[maybe_unused]] QM
onPackSelectionChanged();
return;
}
Modpack selectedPack = thirdPartyFilterModel->data(now, Qt::UserRole).value<Modpack>();
QVariant raw = thirdPartyFilterModel->data(now, Qt::UserRole);
Q_ASSERT(raw.canConvert<Modpack>());
auto selectedPack = raw.value<Modpack>();
onPackSelectionChanged(&selectedPack);
}
@ -253,7 +257,9 @@ void Page::onPrivatePackSelectionChanged(QModelIndex now, [[maybe_unused]] QMode
onPackSelectionChanged();
return;
}
Modpack selectedPack = privateFilterModel->data(now, Qt::UserRole).value<Modpack>();
QVariant raw = privateFilterModel->data(now, Qt::UserRole);
Q_ASSERT(raw.canConvert<Modpack>());
auto selectedPack = raw.value<Modpack>();
onPackSelectionChanged(&selectedPack);
}
@ -328,7 +334,9 @@ void Page::onTabChanged(int tab)
currentList->selectionModel()->reset();
QModelIndex idx = currentList->currentIndex();
if (idx.isValid()) {
auto pack = currentModel->data(idx, Qt::UserRole).value<Modpack>();
QVariant raw = currentModel->data(idx, Qt::UserRole);
Q_ASSERT(raw.canConvert<Modpack>());
auto pack = raw.value<Modpack>();
onPackSelectionChanged(&pack);
} else {
onPackSelectionChanged();

5
launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
View file

@ -121,6 +121,7 @@ bool ModpackListModel::setData(const QModelIndex& index, const QVariant& value,
if (pos >= modpacks.size() || pos < 0 || !index.isValid())
return false;
Q_ASSERT(value.canConvert<Modrinth::Modpack>());
modpacks[pos] = value.value<Modrinth::Modpack>();
return true;
@ -137,7 +138,7 @@ void ModpackListModel::performPaginatedSearch()
ResourceAPI::ProjectInfoCallbacks callbacks;
callbacks.on_fail = [this](QString reason) { searchRequestFailed(reason); };
callbacks.on_succeed = [this](auto& doc, auto& pack) { searchRequestForOneSucceeded(doc); };
callbacks.on_succeed = [this](auto& doc, auto&) { searchRequestForOneSucceeded(doc); };
callbacks.on_abort = [this] {
qCritical() << "Search task aborted by an unknown reason!";
searchRequestFailed("Aborted");
@ -345,7 +346,7 @@ void ModpackListModel::searchRequestForOneSucceeded(QJsonDocument& doc)
endInsertRows();
}
void ModpackListModel::searchRequestFailed(QString reason)
void ModpackListModel::searchRequestFailed(QString)
{
auto failed_action = dynamic_cast<NetJob*>(jobPtr.get())->getFailedActions().at(0);
if (failed_action->replyStatusCode() == -1) {

4
launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
View file

@ -150,7 +150,9 @@ void ModrinthPage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelI
return;
}
current = m_model->data(curr, Qt::UserRole).value<Modrinth::Modpack>();
QVariant raw = m_model->data(curr, Qt::UserRole);
Q_ASSERT(raw.canConvert<Modrinth::Modpack>());
current = raw.value<Modrinth::Modpack>();
auto name = current.name;
if (!current.extraInfoLoaded) {

1
launcher/ui/pages/modplatform/technic/TechnicData.h
View file

@ -36,6 +36,7 @@
#pragma once
#include <QList>
#include <QMetaType>
#include <QString>
namespace Technic {

4
launcher/ui/pages/modplatform/technic/TechnicPage.cpp
View file

@ -135,7 +135,9 @@ void TechnicPage::onSelectionChanged(QModelIndex first, [[maybe_unused]] QModelI
return;
}
current = model->data(first, Qt::UserRole).value<Technic::Modpack>();
QVariant raw = model->data(first, Qt::UserRole);
Q_ASSERT(raw.canConvert<Technic::Modpack>());
current = raw.value<Technic::Modpack>();
suggestCurrent();
}

4
tests/FileSystem_test.cpp
View file

@ -69,7 +69,9 @@ class LinkTask : public Task {
}
FS::create_link* m_lnk;
[[maybe_unused]] bool m_useHard = false;
#if defined Q_OS_WIN32
bool m_useHard = false;
#endif
bool m_linkRecursive = true;
};