Use simple API of libwindowmanagerguppy_6.99.2guppy_6.99.1guppy/6.99.2guppy/6.99.16.99.26.99.1

Use simple API of libwindowmanager, then remove json_object
from source code.

Change-Id: I37a4a7f22d9f13612c68022aad7799429a844748
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/qlibwindowmanager.h b/src/qlibwindowmanager.h
index 3a720a1..e60f04f 100644
--- a/src/qlibwindowmanager.h
+++ b/src/qlibwindowmanager.h
@@ -89,20 +89,20 @@ public:
     int init(int port, const QString &token);
 
     // WM API
-    Q_INVOKABLE int requestSurface(const QString &label);
-    Q_INVOKABLE int activateWindow(const QString &label);
-    Q_INVOKABLE int activateWindow(const QString &label, const QString &drawing_area);
-    Q_INVOKABLE int deactivateWindow(const QString &label);
-    Q_INVOKABLE int endDraw(const QString &label);
+    Q_INVOKABLE int requestSurface(const QString &role);
+    Q_INVOKABLE int activateWindow(const QString &role);
+    Q_INVOKABLE int activateWindow(const QString &role, const QString &drawing_area);
+    Q_INVOKABLE int deactivateWindow(const QString &role);
+    Q_INVOKABLE int endDraw(const QString &role);
 
     void set_event_handler(enum QEventType et, handler_fun f);
 
     double get_scale_factor() const { return screen_info->scale_factor(); };
 
     // These APIs are deprecated, please use new API
-    THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int activateSurface(const QString &label));
-    THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int activateSurface(const QString &label, const QString &drawing_area));
-    THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int deactivateSurface(const QString &label));
+    THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int activateSurface(const QString &role));
+    THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int activateSurface(const QString &role, const QString &drawing_area));
+    THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int deactivateSurface(const QString &role));
 
 public slots:
     void slotActivateWindow();
@@ -112,7 +112,7 @@ public slots:
 
 private:
     LibWindowmanager* wm;
-    const char* applabel;
+    std::string graphic_role;
     bool isActive;
     AGLScreenInfoPrivate* screen_info;
 };