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

[GUI] Fix ownership of asset objects

Browse source
This commit is contained in:
Nathan Hourt 2015-07-15 00:25:46 -04:00
parent e5f8d0f548
commit 59f65d1411
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
programs/light_client/ClientDataModel.cpp
View file

@ -18,6 +18,7 @@ Asset* ChainDataModel::getAsset(qint64 id)
if( itr == by_id_idx.end() ) if( itr == by_id_idx.end() )
{ {
auto tmp = new Asset; auto tmp = new Asset;
QQmlEngine::setObjectOwnership(tmp, QQmlEngine::CppOwnership);
tmp->id = id; --m_account_query_num; tmp->id = id; --m_account_query_num;
tmp->symbol = QString::number( --m_account_query_num); tmp->symbol = QString::number( --m_account_query_num);
auto result = m_assets.insert( tmp ); auto result = m_assets.insert( tmp );
@ -53,7 +54,7 @@ Asset* ChainDataModel::getAsset(qint64 id)
); );
} }
}); });
} }
catch ( const fc::exception& e ) catch ( const fc::exception& e )
{ {
Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) );
@ -71,6 +72,7 @@ Asset* ChainDataModel::getAsset(QString symbol)
if( itr == by_symbol_idx.end() ) if( itr == by_symbol_idx.end() )
{ {
auto tmp = new Asset; auto tmp = new Asset;
QQmlEngine::setObjectOwnership(tmp, QQmlEngine::CppOwnership);
tmp->id = --m_account_query_num; tmp->id = --m_account_query_num;
tmp->symbol = symbol; tmp->symbol = symbol;
auto result = m_assets.insert( tmp ); auto result = m_assets.insert( tmp );
@ -104,7 +106,7 @@ Asset* ChainDataModel::getAsset(QString symbol)
); );
} }
}); });
} }
catch ( const fc::exception& e ) catch ( const fc::exception& e )
{ {
Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) );
@ -115,25 +117,6 @@ Asset* ChainDataModel::getAsset(QString symbol)
return *itr; return *itr;
} }
Account* ChainDataModel::getAccount(ObjectId id) Account* ChainDataModel::getAccount(ObjectId id)
{ {
auto& by_id_idx = m_accounts.get<::by_id>(); auto& by_id_idx = m_accounts.get<::by_id>();
@ -206,19 +189,19 @@ Account* ChainDataModel::getAccount(QString name)
/** execute in main */ /** execute in main */
Q_EMIT queueExecute( [this,result,name](){ Q_EMIT queueExecute( [this,result,name](){
wlog( "process result" ); wlog( "process result" );
auto& by_symbol_idx = this->m_accounts.get<by_account_name>(); auto& by_name_idx = this->m_accounts.get<by_account_name>();
auto itr = by_symbol_idx.find(name); auto itr = by_name_idx.find(name);
assert( itr != by_symbol_idx.end() ); assert( itr != by_name_idx.end() );
if( result.size() == 0 || !result.front() ) if( result.size() == 0 || !result.front() )
{ {
elog( "delete later" ); elog( "delete later" );
(*itr)->deleteLater(); (*itr)->deleteLater();
by_symbol_idx.erase( itr ); by_name_idx.erase( itr );
} }
else else
{ {
by_symbol_idx.modify( itr, by_name_idx.modify( itr,
[=]( Account* a ){ [=]( Account* a ){
a->setProperty("id", ObjectId(result.front()->id.instance())); a->setProperty("id", ObjectId(result.front()->id.instance()));
} }