diff options
author | Robert Griebl <robert.griebl@qt.io> | 2019-10-13 16:56:51 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2019-10-28 14:11:42 +0100 |
commit | 495cc72c005cbb7796e557b0995f130c1d128a7b (patch) | |
tree | 9266c35d1b5851cd4b88b1856f425df0f1ca7d34 /src/intent-server-lib/intentserverrequest.cpp | |
parent | 0a1cccfccd8f76014bc697c5c9006c5ebb9723e8 (diff) | |
download | qtapplicationmanager-495cc72c005cbb7796e557b0995f130c1d128a7b.tar.gz |
Change intent implementation to better fit new architecture
- IntentServer is now a list model as all the other singletons.
- IntentModel is the companion filter model for the IntentServer, just like
the ApplicationModel is for the ApplicationManager
- Intent is now a Q_OBJECT instead of a Q_GADGET
Change-Id: Ifead097c543fb00b08ab21210e4526a6f65ba167
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'src/intent-server-lib/intentserverrequest.cpp')
-rw-r--r-- | src/intent-server-lib/intentserverrequest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/intent-server-lib/intentserverrequest.cpp b/src/intent-server-lib/intentserverrequest.cpp index 8985cbe3..059d20e8 100644 --- a/src/intent-server-lib/intentserverrequest.cpp +++ b/src/intent-server-lib/intentserverrequest.cpp @@ -1,5 +1,6 @@ /**************************************************************************** ** +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2019 Luxoft Sweden AB ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ @@ -45,7 +46,7 @@ QT_BEGIN_NAMESPACE_AM IntentServerRequest::IntentServerRequest(const QString &requestingApplicationId, const QString &intentId, - const QVector<Intent> &potentialIntents, + const QVector<Intent *> &potentialIntents, const QVariantMap ¶meters) : m_id(QUuid::createUuid()) , m_state(State::ReceivedRequest) @@ -57,7 +58,7 @@ IntentServerRequest::IntentServerRequest(const QString &requestingApplicationId, Q_ASSERT(!potentialIntents.isEmpty()); if (potentialIntents.size() == 1) - setHandlingApplicationId(potentialIntents.first().applicationId()); + setHandlingApplicationId(potentialIntents.first()->applicationId()); } IntentServerRequest::State IntentServerRequest::state() const @@ -85,7 +86,7 @@ QString IntentServerRequest::handlingApplicationId() const return m_handlingApplicationId; } -QVector<Intent> IntentServerRequest::potentialIntents() const +QVector<Intent *> IntentServerRequest::potentialIntents() const { return m_potentialIntents; } |