diff --git a/framework/src/domain/peoplemodel.cpp b/framework/src/domain/peoplemodel.cpp index f52ac53f..e09b84a0 100644 --- a/framework/src/domain/peoplemodel.cpp +++ b/framework/src/domain/peoplemodel.cpp @@ -1,156 +1,156 @@ /* Copyright (c) 2016 Michael Bohlender Copyright (c) 2016 Christian Mollekopf This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "peoplemodel.h" #include #include PeopleModel::PeopleModel(QObject *parent) : QSortFilterProxyModel(parent) { using namespace Sink::ApplicationDomain; setDynamicSortFilter(true); sort(0, Qt::DescendingOrder); setFilterCaseSensitivity(Qt::CaseInsensitive); Sink::Query query; query.setFlags(Sink::Query::LiveQuery); query.request(); query.request(); query.request(); query.request(); query.request(); query.request(); query.request(); runQuery(query); } PeopleModel::~PeopleModel() { } void PeopleModel::setFilter(const QString &filter) { setFilterWildcard(filter); } QString PeopleModel::filter() const { return {}; } QHash< int, QByteArray > PeopleModel::roleNames() const { static QHash roles = { {Name, "name"}, {Emails, "emails"}, {Addressbook, "addressbook"}, {Type, "type"}, {DomainObject, "domainObject"}, {FirstName, "firstName"}, {LastName, "lastName"}, {ImageData, "imageData"} }; return roles; } static QStringList toStringList(const QList &list) { QStringList out; std::transform(list.constBegin(), list.constEnd(), std::back_inserter(out), [] (const Sink::ApplicationDomain::Contact::Email &s) { return s.email; }); return out; } QPair getFirstnameLastname(const QString &fn) { auto parts = fn.split(' '); if (parts.isEmpty()) { return {}; } if (parts.size() == 1) { return {parts.first(), {}}; } const auto lastName = parts.takeLast(); return {parts.join(' '), lastName}; } QVariant PeopleModel::data(const QModelIndex &idx, int role) const { auto srcIdx = mapToSource(idx); auto contact = srcIdx.data(Sink::Store::DomainObjectRole).value(); switch (role) { case Name: return contact->getFn(); case Emails: return QVariant::fromValue(toStringList(contact->getEmails())); case Addressbook: return contact->getAddressbook(); case Type: return "contact"; case DomainObject: return QVariant::fromValue(contact); case FirstName: { const auto n = contact->getFirstname(); //Fall back to the fn if we have no name if (n.isEmpty()) { return getFirstnameLastname(contact->getFn()).first; } return n; } case LastName: { const auto n = contact->getLastname(); //Fall back to the fn if we have no name if (n.isEmpty()) { return getFirstnameLastname(contact->getFn()).second; } return n; } case ImageData: return contact->getPhoto(); } return QSortFilterProxyModel::data(idx, role); } bool PeopleModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { const auto leftName = left.data(Sink::Store::DomainObjectRole).value()->getFn(); const auto rightName = right.data(Sink::Store::DomainObjectRole).value()->getFn(); return leftName < rightName; } void PeopleModel::runQuery(const Sink::Query &query) { mModel = Sink::Store::loadModel(query); setSourceModel(mModel.data()); } -void PeopleModel::setAddressbook(const QVariant &parentFolder) +void PeopleModel::setAddressbook(const QVariant &/*parentFolder*/) { //TODO filter query by addressbook qWarning() << "The addressbook filter is not yet implemented"; } QVariant PeopleModel::addressbook() const { return QVariant(); } diff --git a/framework/src/domain/retriever.cpp b/framework/src/domain/retriever.cpp index b8e29523..2aaceace 100644 --- a/framework/src/domain/retriever.cpp +++ b/framework/src/domain/retriever.cpp @@ -1,55 +1,55 @@ /* Copyright (c) 2016 Christian Mollekopf This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "retriever.h" Retriever::Retriever(QObject *parent) : QObject(parent) { } QAbstractItemModel* Retriever::model() const { return mModel; } void Retriever::setModel(QAbstractItemModel* model) { mValue = QVariant(); mModel = model; connect(model, &QAbstractItemModel::rowsInserted, this, &Retriever::onRowsInserted); connect(model, &QAbstractItemModel::modelReset, this, &Retriever::onModelReset); if (model->rowCount(QModelIndex())) { mValue = model->index(0, 0, QModelIndex()).data(mModel->roleNames().key(mPropertyName.toLatin1())); emit valueChanged(); } } -void Retriever::onRowsInserted(const QModelIndex &parent, int first, int last) +void Retriever::onRowsInserted(const QModelIndex &, int, int) { if (!mValue.isValid()) { mValue = mModel->index(0, 0, QModelIndex()).data(mModel->roleNames().key(mPropertyName.toLatin1())); emit valueChanged(); } } void Retriever::onModelReset() { mValue = QVariant(); } diff --git a/framework/src/kubeimage.cpp b/framework/src/kubeimage.cpp index b19d9e4a..bea9f294 100644 --- a/framework/src/kubeimage.cpp +++ b/framework/src/kubeimage.cpp @@ -1,42 +1,42 @@ /* Copyright (c) 2017 Christian Mollekopf This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "kubeimage.h" #include #include #include KubeImage::KubeImage(QQuickItem *parent) :QQuickItem(parent) { setFlag(QQuickItem::ItemHasContents); } -QSGNode *KubeImage::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *updatePaintNodeData) +QSGNode *KubeImage::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *) { QSGSimpleTextureNode *node = static_cast(oldNode); if (!node) { node = new QSGSimpleTextureNode(); auto img = QImage::fromData(mImageData); QSGTexture *texture = window()->createTextureFromImage(img); node->setTexture(texture); } node->setRect(boundingRect()); return node; }