mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 09:59:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(clang-tidy): modernize the code

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2026-05-10 23:16:46 +03:00
parent 170d59de2a
commit 1af838db2e
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
38 changed files with 1088 additions and 956 deletions
Download patch file Download diff file Expand all files Collapse all files

140
launcher/VersionProxyModel.cpp
View file

@ -44,21 +44,21 @@
class VersionFilterModel : public QSortFilterProxyModel {
Q_OBJECT
public:
VersionFilterModel(VersionProxyModel* parent) : QSortFilterProxyModel(parent)
explicit VersionFilterModel(VersionProxyModel* parent) : QSortFilterProxyModel(parent), m_parent(parent)
{
m_parent = parent;
setSortRole(BaseVersionList::SortRole);
sort(0, Qt::DescendingOrder);
}
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override
{
const auto& filters = m_parent->filters();
const QString& search = m_parent->search();
const QModelIndex idx = sourceModel()->index(source_row, 0, source_parent);
const QModelIndex idx = sourceModel()->index(sourceRow, 0, sourceParent);
if (!search.isEmpty() && !sourceModel()->data(idx, BaseVersionList::VersionRole).toString().contains(search, Qt::CaseInsensitive))
if (!search.isEmpty() && !sourceModel()->data(idx, BaseVersionList::VersionRole).toString().contains(search, Qt::CaseInsensitive)) {
return false;
}
for (auto it = filters.begin(); it != filters.end(); ++it) {
auto data = sourceModel()->data(idx, it.key());
@ -84,14 +84,13 @@ class VersionFilterModel : public QSortFilterProxyModel {
VersionProxyModel* m_parent;
};
VersionProxyModel::VersionProxyModel(QObject* parent) : QAbstractProxyModel(parent)
VersionProxyModel::VersionProxyModel(QObject* parent) : QAbstractProxyModel(parent), m_filterModel(new VersionFilterModel(this))
{
filterModel = new VersionFilterModel(this);
connect(filterModel, &QAbstractItemModel::dataChanged, this, &VersionProxyModel::sourceDataChanged);
connect(filterModel, &QAbstractItemModel::rowsAboutToBeInserted, this, &VersionProxyModel::sourceRowsAboutToBeInserted);
connect(filterModel, &QAbstractItemModel::rowsInserted, this, &VersionProxyModel::sourceRowsInserted);
connect(filterModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &VersionProxyModel::sourceRowsAboutToBeRemoved);
connect(filterModel, &QAbstractItemModel::rowsRemoved, this, &VersionProxyModel::sourceRowsRemoved);
connect(m_filterModel, &QAbstractItemModel::dataChanged, this, &VersionProxyModel::sourceDataChanged);
connect(m_filterModel, &QAbstractItemModel::rowsAboutToBeInserted, this, &VersionProxyModel::sourceRowsAboutToBeInserted);
connect(m_filterModel, &QAbstractItemModel::rowsInserted, this, &VersionProxyModel::sourceRowsInserted);
connect(m_filterModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &VersionProxyModel::sourceRowsAboutToBeRemoved);
connect(m_filterModel, &QAbstractItemModel::rowsRemoved, this, &VersionProxyModel::sourceRowsRemoved);
// FIXME: implement when needed
/*
connect(replacing, &QAbstractItemModel::rowsAboutToBeMoved, this, &VersionProxyModel::sourceRowsAboutToBeMoved);
@ -99,18 +98,20 @@ VersionProxyModel::VersionProxyModel(QObject* parent) : QAbstractProxyModel(pare
connect(replacing, &QAbstractItemModel::layoutAboutToBeChanged, this, &VersionProxyModel::sourceLayoutAboutToBeChanged);
connect(replacing, &QAbstractItemModel::layoutChanged, this, &VersionProxyModel::sourceLayoutChanged);
*/
connect(filterModel, &QAbstractItemModel::modelAboutToBeReset, this, &VersionProxyModel::sourceAboutToBeReset);
connect(filterModel, &QAbstractItemModel::modelReset, this, &VersionProxyModel::sourceReset);
connect(m_filterModel, &QAbstractItemModel::modelAboutToBeReset, this, &VersionProxyModel::sourceAboutToBeReset);
connect(m_filterModel, &QAbstractItemModel::modelReset, this, &VersionProxyModel::sourceReset);
QAbstractProxyModel::setSourceModel(filterModel);
QAbstractProxyModel::setSourceModel(m_filterModel);
}
QVariant VersionProxyModel::headerData(int section, Qt::Orientation orientation, int role) const
{
if (section < 0 || section >= m_columns.size())
return QVariant();
if (orientation != Qt::Horizontal)
return QVariant();
if (section < 0 || section >= m_columns.size()) {
return {};
}
if (orientation != Qt::Horizontal) {
return {};
}
auto column = m_columns[section];
if (role == Qt::DisplayRole) {
switch (column) {
@ -161,7 +162,7 @@ QVariant VersionProxyModel::headerData(int section, Qt::Orientation orientation,
QVariant VersionProxyModel::data(const QModelIndex& index, int role) const
{
if (!index.isValid()) {
return QVariant();
return {};
}
auto column = m_columns[index.column()];
auto parentIndex = mapToSource(index);
@ -196,11 +197,12 @@ QVariant VersionProxyModel::data(const QModelIndex& index, int role) const
}
}
case Qt::ToolTipRole: {
if (column == Name && hasRecommended) {
if (column == Name && m_hasRecommended) {
auto value = sourceModel()->data(parentIndex, BaseVersionList::RecommendedRole);
if (value.toBool()) {
return tr("Recommended");
} else if (hasLatest) {
}
if (m_hasLatest) {
auto latest = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
if (latest.toBool()) {
return tr("Latest");
@ -210,11 +212,12 @@ QVariant VersionProxyModel::data(const QModelIndex& index, int role) const
return sourceModel()->data(parentIndex, BaseVersionList::VersionIdRole);
}
case Qt::DecorationRole: {
if (column == Name && hasRecommended) {
if (column == Name && m_hasRecommended) {
auto recommenced = sourceModel()->data(parentIndex, BaseVersionList::RecommendedRole);
if (recommenced.toBool()) {
return QIcon::fromTheme("star");
} else if (hasLatest) {
}
if (m_hasLatest) {
auto latest = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
if (latest.toBool()) {
return QIcon::fromTheme("bug");
@ -233,7 +236,7 @@ QVariant VersionProxyModel::data(const QModelIndex& index, int role) const
return QVariant();
}
default: {
if (roles.contains((BaseVersionList::ModelRoles)role)) {
if (m_roles.contains((BaseVersionList::ModelRoles)role)) {
return sourceModel()->data(parentIndex, role);
}
return QVariant();
@ -266,18 +269,20 @@ QModelIndex VersionProxyModel::index(int row, int column, const QModelIndex& par
{
// no trees here... shoo
if (parent.isValid()) {
return QModelIndex();
return {};
}
if (row < 0 || row >= sourceModel()->rowCount()) {
return {};
}
if (column < 0 || column >= columnCount()) {
return {};
}
if (row < 0 || row >= sourceModel()->rowCount())
return QModelIndex();
if (column < 0 || column >= columnCount())
return QModelIndex();
return QAbstractItemModel::createIndex(row, column);
}
int VersionProxyModel::columnCount(const QModelIndex& parent) const
{
return parent.isValid() ? 0 : m_columns.size();
return parent.isValid() ? 0 : static_cast<int>(m_columns.size());
}
int VersionProxyModel::rowCount(const QModelIndex& parent) const
@ -288,30 +293,31 @@ int VersionProxyModel::rowCount(const QModelIndex& parent) const
return 0;
}
void VersionProxyModel::sourceDataChanged(const QModelIndex& source_top_left, const QModelIndex& source_bottom_right)
void VersionProxyModel::sourceDataChanged(const QModelIndex& sourceTopLeft, const QModelIndex& sourceBottomRight)
{
if (source_top_left.parent() != source_bottom_right.parent())
return;
// whole row is getting changed
auto topLeft = createIndex(source_top_left.row(), 0);
auto bottomRight = createIndex(source_bottom_right.row(), columnCount() - 1);
emit dataChanged(topLeft, bottomRight);
}
void VersionProxyModel::setSourceModel(QAbstractItemModel* replacingRaw)
{
auto replacing = dynamic_cast<BaseVersionList*>(replacingRaw);
m_columns.clear();
if (!replacing) {
roles.clear();
filterModel->setSourceModel(replacing);
if (sourceTopLeft.parent() != sourceBottomRight.parent()) {
return;
}
roles = replacing->providesRoles();
if (roles.contains(BaseVersionList::VersionRole)) {
// whole row is getting changed
auto topLeft = createIndex(sourceTopLeft.row(), 0);
auto bottomRight = createIndex(sourceBottomRight.row(), columnCount() - 1);
emit dataChanged(topLeft, bottomRight);
}
void VersionProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
{
auto* replacing = dynamic_cast<BaseVersionList*>(sourceModel);
m_columns.clear();
if (!replacing) {
m_roles.clear();
m_filterModel->setSourceModel(replacing);
return;
}
m_roles = replacing->providesRoles();
if (m_roles.contains(BaseVersionList::VersionRole)) {
m_columns.push_back(Name);
}
/*
@ -320,39 +326,39 @@ void VersionProxyModel::setSourceModel(QAbstractItemModel* replacingRaw)
m_columns.push_back(ParentVersion);
}
*/
if (roles.contains(BaseVersionList::CPUArchitectureRole)) {
if (m_roles.contains(BaseVersionList::CPUArchitectureRole)) {
m_columns.push_back(CPUArchitecture);
}
if (roles.contains(BaseVersionList::PathRole)) {
if (m_roles.contains(BaseVersionList::PathRole)) {
m_columns.push_back(Path);
}
if (roles.contains(BaseVersionList::JavaNameRole)) {
if (m_roles.contains(BaseVersionList::JavaNameRole)) {
m_columns.push_back(JavaName);
}
if (roles.contains(BaseVersionList::JavaMajorRole)) {
if (m_roles.contains(BaseVersionList::JavaMajorRole)) {
m_columns.push_back(JavaMajor);
}
if (roles.contains(Meta::VersionList::TimeRole)) {
if (m_roles.contains(Meta::VersionList::TimeRole)) {
m_columns.push_back(Time);
}
if (roles.contains(BaseVersionList::BranchRole)) {
if (m_roles.contains(BaseVersionList::BranchRole)) {
m_columns.push_back(Branch);
}
if (roles.contains(BaseVersionList::TypeRole)) {
if (m_roles.contains(BaseVersionList::TypeRole)) {
m_columns.push_back(Type);
}
if (roles.contains(BaseVersionList::RecommendedRole)) {
hasRecommended = true;
if (m_roles.contains(BaseVersionList::RecommendedRole)) {
m_hasRecommended = true;
}
if (roles.contains(BaseVersionList::LatestRole)) {
hasLatest = true;
if (m_roles.contains(BaseVersionList::LatestRole)) {
m_hasLatest = true;
}
filterModel->setSourceModel(replacing);
m_filterModel->setSourceModel(replacing);
}
QModelIndex VersionProxyModel::getRecommended() const
{
if (!roles.contains(BaseVersionList::RecommendedRole)) {
if (!m_roles.contains(BaseVersionList::RecommendedRole)) {
return index(0, 0);
}
int recommended = 0;
@ -384,19 +390,19 @@ void VersionProxyModel::clearFilters()
{
m_filters.clear();
m_search.clear();
filterModel->filterChanged();
m_filterModel->filterChanged();
}
void VersionProxyModel::setFilter(const BaseVersionList::ModelRoles column, Filter f)
{
m_filters[column] = std::move(f);
filterModel->filterChanged();
m_filterModel->filterChanged();
}
void VersionProxyModel::setSearch(const QString& search)
{
m_search = search;
filterModel->filterChanged();
m_filterModel->filterChanged();
}
const VersionProxyModel::FilterMap& VersionProxyModel::filters() const