removing unfavourable words for source code

Change-Id: I38ac2ede3cbe631cef7cb256848e0f9698b16176
Signed-off-by: aman.jeph <aman.jeph@samsung.com>

diff --git a/inc/sim_controller.h b/inc/sim_controller.h
index d43e9a6c8356f3c05eb6038ee9f4d1ed60a37c71..518fdf4e6fe934db66081282bd0359ff300bafb9 100755 (executable)
--- a/inc/sim_controller.h
+++ b/inc/sim_controller.h
@@ -28,7 +28,7 @@ typedef enum {
 } quickpanel_sim_num_e;
 
 
-extern void sim_controller_init(Evas_Object *master_layout);
+extern void sim_controller_init(Evas_Object *primary_layout);
 extern void sim_controller_deinit(void);
 extern void sim_controller_on_language_change(void);
 

diff --git a/src/notifications/noti.c b/src/notifications/noti.c
index fffdd790953b398d7e09a11ade81ad3f6057e574..ba2fb09eda2c518eb8a848daf0e89d63bfe8963b 100755 (executable)
--- a/src/notifications/noti.c
+++ b/src/notifications/noti.c
@@ -558,7 +558,7 @@ static void _detailed_changed_cb(void *data, notification_type_e type, notificat
        int priv_id = 0;
        struct appdata *ad = NULL;
        notification_h noti_new = NULL;
-       notification_h noti_from_master = NULL;
+       notification_h noti_from_primary = NULL;
        notification_type_e noti_type = NOTIFICATION_TYPE_NONE;
        int noti_applist = NOTIFICATION_DISPLAY_APP_ALL;
        notification_ly_type_e noti_layout = NOTIFICATION_LY_NONE;
@@ -572,25 +572,25 @@ static void _detailed_changed_cb(void *data, notification_type_e type, notificat
        for (i = 0; i < num_op; i++) {
                notification_op_get_data(op_list + i, NOTIFICATION_OP_DATA_TYPE, &op_type);
                notification_op_get_data(op_list + i, NOTIFICATION_OP_DATA_PRIV_ID, &priv_id);
-               notification_op_get_data(op_list + i, NOTIFICATION_OP_DATA_NOTI, &noti_from_master);
+               notification_op_get_data(op_list + i, NOTIFICATION_OP_DATA_NOTI, &noti_from_primary);
 
                ERR("noti operation:%d privid:%d", op_type, priv_id);
 
                switch (op_type) {
                case NOTIFICATION_OP_INSERT:
                        DBG("NOTIFICATION_OP_INSERT");
-                       if (noti_from_master == NULL) {
-                               ERR("failed to get a notification from master");
+                       if (noti_from_primary == NULL) {
+                               ERR("failed to get a notification from primary");
                                continue;
                        }
-                       if (notification_clone(noti_from_master, &noti_new) != NOTIFICATION_ERROR_NONE) {
+                       if (notification_clone(noti_from_primary, &noti_new) != NOTIFICATION_ERROR_NONE) {
                                ERR("failed to create a cloned notification");
                                continue;
                        }
 
                        _print_debuginfo_from_noti(noti_new);
 
-                       _set_current_notification(noti_from_master);
+                       _set_current_notification(noti_from_primary);
 
 #ifdef QP_EMERGENCY_MODE_ENABLE
                        if (quickpanel_emergency_mode_is_on()) {
@@ -675,12 +675,12 @@ static void _detailed_changed_cb(void *data, notification_type_e type, notificat
 
                                DBG("Notification update priv_id[%d]", priv_id);
 
-                               if (noti_from_master == NULL) {
-                                       ERR("failed to get a notification from master");
+                               if (noti_from_primary == NULL) {
+                                       ERR("failed to get a notification from primary");
                                        continue;
                                }
 
-                               if (notification_clone(noti_from_master, &noti_new) != NOTIFICATION_ERROR_NONE) {
+                               if (notification_clone(noti_from_primary, &noti_new) != NOTIFICATION_ERROR_NONE) {
                                        ERR("failed to create a cloned notification");
                                        continue;
                                }
@@ -698,7 +698,7 @@ static void _detailed_changed_cb(void *data, notification_type_e type, notificat
 #endif
                                _print_debuginfo_from_noti(noti_new);
 
-                               _set_current_notification(noti_from_master);
+                               _set_current_notification(noti_from_primary);
 
                                notification_get_layout(noti_new, &noti_layout);
 

diff --git a/src/sim_controller.c b/src/sim_controller.c
index 50d9b35582b59361343305eb7ce310d117857897..47f58d8761fe25704d0018627e675c8e6b09fc3f 100755 (executable)
--- a/src/sim_controller.c
+++ b/src/sim_controller.c
@@ -300,7 +300,7 @@ static int _sim_init(void)
        return 0;
 }
 
-void sim_controller_init(Evas_Object *master_layout)
+void sim_controller_init(Evas_Object *primary_layout)
 {
        QUICKPANEL_EVENT_SIM_STATUS_CHANGED = ecore_event_type_new();
        if (_sim_init()) {