diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-02-21 19:37:35 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-02-21 19:37:35 +0100 |
| commit | 294c8e21c85b807b7880a8b722850417f12f5f26 (patch) | |
| tree | 5ad9ce6895ab33d7c02c11b9b9a0b530ba3ae979 /libinstance | |
| parent | 58379657e99a146123814fd182d6c58424e9713e (diff) | |
| parent | 2020d9c24bf0c2d024a3f42f38d7e106ab8a49eb (diff) | |
| download | MultiMC-294c8e21c85b807b7880a8b722850417f12f5f26.tar MultiMC-294c8e21c85b807b7880a8b722850417f12f5f26.tar.gz MultiMC-294c8e21c85b807b7880a8b722850417f12f5f26.tar.lz MultiMC-294c8e21c85b807b7880a8b722850417f12f5f26.tar.xz MultiMC-294c8e21c85b807b7880a8b722850417f12f5f26.zip | |
Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5
Diffstat (limited to 'libinstance')
| -rw-r--r-- | libinstance/include/instancelist.h | 2 | ||||
| -rw-r--r-- | libinstance/src/instanceloader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libinstance/include/instancelist.h b/libinstance/include/instancelist.h index f6be815c..d5b8c196 100644 --- a/libinstance/include/instancelist.h +++ b/libinstance/include/instancelist.h @@ -26,7 +26,7 @@ class Instance; -class LIBMMCINST_EXPORT InstanceList : public QObject, public SigList<QSharedPointer<Instance>> +class LIBMMCINST_EXPORT InstanceList : public QObject, public SigList< QSharedPointer<Instance> > { Q_OBJECT public: diff --git a/libinstance/src/instanceloader.cpp b/libinstance/src/instanceloader.cpp index 620562b6..9d98230f 100644 --- a/libinstance/src/instanceloader.cpp +++ b/libinstance/src/instanceloader.cpp @@ -100,7 +100,7 @@ InstTypeList InstanceLoader::typeList() { InstTypeList typeList; - for (auto iter = m_typeMap.begin(); iter != m_typeMap.end(); iter++) + for (QMap<QString, InstanceTypeInterface *>::iterator iter = m_typeMap.begin(); iter != m_typeMap.end(); iter++) { typeList.append(*iter); } |