address-book-app

Merge lp:~renatofilho/address-book-app/no-most-called into lp:address-book-app

no-most-called
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2016-12-12

Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2016-12-14
Approved revision:	667
Merged at revision:	666
Proposed branch:	lp:~renatofilho/address-book-app/no-most-called
Merge into:	lp:address-book-app
Diff against target:	822 lines (+1/-727) 9 files modified debian/control (+1/-3) src/imports/Ubuntu/Contacts/CMakeLists.txt (+0/-4) src/imports/Ubuntu/Contacts/ContactListView.qml (+0/-13) src/imports/Ubuntu/Contacts/MostCalledList.qml (+0/-115) src/imports/Ubuntu/Contacts/MostCalledModel.qml (+0/-102) src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp (+0/-374) src/imports/Ubuntu/Contacts/mostcalledproxymodel.h (+0/-112) src/imports/Ubuntu/Contacts/plugin.cpp (+0/-2) src/imports/Ubuntu/Contacts/qmldir (+0/-2)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/no-most-called
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2016-12-12	Approve on 2016-12-14
system-apps-ci-bot	continuous-integration		Approve on 2016-12-14
Review via email: mp+313059@code.launchpad.net

Commit message

Remove MostCalledList.

It will be moved to dialer-app.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-12-12:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/52/rebuild

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/no-most-called updated on 2016-12-14

667. By Renato Araujo Oliveira Filho on 2016-12-14: Remove 'qtdeclarative5-ubuntu-content1' as dep for 's390x' arch.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-12-14:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/53/rebuild

review: Approve (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2016-12-14:

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Renato Araujo Oliveira Filho

Rufus

Ubuntu Phablet Team

 === modified file 'debian/control'
 --- debian/control	2016-11-24 18:54:55 +0000
 +++ debian/control	2016-12-14 13:04:55 +0000
@@ -23,8 +23,7 @@
                 qtdeclarative5-gsettings1.0 [amd64 armhf i386],
                 qml-module-ofono [amd64 armhf i386],
                 qtdeclarative5-qtcontacts-plugin [amd64 armhf i386],
--               qtdeclarative5-ubuntu-content1 [amd64 armhf i386 s390x],
--               qtdeclarative5-ubuntu-history0.1 [amd64 armhf i386],
++               qtdeclarative5-ubuntu-content1 [amd64 armhf i386],
                 qtdeclarative5-ubuntu-keyboard-extensions0.1 [amd64 armhf i386],
                 qtdeclarative5-buteo-syncfw0.1 [amd64 armhf i386],
                 qtdeclarative5-ubuntu-telephony-phonenumber0.1 [amd64 armhf i386],
@@ -59,7 +58,6 @@
           qtdeclarative5-qtquick2-plugin,
           qml-module-ofono,
           qtdeclarative5-ubuntu-addressbook0.1 (= ${binary:Version}),
--         qtdeclarative5-ubuntu-history0.1,
           qtdeclarative5-ubuntu-keyboard-extensions0.1,
           qtdeclarative5-ubuntu-telephony-phonenumber0.1 (>= 0.1+14.10.20140715.1),
           ${misc:Depends},
 === modified file 'src/imports/Ubuntu/Contacts/CMakeLists.txt'
 --- src/imports/Ubuntu/Contacts/CMakeLists.txt	2016-01-22 14:51:39 +0000
 +++ src/imports/Ubuntu/Contacts/CMakeLists.txt	2016-12-14 13:04:55 +0000
@@ -18,8 +18,6 @@
      FastScroll.qml
      ListItemWithActionsCheckBox.qml
      ListItemWithActions.qml
--    MostCalledList.qml
--    MostCalledModel.qml
      MultipleSelectionListView.qml
      MultipleSelectionVisualModel.qml
      Ofono.qml
@@ -40,8 +38,6 @@
      contacts.cpp
      imagescalethread.h
      imagescalethread.cpp
--    mostcalledproxymodel.h
--    mostcalledproxymodel.cpp
      plugin.h
      plugin.cpp
      simcardcontacts.h
 === modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
 --- src/imports/Ubuntu/Contacts/ContactListView.qml	2016-09-19 20:47:48 +0000
 +++ src/imports/Ubuntu/Contacts/ContactListView.qml	2016-12-14 13:04:55 +0000
@@ -570,19 +570,6 @@
+                     }
+                 }
+             }
--
--            MostCalledList {
--                id: mostCalledView
--
--                anchors {
--                    left: parent.left
--                    right: parent.right
--                    margins: units.gu(1)
--                }
--                parentView: view
--                visible: view.favouritesIsSelected
--                height: visible && (count > 0) ? childrenRect.height : 0
--            }
+         }
          onError: root.error(message)
          onContactClicked: root.contactClicked(contact)
 === removed file 'src/imports/Ubuntu/Contacts/MostCalledList.qml'
 --- src/imports/Ubuntu/Contacts/MostCalledList.qml	2016-05-05 15:55:23 +0000
 +++ src/imports/Ubuntu/Contacts/MostCalledList.qml	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
