From 677eb7cc1bd06058e2ac7478f6c5d3a6af4a53dc Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Fri, 22 Jun 2018 16:56:00 -0400 Subject: Remove all static call history model support Remove all of the static call history model support that was deprecated by the new RecentCallModel support. Bug-AGL: SPEC-1436 Change-Id: Ie4354af26d946b40797f57b359dbe1de9f5a9bc3 Signed-off-by: Matt Porter --- app/app.pro | 2 +- app/calltype.h | 32 -------------------------------- app/main.cpp | 2 -- app/models/CallHistoryModel.qml | 39 --------------------------------------- app/models/qmldir | 1 - app/phone.qrc | 1 - 6 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 app/calltype.h delete mode 100644 app/models/CallHistoryModel.qml diff --git a/app/app.pro b/app/app.pro index 2b98232..41b90da 100644 --- a/app/app.pro +++ b/app/app.pro @@ -2,7 +2,7 @@ TARGET = phone QT = quickcontrols2 websockets multimedia SOURCES = main.cpp phone.cpp -HEADERS = calltype.h phone.h numbertype.h +HEADERS = phone.h numbertype.h SUBDIRS = telephony-binding diff --git a/app/calltype.h b/app/calltype.h deleted file mode 100644 index 03eb152..0000000 --- a/app/calltype.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2018 Konsulko Group - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -class CallType -{ - Q_GADGET - public: - enum Value { - Missed, - Outgoing, - Incoming, - }; - Q_ENUM(Value) - - private: - CallType(); -}; diff --git a/app/main.cpp b/app/main.cpp index b1f1668..56b6622 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -28,7 +28,6 @@ #include #include -#include "calltype.h" #include "phone.h" #include "numbertype.h" @@ -102,7 +101,6 @@ int main(int argc, char *argv[]) } }); - qmlRegisterUncreatableType("CallType", 1, 0, "CallType", "Not creatable as it is an enum type"); qmlRegisterUncreatableType("NumberType", 1, 0, "NumberType", "Not creatable as it is an enum type"); engine.load(QUrl(QStringLiteral("qrc:/Phone.qml"))); diff --git a/app/models/CallHistoryModel.qml b/app/models/CallHistoryModel.qml deleted file mode 100644 index a1c00b0..0000000 --- a/app/models/CallHistoryModel.qml +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 2015, Jaguar Land Rover. All Rights Reserved. - * Copyright (C) 2016, The Qt Company. 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/. */ - -import QtQml.Models 2.2 -import CallType 1.0 - -ListModel { - ListElement { - name: "Droopy" - number: "8003451234" - time: "2015-01-05 07:15" - type: CallType.Missed - } - - ListElement { - name: "Doc" - number: "8003451234" - time: "2015-01-05 07:15" - type: CallType.Incoming - } - - ListElement { - name: "Grumpy" - number: "8003451234" - time: "2015-01-05 07:15" - type: CallType.Outgoing - } - - ListElement { - name: "Bashful" - number: "8003451234" - time: "2015-01-05 07:15" - type: CallType.Incoming - } -} diff --git a/app/models/qmldir b/app/models/qmldir index 0b87a56..253ca82 100644 --- a/app/models/qmldir +++ b/app/models/qmldir @@ -4,5 +4,4 @@ # * 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/. */ -CallListModel 1.0 CallListModel.qml ContactsModel 1.0 ContactsModel.qml diff --git a/app/phone.qrc b/app/phone.qrc index 17a9ab6..c593e18 100644 --- a/app/phone.qrc +++ b/app/phone.qrc @@ -3,7 +3,6 @@ Phone.qml Dialer.qml Recents.qml - models/CallHistoryModel.qml models/ContactsModel.qml models/qmldir ContactsView.qml -- cgit 1.2.3-korg