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

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();