summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-01-31 16:46:31 -0600
committerAndrew <forkk@forkk.net>2013-01-31 16:46:31 -0600
commit2d05e901964d3d6a5cf4806298653655d8b2d2ee (patch)
tree230f29758a91ab01e990e70009de5e5bfedf02c5
parent076fb8a65e2774b092798ec15c647e2d9423e6a5 (diff)
downloadMultiMC-2d05e901964d3d6a5cf4806298653655d8b2d2ee.tar
MultiMC-2d05e901964d3d6a5cf4806298653655d8b2d2ee.tar.gz
MultiMC-2d05e901964d3d6a5cf4806298653655d8b2d2ee.tar.lz
MultiMC-2d05e901964d3d6a5cf4806298653655d8b2d2ee.tar.xz
MultiMC-2d05e901964d3d6a5cf4806298653655d8b2d2ee.zip
Fix naming issue in instance model class.
-rw-r--r--data/instancemodel.cpp6
-rw-r--r--data/instancemodel.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/data/instancemodel.cpp b/data/instancemodel.cpp
index 4fbcebc2..fbdb8212 100644
--- a/data/instancemodel.cpp
+++ b/data/instancemodel.cpp
@@ -61,16 +61,16 @@ void InstanceGroup::addInstance ( InstanceBase* inst )
void InstanceModel::initialLoad(QString dir)
{
- groupFile = dir + "/instgroups.json";
+ groupFileName = dir + "/instgroups.json";
implicitGroup = new InstanceGroup("Ungrouped", this);
groups.append(implicitGroup);
// temporary map from instance ID to group name
QMap<QString, QString> groupMap;
- if (QFileInfo(groupFile).exists())
+ if (QFileInfo(groupFileName).exists())
{
- QFile groupFile(groupFile);
+ QFile groupFile(groupFileName);
if (!groupFile.open(QIODevice::ReadOnly))
{
diff --git a/data/instancemodel.h b/data/instancemodel.h
index 7b6cb8c6..4bd34831 100644
--- a/data/instancemodel.h
+++ b/data/instancemodel.h
@@ -129,7 +129,7 @@ signals:
public slots:
private:
- QString groupFile;
+ QString groupFileName;
QVector<InstanceGroup*> groups;
InstanceGroup * implicitGroup;
};