jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced Uuid with QUuid

Browse Source
This commit is contained in:
pasdam
2018-03-22 22:56:05 +01:00
committed by Jonathan White
parent dcece140a0
commit ad4423d226
49 changed files with 413 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/IconModels.cpp
View File

@@ -17,6 +17,8 @@
#include "IconModels.h"
#include <QUuid.h>
#include "core/DatabaseIcons.h"
DefaultIconModel::DefaultIconModel(QObject* parent)
@@ -53,7 +55,7 @@ CustomIconModel::CustomIconModel(QObject* parent)
{
}
void CustomIconModel::setIcons(const QHash<Uuid, QPixmap>& icons, const QList<Uuid>& iconsOrder)
void CustomIconModel::setIcons(const QHash<QUuid, QPixmap>& icons, const QList<QUuid>& iconsOrder)
{
beginResetModel();
@@ -80,21 +82,21 @@ QVariant CustomIconModel::data(const QModelIndex& index, int role) const
}
if (role == Qt::DecorationRole) {
Uuid uuid = uuidFromIndex(index);
QUuid uuid = uuidFromIndex(index);
return m_icons.value(uuid);
}
return QVariant();
}
Uuid CustomIconModel::uuidFromIndex(const QModelIndex& index) const
QUuid CustomIconModel::uuidFromIndex(const QModelIndex& index) const
{
Q_ASSERT(index.isValid());
return m_iconsOrder.value(index.row());
}
QModelIndex CustomIconModel::indexFromUuid(const Uuid& uuid) const
QModelIndex CustomIconModel::indexFromUuid(const QUuid& uuid) const
{
int idx = m_iconsOrder.indexOf(uuid);
if (idx > -1) {