e_test_event: rename dbus proxy & obj to ds_proxy & ds_obj

Change-Id: Ib56b2dcfe1a33f054b2a8cf981ec3a51cc8421dc

diff --git a/src/e_test_event.cpp b/src/e_test_event.cpp
index 75aaf4e..3e6a92d 100644 (file)
--- a/src/e_test_event.cpp
+++ b/src/e_test_event.cpp
@@ -146,14 +146,14 @@ etRunner::init()
    dbus.conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
    EINA_SAFETY_ON_NULL_RETURN_VAL(dbus.conn, EINA_FALSE);
 
-   dbus.obj = eldbus_object_get(dbus.conn,
+   dbus.ds_obj = eldbus_object_get(dbus.conn,
                                 "org.enlightenment.wm",
                                 "/org/enlightenment/wm");
-   EINA_SAFETY_ON_NULL_RETURN_VAL(dbus.obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(dbus.ds_obj, EINA_FALSE);
 
-   dbus.proxy = eldbus_proxy_get(dbus.obj,
+   dbus.ds_proxy = eldbus_proxy_get(dbus.ds_obj,
                                  "org.enlightenment.wm.Test");
-   EINA_SAFETY_ON_NULL_RETURN_VAL(dbus.proxy, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(dbus.ds_proxy, EINA_FALSE);
 
    // reset registered window of e_test_helper
    res = resetRegisterWin();
@@ -208,8 +208,8 @@ etRunner::shutdown()
      }
 
    // deinit eldbus
-   eldbus_proxy_unref(dbus.proxy);
-   eldbus_object_unref(dbus.obj);
+   eldbus_proxy_unref(dbus.ds_proxy);
+   eldbus_object_unref(dbus.ds_obj);
    eldbus_connection_unref(dbus.conn);
    eldbus_shutdown();
 
@@ -226,7 +226,7 @@ etRunner::registerWin(etWin *tw)
    Eldbus_Pending *p = NULL;
    Eina_Bool accepted = EINA_FALSE;
 
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "RegisterWindow",
                          _cb_method_window_register,
                          &accepted,
@@ -246,7 +246,7 @@ etRunner::deregisterWin(etWin *tw)
    Eldbus_Pending *p = NULL;
    Eina_Bool accepted = EINA_FALSE;
 
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "DeregisterWindow",
                          _cb_method_window_register,
                          &accepted,
@@ -266,7 +266,7 @@ etRunner::resetRegisterWin()
    Eldbus_Pending *p = NULL;
    Eina_Bool accepted = EINA_FALSE;
 
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "ResetRegisterWindow",
                          _cb_method_window_register,
                          &accepted,
@@ -314,7 +314,7 @@ etRunner::setWinStack(etWin *tw,
                       Eina_Bool above)
 {
    Eldbus_Pending *p = NULL;
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "SetWindowStack",
                          NULL,
                          NULL,
@@ -395,7 +395,7 @@ etRunner::setZoneRotation(int angle)
    Eldbus_Pending *p = NULL;
    Eina_Bool allowed = EINA_FALSE;
 
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "ChangeZoneRotation",
                          _cb_method_zone_rotation_change,
                          &allowed,
@@ -415,7 +415,7 @@ etRunner::setTCStart()
    Eldbus_Pending *p = NULL;
    Eina_Bool res = EINA_FALSE;
 
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "StartTestCase",
                          _cb_method_set_tc_start_end,
                          &res,
@@ -440,7 +440,7 @@ etRunner::setTCEnd()
    Eldbus_Pending *p = NULL;
    Eina_Bool res = EINA_FALSE;
 
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "EndTestCase",
                          _cb_method_set_tc_start_end,
                          &res,
@@ -469,7 +469,7 @@ etRunner::getWinInfo(etWin *tw)
 
    while (retry)
      {
-        p = eldbus_proxy_call(dbus.proxy,
+        p = eldbus_proxy_call(dbus.ds_proxy,
                               "GetWinInfo",
                               _cb_method_win_info_get,
                               tw,
@@ -509,7 +509,7 @@ etRunner::getWinInfoList()
 
    while (info_list)
      {
-        p = eldbus_proxy_call(dbus.proxy,
+        p = eldbus_proxy_call(dbus.ds_proxy,
                               "GetWinsInfo",
                               _cb_method_win_info_list_get,
                               info_list,
@@ -625,7 +625,7 @@ Eina_Bool
 etRunner::setDpms(Eina_Bool on)
 {
    Eldbus_Pending *p = NULL;
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "DPMS",
                          NULL,
                          NULL,
@@ -640,7 +640,7 @@ Eina_Bool
 etRunner::feedMouseDown(int x, int y)
 {
    Eldbus_Pending *p = NULL;
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "EventMouse",
                          NULL,
                          NULL,
@@ -656,7 +656,7 @@ Eina_Bool
 etRunner::feedMouseMove(int x, int y)
 {
    Eldbus_Pending *p = NULL;
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "EventMouse",
                          NULL,
                          NULL,
@@ -672,7 +672,7 @@ Eina_Bool
 etRunner::feedMouseUp(int x, int y)
 {
    Eldbus_Pending *p = NULL;
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "EventMouse",
                          NULL,
                          NULL,
@@ -688,7 +688,7 @@ Eina_Bool
 etRunner::feedKeyDown(const char *key)
 {
    Eldbus_Pending *p = NULL;
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "EventKey",
                          NULL,
                          NULL,
@@ -704,7 +704,7 @@ Eina_Bool
 etRunner::feedKeyUp(const char *key)
 {
    Eldbus_Pending *p = NULL;
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "EventKey",
                          NULL,
                          NULL,
@@ -979,7 +979,7 @@ etRunner::setWinEffect(etWin *tw)
 
    this->ev.elm_win = tw->elm_win;
 
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "RenderTrace",
                          _cb_method_window_effect,
                          &accepted,
@@ -997,7 +997,7 @@ Eina_Bool
 etRunner::freezeEvent()
 {
    Eldbus_Pending *p = NULL;
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "EventFreeze",
                          NULL,
                          NULL,
@@ -1012,7 +1012,7 @@ Eina_Bool
 etRunner::thawEvent()
 {
    Eldbus_Pending *p = NULL;
-   p = eldbus_proxy_call(dbus.proxy,
+   p = eldbus_proxy_call(dbus.ds_proxy,
                          "EventFreeze",
                          NULL,
                          NULL,
@@ -1122,35 +1122,35 @@ etRunner::addSignalHandlers()
 
    flushEventQueue();
 
-   sh = eldbus_proxy_signal_handler_add(dbus.proxy,
+   sh = eldbus_proxy_signal_handler_add(dbus.ds_proxy,
                                         "VisibilityChanged",
                                         _cb_signal_vis_changed,
                                         this);
    EINA_SAFETY_ON_NULL_GOTO(sh, err);
    ev.sh_list = eina_list_append(ev.sh_list, sh);
 
-   sh = eldbus_proxy_signal_handler_add(dbus.proxy,
+   sh = eldbus_proxy_signal_handler_add(dbus.ds_proxy,
                                         "StackChanged",
                                         _cb_signal_stack_changed,
                                         this);
    EINA_SAFETY_ON_NULL_GOTO(sh, err);
    ev.sh_list = eina_list_append(ev.sh_list, sh);
 
-   sh = eldbus_proxy_signal_handler_add(dbus.proxy,
+   sh = eldbus_proxy_signal_handler_add(dbus.ds_proxy,
                                         "WinRotationChanged",
                                         _cb_signal_win_rot_changed,
                                         this);
    EINA_SAFETY_ON_NULL_GOTO(sh, err);
    ev.sh_list = eina_list_append(ev.sh_list, sh);
 
-   sh = eldbus_proxy_signal_handler_add(dbus.proxy,
+   sh = eldbus_proxy_signal_handler_add(dbus.ds_proxy,
                                         "FocusChanged",
                                         _cb_signal_focus_changed,
                                         this);
    EINA_SAFETY_ON_NULL_GOTO(sh, err);
    ev.sh_list = eina_list_append(ev.sh_list, sh);
 
-   sh = eldbus_proxy_signal_handler_add(dbus.proxy,
+   sh = eldbus_proxy_signal_handler_add(dbus.ds_proxy,
                                         "RenderRun",
                                         _cb_signal_render_while_effect_run,
                                         this);

diff --git a/src/e_test_event.h b/src/e_test_event.h
index eb815cd..cb78489 100644 (file)
--- a/src/e_test_event.h
+++ b/src/e_test_event.h
@@ -22,8 +22,8 @@ private:
       ev = {0,};
       logDomain = 0;
       dbus.conn = NULL;
-      dbus.proxy = NULL;
-      dbus.obj = NULL;
+      dbus.ds_proxy = NULL;
+      dbus.ds_obj = NULL;
       listWinInfo = NULL;
       output = {0,};
    };
@@ -46,8 +46,8 @@ private:
    struct
      {
         Eldbus_Connection *conn;
-        Eldbus_Proxy      *proxy;
-        Eldbus_Object     *obj;
+        Eldbus_Proxy      *ds_proxy; // display server proxy
+        Eldbus_Object     *ds_obj;   // display server obj
      } dbus;
 
    struct tizen_policy  *tzPolicy;
@@ -168,8 +168,8 @@ public:
    Eina_Bool     addSignalHandlers();
    void          delSignalHandlers();
 
-   Eldbus_Proxy  *getDbusProxy()  { return dbus.proxy; }
-   Eldbus_Object *getDbusObject() { return dbus.obj;   }
+   Eldbus_Proxy  *getDbusProxy()  { return dbus.ds_proxy; }
+   Eldbus_Object *getDbusObject() { return dbus.ds_obj;   }
    int            getLogDomain()  { return logDomain;  }
    efl_util_gesture_h getGestureHandler() { return gestureHandler; }