CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rearrange RawLibrary and OneSixLibrary heavily.

Browse Source 
Fix #396
This commit is contained in:
Petr Mrázek
2014-07-26 23:00:35 +02:00
parent 9b82c87c92
commit 03b13b0b3f
12 changed files with 335 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
logic/minecraft/OneSixRule.h
View File

@ -21,7 +21,7 @@
#include <memory>
#include "OpSys.h"
class OneSixLibrary;
class RawLibrary;
class Rule;
enum RuleAction
@ -37,7 +37,7 @@ class Rule
{
protected:
RuleAction m_result;
virtual bool applies(OneSixLibrary *parent) = 0;
virtual bool applies(const RawLibrary *parent) = 0;
public:
Rule(RuleAction result) : m_result(result)
@ -45,14 +45,13 @@ public:
}
virtual ~Rule() {};
virtual QJsonObject toJson() = 0;
RuleAction apply(OneSixLibrary *parent)
RuleAction apply(const RawLibrary *parent)
{
if (applies(parent))
return m_result;
else
return Defer;
}
;
};
class OsRule : public Rule
@ -64,7 +63,7 @@ private:
QString m_version_regexp;
protected:
virtual bool applies(OneSixLibrary *)
virtual bool applies(const RawLibrary *)
{
return (m_system == currentSystem);
}
@ -85,7 +84,7 @@ public:
class ImplicitRule : public Rule
{
protected:
virtual bool applies(OneSixLibrary *)
virtual bool applies(const RawLibrary *)
{
return true;
}