summaryrefslogtreecommitdiffstats
path: root/logic/InstanceList.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-04-04 15:46:15 +0200
committerPetr Mrázek <peterix@gmail.com>2015-04-04 15:46:15 +0200
commit8b4e22bbb88b289327c0614fa6df153533cdded3 (patch)
treef813686f8780daca1948e1dd4fb77251ff1becf5 /logic/InstanceList.h
parentc7b39fe1165956d07055e7917b22d5604fb5f768 (diff)
downloadMultiMC-8b4e22bbb88b289327c0614fa6df153533cdded3.tar
MultiMC-8b4e22bbb88b289327c0614fa6df153533cdded3.tar.gz
MultiMC-8b4e22bbb88b289327c0614fa6df153533cdded3.tar.lz
MultiMC-8b4e22bbb88b289327c0614fa6df153533cdded3.tar.xz
MultiMC-8b4e22bbb88b289327c0614fa6df153533cdded3.zip
NOISSUE Move FTB logic out of generic code
Diffstat (limited to 'logic/InstanceList.h')
-rw-r--r--logic/InstanceList.h25
1 files changed, 2 insertions, 23 deletions
diff --git a/logic/InstanceList.h b/logic/InstanceList.h
index c251be5a..b7f2b997 100644
--- a/logic/InstanceList.h
+++ b/logic/InstanceList.h
@@ -26,33 +26,11 @@ class BaseInstance;
class QDir;
-struct FTBRecord
-{
- QString dirName;
- QString name;
- QString logo;
- QString mcVersion;
- QString description;
- QString instanceDir;
- QString templateDir;
- bool operator ==(const FTBRecord other) const
- {
- return instanceDir == other.instanceDir;
- }
-};
-
-inline uint qHash(FTBRecord record)
-{
- return qHash(record.instanceDir);
-}
-
class InstanceList : public QAbstractListModel
{
Q_OBJECT
private:
void loadGroupList(QMap<QString, QString> &groupList);
- QSet<FTBRecord> discoverFTBInstances();
- void loadFTBInstances(QMap<QString, QString> &groupMap, QList<InstancePtr> & tempList);
public
slots:
@@ -141,7 +119,8 @@ slots:
private:
int getInstIndex(BaseInstance *inst) const;
- bool continueProcessInstance(InstancePtr instPtr, const int error, const QDir &dir,
+public:
+ static bool continueProcessInstance(InstancePtr instPtr, const int error, const QDir &dir,
QMap<QString, QString> &groupMap);
protected: