Fix typo in code

Change-Id: If74230c2b655e2a732c42d2e6725c1d06c8968e4
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/candidate/efl/candidate-efl.cpp b/src/candidate/efl/candidate-efl.cpp
index 8bcea2c..c52405b 100644 (file)
--- a/src/candidate/efl/candidate-efl.cpp
+++ b/src/candidate/efl/candidate-efl.cpp
@@ -64,7 +64,7 @@ EflCandidate::item_pressed(Evas_Object *item)
         }
     }
 
-    // notify listners the event happend
+    // notify listeners the event happend
     EventDesc desc;
     desc.type = EventDesc::CANDIDATE_ITEM_MOUSE_DOWN;
     desc.text = str? str : "";
@@ -78,7 +78,7 @@ EflCandidate::item_released(Evas_Object *item)
     const char *str = edje_object_part_text_get(
         item, "candidate");
 
-    // notify listners the event happend
+    // notify listeners the event happend
     EventDesc desc;
     desc.type = EventDesc::CANDIDATE_ITEM_MOUSE_UP;
     desc.text = str? str : "";
@@ -91,7 +91,7 @@ EflCandidate::item_moved(Evas_Object *item)
     const char *str = edje_object_part_text_get(
         item, "candidate");
 
-    // notify listners the event happend
+    // notify listeners the event happend
     EventDesc desc;
     desc.type = EventDesc::CANDIDATE_ITEM_MOUSE_MOVE;
     desc.text = str? str : "";
@@ -120,19 +120,19 @@ EflCandidate::create_item() {
 }
 
 Evas_Object*
-EflCandidate::create_seperate_line() {
+EflCandidate::create_separate_line() {
     int ret;
-    Evas_Object *seperate_line;
+    Evas_Object *separate_line;
 
-    seperate_line = edje_object_add(evas_object_evas_get(win));
-    ret = edje_object_file_set(seperate_line, CANDIDATE_EDJ_FILE_PATH, "seperate_line");
+    separate_line = edje_object_add(evas_object_evas_get(win));
+    ret = edje_object_file_set(separate_line, CANDIDATE_EDJ_FILE_PATH, "separate_line");
     if (!ret) {
-        LOGW("getting seperate line failed.\n");
+        LOGW("getting separate line failed.\n");
         return NULL;
     }
-    evas_object_show(seperate_line);
-    evas_object_size_hint_min_set(seperate_line, 2, 80);
-    return seperate_line;
+    evas_object_show(separate_line);
+    evas_object_size_hint_min_set(separate_line, 2, 80);
+    return separate_line;
 }
 
 EflCandidate::EflCandidate(Evas_Object *window)
@@ -161,7 +161,7 @@ EflCandidate::EflCandidate(Evas_Object *window)
     elm_object_part_content_set(layout, "candidate.scroller", scroller);
     for (int i = 0; i < MAX_CANDIDATE; ++i) {
         candidates[i] = NULL;
-        seperate_lines[i] = NULL;
+        separate_lines[i] = NULL;
     }
 }
 
@@ -194,9 +194,9 @@ EflCandidate::update(const vector<string> &vec_str) {
             evas_object_del(candidates[i]);
             candidates[i] = NULL;
         }
-        if (seperate_lines[i]) {
-            evas_object_del(seperate_lines[i]);
-            seperate_lines[i] = NULL;
+        if (separate_lines[i]) {
+            evas_object_del(separate_lines[i]);
+            separate_lines[i] = NULL;
         }
     }
 
