diff options
author | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2018-08-24 04:50:33 +0000 |
---|---|---|
committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2018-08-24 11:01:34 +0000 |
commit | ca4cbb471820eda8fe2e439be06fe3bdf29e34ff (patch) | |
tree | 789d28c5760b2520f57c6eb7562e3dc3f0889e2e | |
parent | 59f49ec2538f22fbf752330f78413e445a3dc504 (diff) |
Revert "Use appid between homescreen-service and apps"needlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.0jellyfish_9.99.4jellyfish_9.99.3jellyfish_9.99.2jellyfish_9.99.1jellyfish/9.99.4jellyfish/9.99.3jellyfish/9.99.2jellyfish/9.99.1icefish_8.99.5icefish_8.99.4icefish_8.99.3icefish_8.99.2icefish_8.99.1icefish/8.99.5icefish/8.99.4icefish/8.99.3icefish/8.99.2icefish/8.99.1halibut_8.0.6halibut_8.0.5halibut_8.0.4halibut_8.0.3halibut_8.0.2halibut_8.0.1halibut_8.0.0halibut_7.99.3halibut_7.99.2halibut_7.99.1halibut_7.90.0halibut/8.0.6halibut/8.0.5halibut/8.0.4halibut/8.0.3halibut/8.0.2halibut/8.0.1halibut/8.0.0halibut/7.99.3halibut/7.99.2halibut/7.99.1halibut/7.90.0guppy_6.99.4guppy_6.99.3guppy_6.99.2guppy_6.99.1guppy_6.90.0guppy/6.99.4guppy/6.99.3guppy/6.99.2guppy/6.99.1guppy/6.90.0flounder_5.99.6flounder_5.99.5flounder_5.99.4flounder/5.99.6flounder/5.99.5flounder/5.99.49.99.49.99.39.99.29.99.18.99.58.99.48.99.38.99.28.99.18.0.68.0.58.0.48.0.38.0.28.0.18.0.07.99.37.99.27.99.17.90.06.99.46.99.36.99.26.99.16.90.05.99.65.99.55.99.413.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0halibut
This reverts commit 59f49ec2538f22fbf752330f78413e445a3dc504.
Bug-AGL: SPEC-1685
Change-Id: Ie27c4102fc7a87e8a972dc83dd3a1c94d0626091
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
-rw-r--r-- | src/qlibhomescreen.cpp | 8 | ||||
-rw-r--r-- | src/qlibhomescreen.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/qlibhomescreen.cpp b/src/qlibhomescreen.cpp index cfeb9c1..13093c3 100644 --- a/src/qlibhomescreen.cpp +++ b/src/qlibhomescreen.cpp @@ -24,7 +24,7 @@ using namespace std; #define _REQ_POPUP_MESSAGE "on_screen_message" #define _TAPSHORTCUT "tap_shortcut" #define _KEY_DATA "data" -#define _KEY_APPLICATION_DATA "application_id" +#define _KEY_APPLICATION_DATA "application_name" #define _KEY_REPLY_MESSAGE "reply_message" #define _KEY_REQUEST_MESSAGE "display_message" @@ -175,8 +175,8 @@ void QLibHomeScreen::set_event_handler(enum QEventType et, handler_fun f) * - None. * */ -void QLibHomeScreen::tapShortcut(QString application_id) +void QLibHomeScreen::tapShortcut(QString application_name) { - HMI_DEBUG("qlibhomescreen","tapShortcut %s", application_id.toStdString().c_str()); - this->mp_hs->tapShortcut(application_id.toStdString().c_str()); + HMI_DEBUG("qlibhomescreen","tapShortcut %s", application_name.toStdString().c_str()); + this->mp_hs->tapShortcut(application_name.toStdString().c_str()); }
\ No newline at end of file diff --git a/src/qlibhomescreen.h b/src/qlibhomescreen.h index bf43963..cc0f12a 100644 --- a/src/qlibhomescreen.h +++ b/src/qlibhomescreen.h @@ -43,7 +43,7 @@ public: Q_INVOKABLE int onScreenMessage(const QString &message); Q_INVOKABLE int subscribe(const QString &eventName); Q_INVOKABLE int unsubscribe(const QString &eventName); - Q_INVOKABLE void tapShortcut(QString application_id); + Q_INVOKABLE void tapShortcut(QString application_name); signals: |