NOISSUE Rough refactor of ProfilePatch and VersionFile internals.

They are now distinct classes with distinct responsibilities.

* ProfilePatch is an entry in MinecraftProfile and can hold VersionFile or Meta::Version.
* VersionFile is the basic element that holds version information loaded from JSON.
* Meta::Version is the loader class for VersionFile(s) from a server.

2 files changed, 11 insertions, 11 deletions

diff --git a/application/VersionProxyModel.cpp b/application/VersionProxyModel.cpp
index 50b94d9e..00390b36 100644
--- a/application/VersionProxyModel.cpp
+++ b/application/VersionProxyModel.cpp
@@ -26,7 +26,7 @@ public:
 
 			switch(role)
 			{
-				case BaseVersionList::ParentGameVersionRole:
+				case BaseVersionList::ParentVersionRole:
 				case BaseVersionList::VersionIdRole:
 				{
 					auto versionString = data.toString();
@@ -146,7 +146,7 @@ QVariant VersionProxyModel::data(const QModelIndex &index, int role) const
 				case Name:
 					return sourceModel()->data(parentIndex, BaseVersionList::VersionRole);
 				case ParentVersion:
-					return sourceModel()->data(parentIndex, BaseVersionList::ParentGameVersionRole);
+					return sourceModel()->data(parentIndex, BaseVersionList::ParentVersionRole);
 				case Branch:
 					return sourceModel()->data(parentIndex, BaseVersionList::BranchRole);
 				case Type:
@@ -327,7 +327,7 @@ void VersionProxyModel::setSourceModel(QAbstractItemModel *replacingRaw)
 		m_columns.push_back(Name);
 	}
 	/*
-	if(roles.contains(BaseVersionList::ParentGameVersionRole))
+	if(roles.contains(BaseVersionList::ParentVersionRole))
 	{
 		m_columns.push_back(ParentVersion);
 	}
diff --git a/application/pages/VersionPage.cpp b/application/pages/VersionPage.cpp
index 0608b2bf..5a0b2243 100644
--- a/application/pages/VersionPage.cpp
+++ b/application/pages/VersionPage.cpp
@@ -152,14 +152,14 @@ void VersionPage::packageCurrent(const QModelIndex &current, const QModelIndex &
 	auto severity = patch->getProblemSeverity();
 	switch(severity)
 	{
-		case PROBLEM_WARNING:
+		case ProblemSeverity::Warning:
 			ui->frame->setModText(tr("%1 possibly has issues.").arg(patch->getName()));
 			break;
-		case PROBLEM_ERROR:
+		case ProblemSeverity::Error:
 			ui->frame->setModText(tr("%1 has issues!").arg(patch->getName()));
 			break;
 		default:
-		case PROBLEM_NONE:
+		case ProblemSeverity::None:
 			ui->frame->clear();
 			return;
 	}
@@ -168,11 +168,11 @@ void VersionPage::packageCurrent(const QModelIndex &current, const QModelIndex &
 	QString problemOut;
 	for (auto &problem: problems)
 	{
-		if(problem.getSeverity() == PROBLEM_ERROR)
+		if(problem.getSeverity() == ProblemSeverity::Error)
 		{
 			problemOut += tr("Error: ");
 		}
-		else if(problem.getSeverity() == PROBLEM_WARNING)
+		else if(problem.getSeverity() == ProblemSeverity::Warning)
 		{
 			problemOut += tr("Warning: ");
 		}
@@ -381,7 +381,7 @@ void VersionPage::on_forgeBtn_clicked()
 		return;
 	}
 	VersionSelectDialog vselect(vlist.get(), tr("Select Forge version"), this);
-	vselect.setExactFilter(BaseVersionList::ParentGameVersionRole, m_inst->currentVersionId());
+	vselect.setExactFilter(BaseVersionList::ParentVersionRole, m_inst->currentVersionId());
 	vselect.setEmptyString(tr("No Forge versions are currently available for Minecraft ") + m_inst->currentVersionId());
 	vselect.setEmptyErrorString(tr("Couldn't load or download the Forge version lists!"));
 	if (vselect.exec() && vselect.selectedVersion())
@@ -400,7 +400,7 @@ void VersionPage::on_liteloaderBtn_clicked()
 		return;
 	}
 	VersionSelectDialog vselect(vlist.get(), tr("Select LiteLoader version"), this);
-	vselect.setExactFilter(BaseVersionList::ParentGameVersionRole, m_inst->currentVersionId());
+	vselect.setExactFilter(BaseVersionList::ParentVersionRole, m_inst->currentVersionId());
 	vselect.setEmptyString(tr("No LiteLoader versions are currently available for Minecraft ") + m_inst->currentVersionId());
 	vselect.setEmptyErrorString(tr("Couldn't load or download the LiteLoader version lists!"));
 	if (vselect.exec() && vselect.selectedVersion())
@@ -457,7 +457,7 @@ void VersionPage::updateButtons(int row)
 		ui->moveDownBtn->setEnabled(patch->isMoveable());
 		ui->moveUpBtn->setEnabled(patch->isMoveable());
 		ui->changeVersionBtn->setEnabled(patch->isVersionChangeable());
-		ui->editBtn->setEnabled(patch->isEditable());
+		ui->editBtn->setEnabled(patch->isCustom());
 		ui->customizeBtn->setEnabled(patch->isCustomizable());
 		ui->revertBtn->setEnabled(patch->isRevertible());
 	}