From 20bb3b8bbf269f89c4225a3881d4ee80eee26882 Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Tue, 26 Jun 2018 13:12:54 -0400 Subject: Remove all static contacts model support Remove all of the static contacts model support that was deprecated by the new ContactModel support in libqtappfw. Goodbye, Art McGee! Bug-AGL: SPEC-1436 Change-Id: I4e33d459d389c7d35afceb484eb21541660f9750 Signed-off-by: Matt Porter --- app/Dialer.qml | 1 - app/Recents.qml | 1 - app/models/ContactsModel.qml | 88 -------------------------------------------- app/models/qmldir | 7 ---- app/phone.qrc | 2 - 5 files changed, 99 deletions(-) delete mode 100755 app/models/ContactsModel.qml delete mode 100644 app/models/qmldir diff --git a/app/Dialer.qml b/app/Dialer.qml index 97bfcc1..9dc91db 100644 --- a/app/Dialer.qml +++ b/app/Dialer.qml @@ -20,7 +20,6 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 import QtMultimedia 5.5 import AGL.Demo.Controls 1.0 -import 'models' Item { id: root diff --git a/app/Recents.qml b/app/Recents.qml index 88fcf20..3eafaac 100644 --- a/app/Recents.qml +++ b/app/Recents.qml @@ -19,7 +19,6 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 import AGL.Demo.Controls 1.0 import RecentCall 1.0 -import 'models' Item { id: root diff --git a/app/models/ContactsModel.qml b/app/models/ContactsModel.qml deleted file mode 100755 index f53d2c8..0000000 --- a/app/models/ContactsModel.qml +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (C) 2015, Jaguar Land Rover. All Rights Reserved. - * Copyright (C) 2015, The Qt Company. All Rights Reserved. - * Copyright (C) 2018, Konsulko Group - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -import QtQml.Models 2.2 -import NumberType 1.0 - -ListModel { - function findName(number) { - for (var i = 0; i < count; i++) { - var entry = get(i) - for (var j = 0; j < entry.numbers.length; j++) { - if (entry.numbers[j].number) { - return entry.name - } - } - } - return "Unknown number" - } - - ListElement { - name: "Art McGee" - numbers: [ - ListElement {number: "503-715-6618"; type: NumberType.Mobile}, - ListElement {number: "972-256-9732"; type: NumberType.Work}, - ListElement {number: "503-616-4940"; type: NumberType.Home} - ] - } - - ListElement { - name: "Dana Jonty" - numbers: [ - ListElement {number: "503-209-3254"; type: NumberType.Mobile}, - ListElement {number: "972-000-0000"; type: NumberType.Work}, - ListElement {number: "503-000-0000"; type: NumberType.Other} - ] - } - - ListElement { - name: "Jojo Derick" - numbers: [ - ListElement {number: "503-209-3254"; type: NumberType.Mobile}, - ListElement {number: "972-000-0000"; type: NumberType.Work}, - ListElement {number: "503-000-0000"; type: NumberType.Other} - ] - } - - ListElement { - name: "Kelly Johnson" - numbers: [ - ListElement {number: "503-000-0000"; type: NumberType.Mobile}, - ListElement {number: "972-000-0000"; type: NumberType.Work}, - ListElement {number: "503-000-0000"; type: NumberType.Home} - ] - } - - ListElement { - name: "Marco Morales" - numbers: [ - ListElement {number: "503-209-3254"; type: NumberType.Mobile}, - ListElement {number: "972-000-0000"; type: NumberType.Work}, - ListElement {number: "503-000-0000"; type: NumberType.Home} - ] - } - - ListElement { - name: "Rob Brad" - numbers: [ - ListElement {number: "503-209-3254"; type: NumberType.Mobile}, - ListElement {number: "972-000-0000"; type: NumberType.Work}, - ListElement {number: "503-000-0000"; type: NumberType.Other} - ] - } - - ListElement { - name: "Ted Gilbert" - numbers: [ - ListElement {number: "503-209-3254"; type: NumberType.Mobile}, - ListElement {number: "972-000-0000"; type: NumberType.Work}, - ListElement {number: "503-101-1001"; type: NumberType.Home}, - ListElement {number: "503-000-0000"; type: NumberType.Other} - ] - } -} diff --git a/app/models/qmldir b/app/models/qmldir deleted file mode 100644 index 253ca82..0000000 --- a/app/models/qmldir +++ /dev/null @@ -1,7 +0,0 @@ -#/* Copyright (C) 2015, Jaguar Land Rover. All Rights Reserved. -# * -# * This Source Code Form is subject to the terms of the Mozilla Public -# * License, v. 2.0. If a copy of the MPL was not distributed with this -# * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -ContactsModel 1.0 ContactsModel.qml diff --git a/app/phone.qrc b/app/phone.qrc index c593e18..9ddc66b 100644 --- a/app/phone.qrc +++ b/app/phone.qrc @@ -3,8 +3,6 @@ Phone.qml Dialer.qml Recents.qml - models/ContactsModel.qml - models/qmldir ContactsView.qml TabImageButton.qml -- cgit 1.2.3-korg