--/*
-- * Copyright (C) 2012-2014 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program 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 General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.4
--
--Column {
--    id: root
--
--    property alias parentView: scrollAnimation.target
--    readonly property alias count: callerRepeat.count
--
--    /* internal */
--    property int _nextCurrentIndex: -1
--
--
--    function makeItemVisible(item)
--    {
--        if (!item) {
--            return
--        }
--
--        var itemY = parent.y + root.y + item.y
--        var areaY = parentView.contentY
--        if (itemY < areaY) {
--            // move foward
--            scrollAnimation.to = itemY
--        } else if ((areaY + parentView.height) < (itemY + item.height)) {
--            // move backward
--            scrollAnimation.to = itemY + item.height
--        } else {
--            return
--        }
--        scrollAnimation.restart()
--    }
--
--    SmoothedAnimation {
--        id: scrollAnimation
--
--        property: "contentY"
--        velocity: parentView.highlightMoveVelocity
--        duration: parentView.highlightMoveDuration
--    }
--
--    SectionDelegate {
--        anchors {
--            left: parent.left
--            right: parent.right
--            margins: units.gu(2)
--        }
--        text: i18n.dtr("address-book-app", "Frequently called")
--        visible: (root.count > 0)
--    }
--
--    Repeater {
--        id: callerRepeat
--
--        model: MostCalledModel {
--            id: calledModel
--
--            onContactClicked: parentView.contactClicked(contact)
--            onAddContactClicked: parentView.addContactClicked(label)
--            onCurrentIndexChanged: {
--                if (currentIndex !== -1) {
--                    parentView.currentIndex = -1
--                    root._nextCurrentIndex = currentIndex
--                }
--            }
--        }
--    }
--
--    Connections {
--        target: parentView
--        onCurrentIndexChanged: {
--            if (parentView.currentIndex !== -1) {
--                calledModel.currentIndex = -1
--            }
--        }
--    }
--
--    onHeightChanged: {
--        if (root._nextCurrentIndex != -1) {
--            heightChangedTimeout.restart()
--        }
--    }
--
--    Timer {
--        id: heightChangedTimeout
--        interval: 100
--        onTriggered: {
--            makeItemVisible(callerRepeat.itemAt(root._nextCurrentIndex))
--            root._nextCurrentIndex = -1
--        }
--    }
--
--    onVisibleChanged: {
--        // update the model every time that it became visible
--        // in fact calling update only reloads the model data if it has changed
--        if (visible) {
--            calledModel.model.update()
--        }
--    }
--}
 === removed file 'src/imports/Ubuntu/Contacts/MostCalledModel.qml'
 --- src/imports/Ubuntu/Contacts/MostCalledModel.qml	2015-10-26 13:18:11 +0000
 +++ src/imports/Ubuntu/Contacts/MostCalledModel.qml	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
