Fix naming issue in instance model class.
This commit is contained in:
parent
076fb8a65e
commit
2d05e90196
@ -61,16 +61,16 @@ void InstanceGroup::addInstance ( InstanceBase* inst )
|
|||||||
|
|
||||||
void InstanceModel::initialLoad(QString dir)
|
void InstanceModel::initialLoad(QString dir)
|
||||||
{
|
{
|
||||||
groupFile = dir + "/instgroups.json";
|
groupFileName = dir + "/instgroups.json";
|
||||||
implicitGroup = new InstanceGroup("Ungrouped", this);
|
implicitGroup = new InstanceGroup("Ungrouped", this);
|
||||||
groups.append(implicitGroup);
|
groups.append(implicitGroup);
|
||||||
|
|
||||||
// temporary map from instance ID to group name
|
// temporary map from instance ID to group name
|
||||||
QMap<QString, QString> groupMap;
|
QMap<QString, QString> groupMap;
|
||||||
|
|
||||||
if (QFileInfo(groupFile).exists())
|
if (QFileInfo(groupFileName).exists())
|
||||||
{
|
{
|
||||||
QFile groupFile(groupFile);
|
QFile groupFile(groupFileName);
|
||||||
|
|
||||||
if (!groupFile.open(QIODevice::ReadOnly))
|
if (!groupFile.open(QIODevice::ReadOnly))
|
||||||
{
|
{
|
||||||
|
@ -129,7 +129,7 @@ signals:
|
|||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString groupFile;
|
QString groupFileName;
|
||||||
QVector<InstanceGroup*> groups;
|
QVector<InstanceGroup*> groups;
|
||||||
InstanceGroup * implicitGroup;
|
InstanceGroup * implicitGroup;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user