martin/kima2
1
1
Fork 0
Code Issues Pull requests Releases 23 Wiki Activity

Merge branch 'master' of ssh://brodbeck-online.de:60022/martin/kima2-cpp

Browse source
This commit is contained in:
Martin Brodbeck 2018-07-18 08:17:33 +02:00
commit f5ba2f6014
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/marketplace.cpp
View file

@ -31,11 +31,14 @@ int Marketplace::getNextSellerNo()
[](const std::unique_ptr<Seller>& a, const std::unique_ptr<Seller>& b) -> bool { [](const std::unique_ptr<Seller>& a, const std::unique_ptr<Seller>& b) -> bool {
return a->getSellerNo() < b->getSellerNo(); return a->getSellerNo() < b->getSellerNo();
}); });
if (iter == sellers_.end())
return 1;
return (*iter)->getSellerNo() + 1; return (*iter)->getSellerNo() + 1;
} }
int Marketplace::getNumSellersDelete() int Marketplace::getNumSellersDelete()
{ {
int count = std::count_if(sellers_.begin(), sellers_.end(), [](const auto& a){return a->getState() == Seller::State::DELETE;}); int count = std::count_if(sellers_.begin(), sellers_.end(),
[](const auto& a) { return a->getState() == Seller::State::DELETE; });
return count; return count;
} }

3
src/gui/sellermodel.cpp
View file

@ -21,6 +21,9 @@ QVariant SellerModel::data(const QModelIndex& index, int role) const
if (role != Qt::DisplayRole) if (role != Qt::DisplayRole)
return QVariant(); return QVariant();
if (marketplace_->getSellers().size() == 0)
return QVariant();
Seller* seller = marketplace_->getSellers().at(index.row()).get(); Seller* seller = marketplace_->getSellers().at(index.row()).get();
/* if (seller->getState() == Seller::State::DELETE) /* if (seller->getState() == Seller::State::DELETE)