@@ -210,9 +210,9 @@ EflCandidate::update(const vector<string> &vec_str) {
         evas_object_show(candidates[i]);
         elm_table_pack(table, candidates[i], 2*i, 0, 1, 1);
 
-        seperate_lines[i] = create_seperate_line();
-        evas_object_show(seperate_lines[i]);
-        elm_table_pack(table, seperate_lines[i], 2*i+1, 0, 1, 1);
+        separate_lines[i] = create_separate_line();
+        evas_object_show(separate_lines[i]);
+        elm_table_pack(table, separate_lines[i], 2*i+1, 0, 1, 1);
         if (i == 0) {
             // set highlight of 0
             edje_object_color_class_set(candidates[0],

diff --git a/src/candidate/efl/candidate-efl.h b/src/candidate/efl/candidate-efl.h
index 933fd91..89034bf 100644 (file)
--- a/src/candidate/efl/candidate-efl.h
+++ b/src/candidate/efl/candidate-efl.h
@@ -43,13 +43,13 @@ class EflCandidate: public Candidate
 #endif
     private:
         Evas_Object *create_item();
-        Evas_Object *create_seperate_line();
+        Evas_Object *create_separate_line();
         Evas_Object *win;
         Evas_Object *layout;
         Evas_Object *scroller;
         Evas_Object *table;
         Evas_Object *candidates[MAX_CANDIDATE];
-        Evas_Object *seperate_lines[MAX_CANDIDATE];
+        Evas_Object *separate_lines[MAX_CANDIDATE];
 
         std::vector<std::string> cur_candidates;
 };

diff --git a/src/candidate/efl/candidate-multiline-efl.cpp b/src/candidate/efl/candidate-multiline-efl.cpp
index 357dd91..cf2bad7 100644 (file)
--- a/src/candidate/efl/candidate-multiline-efl.cpp
+++ b/src/candidate/efl/candidate-multiline-efl.cpp
@@ -33,8 +33,8 @@ using namespace std;
 #define CANDIDATE_WINDOW_HEIGHT       84
 #define CANDIDATE_ITEMS_NUM           8
 #define CANDIDATE_ITEM_BLANK          30
-#define CANDIDATE_SEPERATE_WIDTH      2
-#define CANDIDATE_SEPERATE_HEIGHT     52
+#define CANDIDATE_SEPARATE_WIDTH      2
+#define CANDIDATE_SEPARATE_HEIGHT     52
 #define CANDIDATE_HORIZON_LINE_HEIGHT 2
 
 #ifdef _TV
@@ -125,7 +125,7 @@ EflMultiLineCandidate::item_pressed(std::string str)
 void
 EflMultiLineCandidate::item_released(Evas_Object *item)
 {
-    // notify listners the event happend
+    // notify listeners the event happend
     MultiEventDesc desc;
     desc.type = MultiEventDesc::CANDIDATE_ITEM_MOUSE_UP;
     notify_listeners(desc);
@@ -134,7 +134,7 @@ EflMultiLineCandidate::item_released(Evas_Object *item)
 void
 EflMultiLineCandidate::item_moved(Evas_Object *item)
 {
-    // notify listners the event happend
+    // notify listeners the event happend
     MultiEventDesc desc;
     desc.type = MultiEventDesc::CANDIDATE_ITEM_MOUSE_MOVE;
     notify_listeners(desc);
@@ -271,7 +271,7 @@ EflMultiLineCandidate::close_btn_clicked()
 }
 
 Evas_Object *
-EflMultiLineCandidate::get_candidate_seperate_line_vertical()
+EflMultiLineCandidate::get_candidate_separate_line_vertical()
 {
     int ret = -1;
 
@@ -284,13 +284,13 @@ EflMultiLineCandidate::get_candidate_seperate_line_vertical()
         return NULL;
     }
     evas_object_show(edje);
-    evas_object_size_hint_min_set(edje, CANDIDATE_SEPERATE_WIDTH, CANDIDATE_SEPERATE_HEIGHT*m_screenRatio);
+    evas_object_size_hint_min_set(edje, CANDIDATE_SEPARATE_WIDTH, CANDIDATE_SEPARATE_HEIGHT*m_screenRatio);
 
     return edje;
 }
 
 Evas_Object *
-EflMultiLineCandidate::get_candidate_seperate_line_horizon()
+EflMultiLineCandidate::get_candidate_separate_line_horizon()
 {
     int ret;
     Evas_Object * edje = NULL;
@@ -603,11 +603,11 @@ EflMultiLineCandidate::update(const vector<string> &vec_str)
             int y_start = 0;
             if (0 != cur_item_sum)
             {
-                Evas_Object *vertical_seperate = get_candidate_seperate_line_vertical();
-                y_start = (CANDIDATE_WINDOW_HEIGHT - CANDIDATE_SEPERATE_HEIGHT)*m_screenRatio / 2;
+                Evas_Object *vertical_seperate = get_candidate_separate_line_vertical();
+                y_start = (CANDIDATE_WINDOW_HEIGHT - CANDIDATE_SEPARATE_HEIGHT)*m_screenRatio / 2;
                 elm_table_pack(m_candidateTable, vertical_seperate, cur_item_sum, y_start,
-                               CANDIDATE_SEPERATE_WIDTH, CANDIDATE_SEPERATE_HEIGHT*m_screenRatio);
-                cur_item_sum += CANDIDATE_SEPERATE_WIDTH;
+                               CANDIDATE_SEPARATE_WIDTH, CANDIDATE_SEPARATE_HEIGHT*m_screenRatio);
+                cur_item_sum += CANDIDATE_SEPARATE_WIDTH;
             }
             Evas_Object *item = get_candidate_item(item_text_size);
             edje_object_part_text_set(item, "candidate", vec_str[i].c_str());
@@ -653,14 +653,14 @@ EflMultiLineCandidate::update(const vector<string> &vec_str)
             int y_start = 0;
             if (0 != cur_item_sum)
             {
-                Evas_Object *vertical_seperate = get_candidate_seperate_line_vertical();
-                y_start = (CANDIDATE_WINDOW_HEIGHT - CANDIDATE_SEPERATE_HEIGHT)*m_screenRatio / 2;
+                Evas_Object *vertical_seperate = get_candidate_separate_line_vertical();
+                y_start = (CANDIDATE_WINDOW_HEIGHT - CANDIDATE_SEPARATE_HEIGHT)*m_screenRatio / 2;
                 elm_table_pack(m_candidateMoreTable, vertical_seperate, cur_item_sum,
                         lineCount*CANDIDATE_WINDOW_HEIGHT*m_screenRatio+(lineCount+1)*CANDIDATE_HORIZON_LINE_HEIGHT+y_start,
-                        CANDIDATE_SEPERATE_WIDTH, CANDIDATE_SEPERATE_HEIGHT*m_screenRatio);
-                cur_item_sum += CANDIDATE_SEPERATE_WIDTH;
+                        CANDIDATE_SEPARATE_WIDTH, CANDIDATE_SEPARATE_HEIGHT*m_screenRatio);
+                cur_item_sum += CANDIDATE_SEPARATE_WIDTH;
             } else {
-                Evas_Object *horizon_seperate = get_candidate_seperate_line_horizon();
+                Evas_Object *horizon_seperate = get_candidate_separate_line_horizon();
                 y_start = lineCount*(CANDIDATE_WINDOW_HEIGHT*m_screenRatio+CANDIDATE_HORIZON_LINE_HEIGHT);
                 elm_table_pack(m_candidateMoreTable, horizon_seperate, cur_item_sum, y_start,
                         m_screenWidth, CANDIDATE_HORIZON_LINE_HEIGHT);

diff --git a/src/candidate/efl/candidate-multiline-efl.h b/src/candidate/efl/candidate-multiline-efl.h
index e1502a9..8340252 100644 (file)
--- a/src/candidate/efl/candidate-multiline-efl.h
+++ b/src/candidate/efl/candidate-multiline-efl.h
@@ -62,8 +62,8 @@ class EflMultiLineCandidate: public Candidate
         void register_access_object(Evas_Object* obj, std::string name, const Elm_Access_Action_Cb access_action = NULL, const void *data = NULL);
         Evas_Object *get_candidate_item(candidate_item_size item_text_size);
         candidate_item_size get_candidate_item_text_size(std::string srcStr);
-        Evas_Object * get_candidate_seperate_line_vertical();
-        Evas_Object * get_candidate_seperate_line_horizon();
+        Evas_Object * get_candidate_separate_line_vertical();
+        Evas_Object * get_candidate_separate_line_horizon();
 
         std::vector<std::string> cur_candidates;
         Evas_Object *m_window;