From 2d05e901964d3d6a5cf4806298653655d8b2d2ee Mon Sep 17 00:00:00 2001
From: Andrew <forkk@forkk.net>
Date: Thu, 31 Jan 2013 16:46:31 -0600
Subject: Fix naming issue in instance model class.

---
 data/instancemodel.cpp | 6 +++---
 data/instancemodel.h   | 2 +-
 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;
 };
-- 
cgit v1.2.3