0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE simplify ProblemProvider

Browse Source
This commit is contained in:
Petr Mrázek 2017-07-29 08:43:34 +02:00
parent 2c1ca040f8
commit 3ed990861a
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/logic/ProblemProvider.h
View File

@ -7,23 +7,8 @@ enum class ProblemSeverity
Error Error
}; };
class PatchProblem struct PatchProblem
{ {
public:
PatchProblem(ProblemSeverity severity, const QString & description)
{
m_severity = severity;
m_description = description;
}
const QString & getDescription() const
{
return m_description;
}
const ProblemSeverity getSeverity() const
{
return m_severity;
}
private:
ProblemSeverity m_severity; ProblemSeverity m_severity;
QString m_description; QString m_description;
}; };
@ -52,7 +37,7 @@ public:
{ {
m_problemSeverity = severity; m_problemSeverity = severity;
} }
m_problems.append(PatchProblem(severity, description)); m_problems.append({severity, description});
} }
private: private:

2
api/logic/minecraft/ProfilePatch.cpp
View File

@ -184,5 +184,5 @@ const QList<PatchProblem> ProfilePatch::getProblems()
{ {
return file->getProblems(); return file->getProblems();
} }
return {PatchProblem(ProblemSeverity::Error, QObject::tr("Patch is not loaded yet."))}; return {{ProblemSeverity::Error, QObject::tr("Patch is not loaded yet.")}};
} }

11
application/pages/VersionPage.cpp
View File

@ -119,10 +119,9 @@ VersionPage::VersionPage(OneSixInstance *inst, QWidget *parent)
ui->packageView->setModel(proxy); ui->packageView->setModel(proxy);
ui->packageView->installEventFilter(this); ui->packageView->installEventFilter(this);
ui->packageView->setSelectionMode(QAbstractItemView::SingleSelection); ui->packageView->setSelectionMode(QAbstractItemView::SingleSelection);
connect(ui->packageView->selectionModel(), &QItemSelectionModel::currentChanged, connect(ui->packageView->selectionModel(), &QItemSelectionModel::currentChanged, this, &VersionPage::versionCurrent);
this, &VersionPage::versionCurrent);
auto smodel = ui->packageView->selectionModel(); auto smodel = ui->packageView->selectionModel();
connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), SLOT(packageCurrent(QModelIndex, QModelIndex))); connect(smodel, &QItemSelectionModel::currentChanged, this, &VersionPage::packageCurrent);
updateVersionControls(); updateVersionControls();
// select first item. // select first item.
preselect(0); preselect(0);
@ -168,15 +167,15 @@ void VersionPage::packageCurrent(const QModelIndex &current, const QModelIndex &
QString problemOut; QString problemOut;
for (auto &problem: problems) for (auto &problem: problems)
{ {
if(problem.getSeverity() == ProblemSeverity::Error) if(problem.m_severity == ProblemSeverity::Error)
{ {
problemOut += tr("Error: "); problemOut += tr("Error: ");
} }
else if(problem.getSeverity() == ProblemSeverity::Warning) else if(problem.m_severity == ProblemSeverity::Warning)
{ {
problemOut += tr("Warning: "); problemOut += tr("Warning: ");
} }
problemOut += problem.getDescription(); problemOut += problem.m_description;
problemOut += "\n"; problemOut += "\n";
} }
ui->frame->setModDescription(problemOut); ui->frame->setModDescription(problemOut);