--/*
-- * Copyright (C) 2012-2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program 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 General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--
--import QtQuick 2.4
--import QtContacts 5.0
--
--import Ubuntu.History 0.1
--import Ubuntu.Contacts 0.1 as ContactUI
--
--VisualDataModel {
--    id: root
--
--    property var contactModel: null
--    property int currentIndex: -1
--    property alias callAverage: mostCalledModel.callAverage
--
--    signal contactClicked(int index, QtObject contact)
--    signal addContactClicked(string label)
--    signal loaded()
--
--    property var baseModel: HistoryEventModel {
--        id: historyEventModel
--
--        type: HistoryThreadModel.EventTypeVoice
--        sort: HistorySort {
--            sortField: "timestamp"
--            sortOrder: HistorySort.DescendingOrder
--        }
--        filter: HistoryFilter {
--            filterProperty: "senderId"
--            filterValue: "self"
--            matchFlags: HistoryFilter.MatchCaseSensitive
--        }
--        onCanFetchMoreChanged: {
--            if (count === 0) {
--                mostCalledModel.update()
--            }
--        }
--    }
--
--    model: ContactUI.MostCalledContactsModel {
--        id: mostCalledModel
--
--        startInterval: new Date((new Date().getTime() - 2592000000)) // one month ago
--        maxCount: 5
--        onLoaded: root.loaded()
--        sourceModel: historyEventModel
--    }
--
--    delegate: ContactDelegate {
--        id: contactDelegate
--
--        readonly property alias contact: contactFetch.contact
--        property var contents
--
--        defaultAvatarUrl: "image://theme/contacts"
--        width: parent ? parent.width : 0
--        isCurrentItem: root.currentIndex === index
--        locked: true
--
--        // collapse the item before remove it, to avoid crash
--        ListView.onRemove: SequentialAnimation {
--            ScriptAction {
--                script: {
--                    if (contactDelegate.state !== "") {
--                        historyModel.currentIndex = -1
--                    }
--                }
--            }
--        }
--
--        onClicked: {
--            if (contact) {
--                root.contactClicked(index, contact)
--            } else {
--                root.addContactClicked(name.text)
--            }
--        }
--
--        // delegate does not support more than one child
--        contents: ContactFetch {
--                id: contactFetch
--                model: contactsModel
--        }
--
--        Component.onCompleted: contactFetch.fetchContact(contactId)
--    }
--}
 === removed file 'src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp'
 --- src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp	2016-05-05 15:56:00 +0000
 +++ src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,374 +0,0 @@
--/*
-- * Copyright (C) 2012-2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program 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 General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "mostcalledproxymodel.h"
--
--#include <QtContacts/QContactManager>
--#include <QtContacts/QContactFilter>
--#include <QtContacts/QContactPhoneNumber>
--#include <QtContacts/QContactFetchRequest>
--
--#include <QDebug>
--
--using namespace QtContacts;
--
--bool mostCalledContactsModelDataGreaterThan(const MostCalledContactsModelData &d1, const MostCalledContactsModelData &d2)
--{
--    return d1.callCount > d2.callCount;
--}
--
--MostCalledContactsModel::MostCalledContactsModel(QObject *parent)
--    : QAbstractListModel(parent),
--      m_sourceModel(0),
--      m_currentFetch(0),
--      m_manager(new QContactManager("galera")),
--      m_maxCount(20),
--      m_average(0),
--      m_outdated(true),
--      m_reloadingModel(false),
--      m_aboutToQuit(false)
--{
--    connect(this, SIGNAL(sourceModelChanged(QAbstractItemModel*)), SLOT(markAsOutdated()));
--    connect(this, SIGNAL(maxCountChanged(uint)), SLOT(markAsOutdated()));
--    connect(this, SIGNAL(startIntervalChanged(QDateTime)), SLOT(markAsOutdated()));
--}
--
--MostCalledContactsModel::~MostCalledContactsModel()
--{
--    m_aboutToQuit = true;
--    m_phones.clear();
--
--    if (m_currentFetch) {
--        m_currentFetch->cancel();
--    }
--}
--
--QVariant MostCalledContactsModel::data(const QModelIndex &index, int role) const
--{
--    if (!index.isValid()) {
--        return QVariant();
--    }
--
--    int row = index.row();
--    if ((row >= 0) && (row < m_data.size())) {
--        switch (role)
--        {
--        case MostCalledContactsModel::ContactIdRole:
--            return m_data[row].contactId;
--        case MostCalledContactsModel::PhoneNumberRole:
--            return m_data[row].phoneNumber;
--        case MostCalledContactsModel::CallCountRole:
--            return m_data[row].callCount;
--        default:
--            return QVariant();
--        }
--    }
--    return QVariant();
--}
--
--QHash<int, QByteArray> MostCalledContactsModel::roleNames() const
--{
--    static QHash<int, QByteArray> roles;
--    if (roles.isEmpty()) {
--        roles.insert(MostCalledContactsModel::ContactIdRole, "contactId");
--        roles.insert(MostCalledContactsModel::PhoneNumberRole, "phoneNumber");
--        roles.insert(MostCalledContactsModel::CallCountRole, "callCount");
--    }
--    return roles;
--}
--
--int MostCalledContactsModel::rowCount(const QModelIndex &) const
--{
--    return m_data.size();
--}
--
--QAbstractItemModel *MostCalledContactsModel::sourceModel() const
--{
--    return m_sourceModel;
--}
--
--void MostCalledContactsModel::setSourceModel(QAbstractItemModel *model)
--{
--    if (m_sourceModel != model) {
--        if (m_sourceModel) {
--            disconnect(m_sourceModel);
--        }
--
--        m_sourceModel = model;
--        connect(m_sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), SLOT(markAsOutdated()));
--        connect(m_sourceModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SLOT(markAsOutdated()));
--        connect(m_sourceModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), SLOT(markAsOutdated()));
--        connect(m_sourceModel, SIGNAL(modelReset()), SLOT(markAsOutdated()));
--
--        Q_EMIT sourceModelChanged(m_sourceModel);
--    }
--}
--
--
--uint MostCalledContactsModel::maxCount() const
--{
--    return m_maxCount;
--}
--
--void MostCalledContactsModel::setMaxCount(uint value)
--{
--    if (m_maxCount != value) {
--        m_maxCount = value;
--        Q_EMIT maxCountChanged(m_maxCount);
--    }
--}
--
--int MostCalledContactsModel::callAverage() const
--{
--    return m_average;
--}
--
--QDateTime MostCalledContactsModel::startInterval() const
--{
--    return m_startInterval;
--}
--
--void MostCalledContactsModel::setStartInterval(const QDateTime &value)
--{
--    if (m_startInterval != value) {
--        m_startInterval = value;
--        Q_EMIT startIntervalChanged(m_startInterval);
--    }
--}
--
--QVariant MostCalledContactsModel::getSourceData(int row, int role)
--{
--    QAbstractItemModel *source = sourceModel();
--    if (!source) {
--        return QVariant();
--    }
--
--    while ((source->rowCount() <= row)  && (source->canFetchMore(QModelIndex()))) {
--        source->fetchMore(QModelIndex());
--    }
--
--    if (source->rowCount() < row) {
--        return QVariant();
--    }
--
--    QModelIndex sourceIndex = source->index(row, 0);
--    return source->data(sourceIndex, role);
--}
--
--void MostCalledContactsModel::update()
--{
--    // skip update if not necessary
--    if (!m_outdated || m_reloadingModel) {
--        return;
--    }
--
--    if (m_maxCount <= 0) {
--        qWarning() << "update model requested with invalid maxCount";
--        m_outdated = false;
--        return;
--    }
--
--    if (!m_startInterval.isValid()) {
--        qWarning() << "Update model requested with invalid startInterval";
--        m_outdated = false;
--        return;
--    }
--
--    QAbstractItemModel *source = sourceModel();
--    if (!source) {
--        qWarning() << "Update model requested with null source model";
--        m_outdated = false;
--        return;
--    }
--
--    m_totalCalls = 0;
--    m_phones.clear();
--    m_phoneToContactCache.clear();
--    m_contactsData.clear();
--    queryContacts();
--}
--
--void MostCalledContactsModel::queryContacts()
--{
--    // get all phone in the date inteval
--    QHash<int, QByteArray> roles = sourceModel()->roleNames();
--    int participantsRole = roles.key("participants", -1);
--    int timestampRole = roles.key("timestamp", -1);
--    int row = 0;
--
--    Q_ASSERT(participantsRole != -1);
--    Q_ASSERT(timestampRole != -1);
--
--    while(true) {
--        QVariant date = getSourceData(row, timestampRole);
--
--        // end of source model
--        if (date.isNull()) {
--            break;
--        }
--
--        // exit if date is out of interval
--        if (date.toDateTime() < m_startInterval) {
--            break;
--        }
--
--        QVariant data = getSourceData(row, participantsRole);
--        if (data.isValid()) {
--            const QVariantList participants = data.toList();
--            Q_FOREACH(const QVariant &map, participants) {
--                const QString phone =  map.toMap().value("identifier").toString();
--                if (!phone.isEmpty())
--                    m_phones << phone;
--            }
--        }
--
--        // next row
--        row++;
--    }
--
--    // query for all phones
--    nextContact();
--}
--
--void MostCalledContactsModel::nextContact()
--{
--    if (m_phones.isEmpty()) {
--        parseResult();
--        return;
--    }
--
--    QString nextPhone = m_phones.takeFirst();
--
--    if (m_phoneToContactCache.contains(nextPhone)) {
--        registerCall(nextPhone, m_phoneToContactCache.value(nextPhone));
--        nextContact();
--        return;
--    } else {
--        QContactFilter filter(QContactPhoneNumber::match(nextPhone));
--        QContactFetchHint hint;
--        hint.setDetailTypesHint(QList<QContactDetail::DetailType>() << QContactDetail::TypeGuid);
--
--        m_currentFetch = new QContactFetchRequest;
--        m_currentFetch->setProperty("PHONE", nextPhone);
--        m_currentFetch->setFilter(filter);
--        m_currentFetch->setFetchHint(hint);
--        m_currentFetch->setManager(m_manager.data());
--
--        connect(m_currentFetch,
--                SIGNAL(stateChanged(QContactAbstractRequest::State)),
--                SLOT(fetchContactIdDone()));
--
--        m_currentFetch->start();
--    }
--}
--
--void MostCalledContactsModel::fetchContactIdDone()
--{
--    Q_ASSERT(m_currentFetch);
--
--    if (m_aboutToQuit) {
--        m_currentFetch->deleteLater();
--        m_currentFetch = 0;
--        return;
--    }
--
--    if (m_currentFetch->state() == QContactAbstractRequest::ActiveState) {
--        return;
--    }
--
--    if (!m_currentFetch->contacts().isEmpty()) {
--        QString id = m_currentFetch->contacts().at(0).id().toString();
--        registerCall(m_currentFetch->property("PHONE").toString(), id);
--    }
--    m_currentFetch->deleteLater();
--    m_currentFetch = 0;
--    nextContact();
--}
--
--void MostCalledContactsModel::registerCall(const QString &phone, const QString &contactId)
--{
--    // update cache
--    m_phoneToContactCache.insert(phone, contactId);
--
--    if (m_contactsData.contains(contactId)) {
--        MostCalledContactsModelData &data = m_contactsData[contactId];
--        data.callCount++;
--    } else {
--        MostCalledContactsModelData data;
--        data.contactId = contactId;
--        data.phoneNumber = phone;
--        data.callCount = 1;
--        m_contactsData.insert(contactId, data);
--    }
--    m_totalCalls++;
--}
--
--void MostCalledContactsModel::parseResult()
--{
--    if (m_aboutToQuit) {
--        return;
--    }
--
--    Q_EMIT beginResetModel();
--
--    m_reloadingModel = true;
--    m_outdated = false;
--    m_data.clear();
--    m_average = 0;
--
--    if (!m_contactsData.isEmpty()) {
--        // sort by callCount
--        QList<MostCalledContactsModelData> data = m_contactsData.values();
--        qSort(data.begin(), data.end(), mostCalledContactsModelDataGreaterThan);
--
--        // average
--        m_average = qRound(((qreal) (m_totalCalls)) / m_contactsData.size());
--        Q_FOREACH(const MostCalledContactsModelData &d, data) {
--            if (d.callCount >= m_average) {
--                m_data << d;
--            }
--            if ((uint) m_data.size() >= m_maxCount) {
--                break;
--            }
--        }
--    }
--
--    m_totalCalls = 0;
--    m_phones.clear();
--    m_phoneToContactCache.clear();
--    m_contactsData.clear();
--
--    Q_EMIT endResetModel();
--    m_reloadingModel = false;
--    Q_EMIT callAverageChanged(m_average);
--    Q_EMIT loaded();
--}
--
--
--void MostCalledContactsModel::markAsOutdated()
--{
--    // skip if model is being reloaded
--    if (m_reloadingModel) {
--        return;
--    }
--
--    if (!m_outdated) {
--        m_outdated = true;
--        Q_EMIT outdatedChange(m_outdated);
--    }
--}
--
--
 === removed file 'src/imports/Ubuntu/Contacts/mostcalledproxymodel.h'
 --- src/imports/Ubuntu/Contacts/mostcalledproxymodel.h	2015-05-07 17:27:16 +0000
 +++ src/imports/Ubuntu/Contacts/mostcalledproxymodel.h	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
--/*
-- * Copyright (C) 2012-2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program 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 General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef __MOSTCALLEDCONTACTSMODEL_H__
--#define __MOSTCALLEDCONTACTSMODEL_H__
--
--
--#include <QtCore/QAbstractListModel>
--#include <QtCore/QScopedPointer>
--#include <QtCore/QDateTime>
--#include <QtCore/QMap>
--
--#include <QtContacts/QContactManager>
--#include <QtContacts/QContactFetchRequest>
--
--struct MostCalledContactsModelData
--{
--    QString contactId;
--    QString phoneNumber;
--    int callCount;
--};
--
--class MostCalledContactsModel : public QAbstractListModel
--{
--    Q_OBJECT
--    Q_PROPERTY(QAbstractItemModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
--    Q_PROPERTY(uint maxCount READ maxCount WRITE setMaxCount NOTIFY maxCountChanged)
--    Q_PROPERTY(int callAverage READ callAverage NOTIFY callAverageChanged)
--    Q_PROPERTY(QDateTime startInterval READ startInterval WRITE setStartInterval NOTIFY startIntervalChanged)
--    Q_PROPERTY(bool outdated READ outdated NOTIFY outdatedChange)
--
--public:
--    enum Role {
--        ContactIdRole = 0,
--        PhoneNumberRole,
--        CallCountRole
--    };
--
--    MostCalledContactsModel(QObject *parent=0);
--    ~MostCalledContactsModel();
--
--    QVariant data(const QModelIndex &index, int role) const;
--    QHash<int, QByteArray> roleNames() const;
--    int rowCount(const QModelIndex&) const;
--
--    QAbstractItemModel *sourceModel() const;
--    void setSourceModel(QAbstractItemModel *model);
--
--    uint maxCount() const;
--    void setMaxCount(uint value);
--
--    int callAverage() const;
--    bool outdated() const;
--
--    QDateTime startInterval() const;
--    void setStartInterval(const QDateTime &value);
--
--    Q_INVOKABLE void update();
--
--Q_SIGNALS:
--    void maxCountChanged(uint value);
--    void callAverageChanged(int value);
--    void startIntervalChanged(const QDateTime &value);
--    void sourceModelChanged(QAbstractItemModel *value);
--    void outdatedChange(bool value);
--    void loaded();
--
--private Q_SLOTS:
--    void markAsOutdated();
--    void fetchContactIdDone();
--
--private:
--    QAbstractItemModel *m_sourceModel;
--    QtContacts::QContactFetchRequest *m_currentFetch;
--
--    QScopedPointer<QtContacts::QContactManager> m_manager;
--    QList<MostCalledContactsModelData> m_data;
--    uint m_maxCount;
--    int m_average;
--    QDateTime m_startInterval;
--    bool m_outdated;
--    bool m_reloadingModel;
--    bool m_aboutToQuit;
--
--    QStringList m_phones;
--    QMap<QString, QString> m_phoneToContactCache;
--    QMap<QString, MostCalledContactsModelData > m_contactsData;
--    int m_totalCalls;
--
--    void fetchContactId(const QString &phoneNumber);
--    QVariant getSourceData(int row, int role);
--    void queryContacts();
--    void nextContact();
--    void registerCall(const QString &phone, const QString &contactId);
--    void parseResult();
--};
--
--
--#endif
 === modified file 'src/imports/Ubuntu/Contacts/plugin.cpp'
 --- src/imports/Ubuntu/Contacts/plugin.cpp	2015-05-07 17:27:16 +0000
 +++ src/imports/Ubuntu/Contacts/plugin.cpp	2016-12-14 13:04:55 +0000
@@ -15,7 +15,6 @@
   */
  #include "plugin.h"
