Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

[GUI] Fix build following e4c29cbe78

Browse source
This commit is contained in:
Nathan Hourt 2015-07-20 12:21:58 -04:00
parent e4c29cbe78
commit 2530ffb06c
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
programs/light_client/ClientDataModel.cpp
View file

@ -89,18 +89,17 @@ void ChainDataModel::getAccountImpl(QString accountIdentifier, Account* const *
auto result = m_db_api->get_full_accounts([](const fc::variant& v) { auto result = m_db_api->get_full_accounts([](const fc::variant& v) {
idump((v)); idump((v));
}, {accountIdentifier.toStdString()}); }, {accountIdentifier.toStdString()});
fc::variant_object accountPackage; fc::optional<full_account> accountPackage;
if (result.count(accountIdentifier.toStdString())) { if (result.count(accountIdentifier.toStdString())) {
accountPackage = result.begin()->second.as<variant_object>(); accountPackage = result.at(accountIdentifier.toStdString());
// Fetch all necessary assets // Fetch all necessary assets
auto balances = accountPackage["balances"].as<vector<account_balance_object>>();
QList<asset_id_type> assetsToFetch; QList<asset_id_type> assetsToFetch;
QList<Asset* const *> assetPlaceholders; QList<Asset* const *> assetPlaceholders;
assetsToFetch.reserve(balances.size()); assetsToFetch.reserve(accountPackage->balances.size());
// Get list of asset IDs the account has a balance in // Get list of asset IDs the account has a balance in
std::transform(balances.begin(), balances.end(), std::back_inserter(assetsToFetch), std::transform(accountPackage->balances.begin(), accountPackage->balances.end(), std::back_inserter(assetsToFetch),
[](const account_balance_object& b) { return b.asset_type; }); [](const account_balance_object& b) { return b.asset_type; });
auto function = [this,&assetsToFetch,&assetPlaceholders] { auto function = [this,&assetsToFetch,&assetPlaceholders] {
auto itr = assetsToFetch.begin(); auto itr = assetsToFetch.begin();
@ -129,19 +128,17 @@ void ChainDataModel::getAccountImpl(QString accountIdentifier, Account* const *
ilog("Processing result ${r}", ("r", accountPackage)); ilog("Processing result ${r}", ("r", accountPackage));
auto itr = m_accounts.iterator_to(*accountInContainer); auto itr = m_accounts.iterator_to(*accountInContainer);
if (!accountPackage.size()) { if (!accountPackage.valid()) {
(*itr)->deleteLater(); (*itr)->deleteLater();
m_accounts.erase(itr); m_accounts.erase(itr);
} else { } else {
m_accounts.modify(itr, [=](Account* a){ m_accounts.modify(itr, [=](Account* a){
account_object account = accountPackage["account"].as<account_object>(); a->setProperty("id", ObjectId(accountPackage->account.id.instance()));
a->setProperty("id", ObjectId(account.id.instance())); a->setProperty("name", QString::fromStdString(accountPackage->account.name));
a->setProperty("name", QString::fromStdString(account.name));
// Set balances // Set balances
QList<Balance*> balances; QList<Balance*> balances;
auto balanceObjects = accountPackage["balances"].as<vector<account_balance_object>>(); std::transform(accountPackage->balances.begin(), accountPackage->balances.end(), std::back_inserter(balances),
std::transform(balanceObjects.begin(), balanceObjects.end(), std::back_inserter(balances),
[this](const account_balance_object& b) { [this](const account_balance_object& b) {
Balance* bal = new Balance; Balance* bal = new Balance;
bal->setParent(this); bal->setParent(this);