aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Separate search's card name matching out from token filter check

Browse source 
* Trying to eventually reuse card name filtering in "create token"
  dialog
This commit is contained in:
Mark McDonald 2016-05-11 21:22:09 -04:00
parent e3fb308ea1
commit d12c86d89c
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/carddatabasemodel.cpp
View file

@ -186,6 +186,10 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
if (((isToken == ShowTrue) && !info->getIsToken()) || ((isToken == ShowFalse) && info->getIsToken())) if (((isToken == ShowTrue) && !info->getIsToken()) || ((isToken == ShowFalse) && info->getIsToken()))
return false; return false;
return rowMatchesCardName(info);
}
bool CardDatabaseDisplayModel::rowMatchesCardName(CardInfo const *info) const {
if (!cardName.isEmpty() && !info->getName().contains(cardName, Qt::CaseInsensitive)) if (!cardName.isEmpty() && !info->getName().contains(cardName, Qt::CaseInsensitive))
return false; return false;

2
cockatrice/src/carddatabasemodel.h
View file

@ -61,7 +61,7 @@ public:
protected: protected:
bool lessThan(const QModelIndex &left, const QModelIndex &right) const; bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
bool rowMatchesCardName(CardInfo const *info) const;
bool canFetchMore(const QModelIndex &parent) const; bool canFetchMore(const QModelIndex &parent) const;
void fetchMore(const QModelIndex &parent); void fetchMore(const QModelIndex &parent);
private slots: private slots: