Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-09 06:52:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Convert iconCount() and expiredIconIndex() to constants.

Browse source
This commit is contained in:
Felix Geyer 2012-06-29 15:22:43 +02:00
parent e144f7c85a
commit baa5a74ba0
7 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/IconModels.cpp
View file

@ -27,7 +27,7 @@ DefaultIconModel::DefaultIconModel(QObject* parent)
int DefaultIconModel::rowCount(const QModelIndex& parent) const
{
if (!parent.isValid()) {
return databaseIcons()->iconCount();
return DatabaseIcons::IconCount;
}
else {
return 0;
@ -40,7 +40,7 @@ QVariant DefaultIconModel::data(const QModelIndex& index, int role) const
return QVariant();
}
Q_ASSERT(index.row() < databaseIcons()->iconCount());
Q_ASSERT(index.row() < DatabaseIcons::IconCount);
if (role == Qt::DecorationRole) {
return databaseIcons()->iconPixmap(index.row());

2
src/gui/entry/EntryModel.cpp
View file

@ -134,7 +134,7 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const
break;
case 1:
if (entry->isExpired()) {
return databaseIcons()->iconPixmap(databaseIcons()->expiredIconIndex());
return databaseIcons()->iconPixmap(DatabaseIcons::ExpiredIconIndex);
}
else {
return entry->iconPixmap();

2
src/gui/group/GroupModel.cpp
View file

@ -132,7 +132,7 @@ QVariant GroupModel::data(const QModelIndex& index, int role) const
}
else if (role == Qt::DecorationRole) {
if (group->isExpired()) {
return databaseIcons()->iconPixmap(databaseIcons()->expiredIconIndex());
return databaseIcons()->iconPixmap(DatabaseIcons::ExpiredIconIndex);
}
else {
return group->iconPixmap();