--#include "mostcalledproxymodel.h"
  #include "contacts.h"
  #include "simcardcontacts.h"
@@ -39,6 +38,5 @@
+ {
      // @uri Ubuntu.Contacts
      qmlRegisterSingletonType<UbuntuContacts>(uri, 0, 1, "Contacts", contactsProvider);
--    qmlRegisterType<MostCalledContactsModel>(uri, 0, 1, "MostCalledContactsModel");
      qmlRegisterType<SimCardContacts>(uri, 0, 1, "SimCardContacts");
+ }
 === modified file 'src/imports/Ubuntu/Contacts/qmldir'
 --- src/imports/Ubuntu/Contacts/qmldir	2015-10-23 11:03:31 +0000
 +++ src/imports/Ubuntu/Contacts/qmldir	2016-12-14 13:04:55 +0000
@@ -28,8 +28,6 @@
  internal FastScrollJs FastScroll.js
  internal FastScroll FastScroll.qml
  internal ListItemWithActionsCheckBox ListItemWithActionsCheckBox.qml
--internal MostCalledList MostCalledList.qml
--internal MostCalledModel MostCalledModel.qml
  internal Ofono Ofono.qml
  internal SectionDelegate SectionDelegate.qml
  internal SubtitledWithColors SubtitledWithColors.qml

address-book-app

Merge lp:~renatofilho/address-book-app/no-most-called into lp:address-book-app

Commit message

Description of the change

Preview Diff

Subscribers