Remove build warning 81/83481/2
authorsungwook79.park <sungwook79.park@samsung.com>
Thu, 11 Aug 2016 07:28:01 +0000 (16:28 +0900)
committersungwook79.park <sungwook79.park@samsung.com>
Thu, 11 Aug 2016 07:30:49 +0000 (16:30 +0900)
Change-Id: I5b0fa807916405bb9161343d6c165498be6e418f
Signed-off-by: sungwook79.park <sungwook79.park@samsung.com>
src/MicEffector.cpp
src/WInputSttMicEffect.cpp
src/w-input-selector.cpp
src/w-input-stt-tos.cpp
src/w-input-stt-voice.cpp

index f12d1ff..ab4de04 100755 (executable)
@@ -69,10 +69,10 @@ MicEffector::MicEffector(Evas_Object *canvas, Evas_Object *layout, IMicEffector&
        : drawcount(0)
        , forcestop(false)
        , started(false)
+       , fake(false)
        , timer(NULL)
        , layout(layout)
        , ieffect(effect)
-       , fake(false)
 {
 //     path = ea_vector_path_create();
 //     paint = ea_vector_paint_create();
@@ -135,27 +135,27 @@ void MicEffector::DrawDummyFrame()
  */
 void MicEffector::DrawQue(int idx, bool is_start)
 {
-       float margin = spectrum_posx;
-       float posx = 0.0;
+//     float margin = spectrum_posx;
+//     float posx = 0.0;
 
        double speed = cubic_easy_out(idx + 1.0, 0.0, 23.0, 23);
 
        unsigned int start = start_stop_anim_count - (int) speed;
        unsigned int end = start_stop_anim_count + (int) speed;
 
-       double opacity;
+//     double opacity;
 
        if (is_start) {
-               opacity = cubic_easy_out(idx, 0.0, 1.0, 26.0);
+//             opacity = cubic_easy_out(idx, 0.0, 1.0, 26.0);
        } else {
-               opacity = cubic_easy_out(idx, 0, 1.0, 26.0);
+//             opacity = cubic_easy_out(idx, 0, 1.0, 26.0);
        }
 
 //     ea_vector_path_reset(path);
 
        for(unsigned int i = start; i < end; i++)
        {
-               posx = margin + (i * 5);
+//             posx = margin + (i * 5);
 
 //             ea_vector_path_move_to(path, posx, 37.0f);
 //             ea_vector_path_line_to(path, posx, 38.0f);
@@ -223,17 +223,17 @@ float MicEffector::GetAmplifyValue(unsigned int idx)
  */
 void MicEffector::DrawWave(unsigned int idx, int amount, int prev_amount, double opacity, bool is_lastcmd)
 {
-       float ratio = GetAmplifyValue(idx);
+//     float ratio = GetAmplifyValue(idx);
 
-       float am = ((float) amount) * ratio;
-       float pam = ((float) prev_amount) * ratio;
-       float cnt = (float) drawcount;
+//     float am = ((float) amount) * ratio;
+//     float pam = ((float) prev_amount) * ratio;
+//     float cnt = (float) drawcount;
 
        float posx = spectrum_posx;
 
-       float height = pam > am?
-               pam - cubic_easy_in_out(cnt + 1.0, am, pam, 7):
-               cubic_easy_in_out(cnt + 1.0, pam, am, 7);
+//     float height = pam > am?
+//             pam - cubic_easy_in_out(cnt + 1.0, am, pam, 7):
+//             cubic_easy_in_out(cnt + 1.0, pam, am, 7);
 
        posx += idx * 5;
 
index cb128ee..5454f27 100755 (executable)
@@ -38,11 +38,11 @@ using namespace is::ui;
 
 
 WInputSttMicEffect::WInputSttMicEffect()
-       : processing_effect_timer(NULL)
-       , progressbar(NULL)
+       : square_sum(0)
        , count(5)
-       , square_sum(0)
-       , handle(NULL) {
+       , handle(NULL)
+       , processing_effect_timer(NULL)
+       , progressbar(NULL) {
 }
 
 WInputSttMicEffect::~WInputSttMicEffect() {
index f08b774..542d2bb 100755 (executable)
@@ -164,26 +164,6 @@ static void _keyboard_clicked_cb(void *data, Evas_Object * obj, void *event_info
        input_keyboard_launch(ad->win_main, data);
 }
 
-static void __bt_connection_result_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *user_data)
-{
-       char *val = NULL;
-
-       if (reply == NULL) {
-               PRINTFUNC(DLOG_ERROR, "service_h is NULL");
-               return;
-       }
-
-       app_control_get_extra_data(reply, "__BT_CONNECTION__", &val);
-       if (val) {
-               if ( strcmp(val, "Connected") == 0 ) {
-                       PRINTFUNC(DLOG_ERROR, "BT Connected");
-               } else {
-                       PRINTFUNC(DLOG_ERROR, "BT Not Connected");
-               }
-               free(val);
-       }
-}
-
 static Evas_Object * __ise_gl_2button_content_get(void *data, Evas_Object *obj, const char *part)
 {
        char *first_input_type = *(g_input_type_data.input_type_array + 0);
@@ -273,7 +253,7 @@ static Evas_Object * __ise_gl_3button_content_get(void *data, Evas_Object *obj,
                elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE);
                string path = get_resource_path();
                if (!strcmp(part, "elm.icon.1")) {
-                       elm_object_style_set(btn, "anchor");
+                       elm_object_style_set(btn, "anchor");
                        string path_ic = path + "images/w_mode_stt_ic.png";
                        elm_image_file_set(ic, path_ic.c_str(), NULL);
                        elm_object_content_set(btn, ic);
index 3ee5215..906b586 100755 (executable)
@@ -383,11 +383,13 @@ static void _language_changed_cb(void *_data, Evas_Object *_obj, void *_event_in
     char body_str[40000];
 
     switch (index) {
-        case 1:
-            snprintf(body_str, sizeof(body_str), gettext("LDS_IME_BODY_INFORMATION_PROVISION_AGREEMENT_P1_LEGALPHRASE_WC1"), " <a href=\"file://local-nuance-tos\">", "</a>", "<a href=\"http://www.vlingo.com/wap/samsung-asr-privacy-addendum\">", "</a>");
+        case 1: {
+            const char *format = gettext("LDS_IME_BODY_INFORMATION_PROVISION_AGREEMENT_P1_LEGALPHRASE_WC1");
+            snprintf(body_str, sizeof(body_str), format, " <a href=\"file://local-nuance-tos\">", "</a>", "<a href=\"http://www.vlingo.com/wap/samsung-asr-privacy-addendum\">", "</a>");
             terms = tagging(std::string(body_str));
             terms = replaceAll(terms , std::string("\n"), std::string("<br>"));
             elm_entry_entry_set(elm_layout_content_get(_obj, "elm.swallow.content"), terms.c_str());
+            }
         break;
         case 2:
             terms = tagging(std::string(gettext(TOS_BODY2))+ std::string("<br>") + std::string(gettext(TOS_BODY3)));
@@ -496,16 +498,12 @@ static void _ise_voice_tos_anchor_clicked(void *data, Evas_Object *obj, void *ev
 
     if (!strncmp(ainfo->name, "\"http://", 8)) {
         show_terms(data, obj, ainfo);
-
     } else if (!strncmp(ainfo->name, "\"file://", 8)) {
-/*
         Evas_Object *senconds_layout = create_tos_second_page(ad);
-
         Elm_Object_Item *nit = NULL;
         nit = elm_naviframe_item_push(ad->naviframe, NULL, NULL, NULL, senconds_layout, "empty");
         elm_naviframe_item_pop_cb_set(nit, _naviframe_pop_cb2, NULL);
         elm_naviframe_item_title_enabled_set(nit, EINA_FALSE, EINA_FALSE);
-*/
     }
 }
 
index 17abe66..642224b 100755 (executable)
@@ -727,7 +727,9 @@ void show_error_message(VoiceData *vd, stt_error_e reason)
 
                if (ancs_connected) {
                        char text[512];
-                       snprintf(text, sizeof(text), _(SK_NETWORK_ERROR_FOR_IOS), _(SK_SAMSUNG_GEAR));
+                       const char *format1 = _(SK_NETWORK_ERROR_FOR_IOS);
+                       const char *format2 = _(SK_SAMSUNG_GEAR);
+                       snprintf(text, sizeof(text), format1, format2);
 
                        show_popup_toast((const char*)text, false);
                } else {