diff options
| author | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
| commit | 9d8006b597aead06f1d51dacbdb346ebab3d5e8f (patch) | |
| tree | 1f99ca1da321be32930198e3d72b2fc9d3bf53de /logic/auth/MojangAccount.cpp | |
| parent | 0ee8f90d40f5b3ddb177286c9066a4e59748c681 (diff) | |
| parent | b0e8037feb5b9d48defe6b8263d068f87bdb141c (diff) | |
| download | PrismLauncher-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.gz PrismLauncher-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.bz2 PrismLauncher-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
Conflicts:
CMakeLists.txt
Diffstat (limited to 'logic/auth/MojangAccount.cpp')
| -rw-r--r-- | logic/auth/MojangAccount.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/logic/auth/MojangAccount.cpp b/logic/auth/MojangAccount.cpp index 185c735c..bc6af98f 100644 --- a/logic/auth/MojangAccount.cpp +++ b/logic/auth/MojangAccount.cpp @@ -68,6 +68,7 @@ MojangAccountPtr MojangAccount::loadFromJson(const QJsonObject &object) User u; QJsonObject userStructure = object.value("user").toObject(); u.id = userStructure.value("id").toString(); + /* QJsonObject propMap = userStructure.value("properties").toObject(); for(auto key: propMap.keys()) { @@ -75,6 +76,7 @@ MojangAccountPtr MojangAccount::loadFromJson(const QJsonObject &object) for(auto value: values) u.properties.insert(key, value.toString()); } + */ account->m_user = u; } account->m_username = username; @@ -119,6 +121,7 @@ QJsonObject MojangAccount::saveToJson() const QJsonObject userStructure; { userStructure.insert("id", m_user.id); + /* QJsonObject userAttrs; for(auto key: m_user.properties.keys()) { @@ -126,6 +129,7 @@ QJsonObject MojangAccount::saveToJson() const userAttrs.insert(key, array); } userStructure.insert("properties", userAttrs); + */ } json.insert("user", userStructure); |