diff options
author | Sky <git@bunnies.cc> | 2013-12-13 14:58:35 +0000 |
---|---|---|
committer | Sky <git@bunnies.cc> | 2013-12-13 14:58:35 +0000 |
commit | b69351d50d07bab595945d064e4d29b123c19105 (patch) | |
tree | 5cf6be9ef49ad10a211a0544e5481f36e49a306a /logic/auth/MojangAccount.h | |
parent | 979946b7bb2cec808198f9194169ea08cce8bb00 (diff) | |
parent | 0af6f96c3de54c940799826ff6f3c89bb46f1540 (diff) | |
download | MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar.gz MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar.lz MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar.xz MultiMC-b69351d50d07bab595945d064e4d29b123c19105.zip |
Merge branch 'develop' of github.com:Drayshak/MultiMC5 into develop
Diffstat (limited to 'logic/auth/MojangAccount.h')
-rw-r--r-- | logic/auth/MojangAccount.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/auth/MojangAccount.h b/logic/auth/MojangAccount.h index 95f777ce..9eecbc4f 100644 --- a/logic/auth/MojangAccount.h +++ b/logic/auth/MojangAccount.h @@ -20,6 +20,7 @@ #include <QList> #include <QJsonObject> #include <QPair> +#include <QMap> #include <memory> @@ -41,14 +42,13 @@ struct AccountProfile { QString id; QString name; + bool legacy; }; struct User { QString id; - // pair of key:value - // we don't know if the keys:value mapping is 1:1, so a list is used. - QList<QPair<QString, QString>> properties; + QMultiMap<QString,QString> properties; }; enum AccountStatus |