Fix coding style

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

diff --git a/src/client_request.cpp b/src/client_request.cpp
index 8570e1a..8476442 100755 (executable)
--- a/src/client_request.cpp
+++ b/src/client_request.cpp
@@ -38,7 +38,6 @@ smr::client_request::client_request(int type, const char* client, int req_id,
 
 smr::client_request::~client_request()
 {
-
 }
 
 const char* smr::client_request::get_cookie()

diff --git a/src/language_engine_callback.cpp b/src/language_engine_callback.cpp
index 839d78b..5c43cf3 100644 (file)
--- a/src/language_engine_callback.cpp
+++ b/src/language_engine_callback.cpp
@@ -17,10 +17,8 @@
 #include "language_engine_callback.h"
 
 smr::language_engine_callback::language_engine_callback() {
-
 }
 
 smr::language_engine_callback::~language_engine_callback() {
-
 }
 

diff --git a/src/language_engine_mgr.cpp b/src/language_engine_mgr.cpp
index 1a2a5c4..a73a51b 100644 (file)
--- a/src/language_engine_mgr.cpp
+++ b/src/language_engine_mgr.cpp
@@ -125,7 +125,6 @@ void Sophie::language_engine_mgr::on_added_language_engine(const char* type,        con
                package_manager_event_state_e event_state, int progress, package_manager_error_e error, void* user_data) {
        string package_base_name = language_engine_mgr::get_instance()._engine_package_base_name;
        if (event_state == PACKAGE_MANAGER_EVENT_STATE_COMPLETED) {
-
                if (strncmp(package, package_base_name.c_str(), strlen(package_base_name.c_str())) == 0) {
                        language_engine_mgr::get_instance()._callback->on_added_language_engine();
                }
@@ -133,7 +132,6 @@ void Sophie::language_engine_mgr::on_added_language_engine(const char* type,        con
 }
 
 bool Sophie::language_engine_mgr::open(string& language_code) {
-
        if (is_opened(language_code)) {
                _I("%s engine is already opened", language_code.c_str());
                return true;
@@ -145,7 +143,6 @@ bool Sophie::language_engine_mgr::open(string& language_code) {
        string resource_path;
 
        if (find_engine(language_code, selected_language_code, library_path, resource_path)) {
-
                shared_ptr<smart_reply_dl_wrapper> wrapper;
                        wrapper.reset(new smart_reply_dl_wrapper());
                if (is_engine_resource_installed(resource_path)) {
@@ -240,7 +237,7 @@ bool Sophie::language_engine_mgr::get_engine_version(const string& res_path, dou
        string::size_type sz;
        while (NULL != (dp = readdir(dirp))) {
                _I("[get_extended_engine_version] file name : %s", dp->d_name);
-               if (strncmp(dp->d_name, ".", 1)!=0 && strncmp(dp->d_name, "..", 2)!=0) {
+               if (strncmp(dp->d_name, ".", 1) != 0 && strncmp(dp->d_name, "..", 2) != 0) {
                        version = stod(string(dp->d_name), &sz);
                        _I("[get_extended_engine_version] final version : %f", version);
                        closedir(dirp);
@@ -254,7 +251,6 @@ bool Sophie::language_engine_mgr::get_engine_version(const string& res_path, dou
 bool language_engine_mgr::find_similar_engine(const string& language_code,
                string& selected_language_code, string& library_path,
                string& resource_path) const {
-
        string extended_lib_path, extended_res_path;
        get_extended_path(language_code, extended_lib_path, extended_res_path);
 
@@ -314,7 +310,6 @@ bool language_engine_mgr::find_similar_engine(const string& language_code,
 bool Sophie::language_engine_mgr::find_engine(const string& language_code,
                string& selected_language_code, string& library_path,
                string& resource_path) const {
-
        string extended_lib_path, extended_res_path;
        get_extended_path(language_code, extended_lib_path, extended_res_path);
 
@@ -372,8 +367,7 @@ shared_ptr<smart_reply_dl_wrapper> Sophie::language_engine_mgr::get_engine(strin
                if (foundEngine != _lang_engine.end()) {
                        return _lang_engine[language_code];
                }
-       }
-       else {
+       } else {
                if (open(language_code)) {
                        _I("[getLang] %s engine has opened successfully!", language_code.c_str());
                        auto foundEngine = _lang_engine.find(language_code);

diff --git a/src/request_callback.cpp b/src/request_callback.cpp
index b0bf3d1..d075560 100644 (file)
--- a/src/request_callback.cpp
+++ b/src/request_callback.cpp
@@ -17,10 +17,8 @@
 #include "request_callback.h"
 
 smr::request_callback::request_callback() {
-
 }
 
 smr::request_callback::~request_callback() {
-
 }
 

diff --git a/src/request_mgr.cpp b/src/request_mgr.cpp
index 6da6d0b..822103b 100644 (file)
--- a/src/request_mgr.cpp
+++ b/src/request_mgr.cpp
@@ -48,8 +48,8 @@ static const gchar introspection_xml[] =
        "       </interface>"
        "</node>";
 
-const vector<pair<string, int>> emoticons = { {"ㅜㅜ", 0x1f622},{"orz", 0x1f622},{"ㄷㄷㄷ", 0x1f631},
-               {"ㅋㅋㅋ", 0x1f601},{"^^", 0x1f60a},{"♡", 0x1f60d},{"ㅎㄷㄷ", 0x1f632}, { "ㅡㅡ", 0x1f625} };
+const vector<pair<string, int>> emoticons = { {"ㅜㅜ", 0x1f622}, {"orz", 0x1f622}, {"ㄷㄷㄷ", 0x1f631},
+               {"ㅋㅋㅋ", 0x1f601}, {"^^", 0x1f60a}, {"♡", 0x1f60d}, {"ㅎㄷㄷ", 0x1f632}, { "ㅡㅡ", 0x1f625} };
 
 static const char* req_type_to_str(int req_type)
 {
@@ -171,7 +171,6 @@ smr::request_mgr::request_mgr() {
 }
 
 smr::request_mgr::~request_mgr() {
-
 }
 
 bool smr::request_mgr::start(request_callback* callback) {
@@ -262,20 +261,20 @@ void smr::request_mgr::string_to_unicode(vector<string>& replies) {
 
 bool utf8_check_is_valid(const string& string)
 {
-    int c,i,ix,n,j;
+    int c, i, ix, n, j;
     for (i=0, ix=string.length(); i < ix; i++)
     {
         c = (unsigned char) string[i];
         //if (c==0x09 || c==0x0a || c==0x0d || (0x20 <= c && c <= 0x7e) ) n = 0; // is_printable_ascii
         if (0x00 <= c && c <= 0x7f) n=0; // 0bbbbbbb
         else if ((c & 0xE0) == 0xC0) n=1; // 110bbbbb
-        else if ( c==0xed && i<(ix-1) && ((unsigned char)string[i+1] & 0xa0)==0xa0) return false; //U+d800 to U+dfff
+        else if ( c == 0xed && i < (ix-1) && ((unsigned char)string[i+1] & 0xa0) == 0xa0) return false; //U+d800 to U+dfff
         else if ((c & 0xF0) == 0xE0) n=2; // 1110bbbb
         else if ((c & 0xF8) == 0xF0) n=3; // 11110bbb
         //else if (($c & 0xFC) == 0xF8) n=4; // 111110bb //byte 5, unnecessary in 4 byte UTF-8
         //else if (($c & 0xFE) == 0xFC) n=5; // 1111110b //byte 6, unnecessary in 4 byte UTF-8
         else return false;
-        for (j=0; j<n && i<ix; j++) { // n bytes matching 10bbbbbb follow ?
+        for (j=0; j < n && i < ix; j++) { // n bytes matching 10bbbbbb follow ?
             if ((++i == ix) || (( (unsigned char)string[i] & 0xC0) != 0x80))
                 return false;
         }
@@ -346,7 +345,7 @@ void smr::request_mgr::get_result_str(const vector<string>& replies, smr::json&
        string result;
        for (auto it = replies.begin(); it != replies.end(); ++it) {
                _SI("Smart Reply :%s ", (char*) ((*it).c_str()));
-               if ( (strncmp((*it).c_str(), "select", 6)==0) || (strncmp((*it).c_str(), "Select", 6)==0) ) {
+               if ( (strncmp((*it).c_str(), "select", 6) == 0) || (strncmp((*it).c_str(), "Select", 6) == 0) ) {
                        continue;
                }
                result.append(*it).append("|");

diff --git a/src/smart_reply_daemon.cpp b/src/smart_reply_daemon.cpp
index bae0761..5b59296 100644 (file)
--- a/src/smart_reply_daemon.cpp
+++ b/src/smart_reply_daemon.cpp
@@ -37,7 +37,6 @@ smr::smart_reply_daemon::smart_reply_daemon() : _engine_mgr(Sophie::language_eng
 }
 
 smr::smart_reply_daemon::~smart_reply_daemon() {
-
 }
 
 bool smr::smart_reply_daemon::start() {
@@ -144,8 +143,8 @@ int smr::smart_reply_daemon::on_request_notify_reply(string app_id, string sende
                return SMARTREPLY_ERROR_NOT_SUPPORTED_LANGUAGE;
        }
 }
-int smr::smart_reply_daemon::on_request_prepare_engine() {
 
+int smr::smart_reply_daemon::on_request_prepare_engine() {
        string current_lang = _language_mgr.get_current_language();
        _I("[Prepare engine]Current Language : %s", current_lang.c_str());
 

diff --git a/src/smart_reply_dl_wrapper.cpp b/src/smart_reply_dl_wrapper.cpp
index e952445..de8faa4 100644 (file)
--- a/src/smart_reply_dl_wrapper.cpp
+++ b/src/smart_reply_dl_wrapper.cpp
@@ -27,7 +27,6 @@ using namespace std;
 using namespace Sophie;
 
 smart_reply_dl_wrapper::smart_reply_dl_wrapper() : _handle(0), _api(0), _engineOpened(false) {
-
 }
 
 smart_reply_dl_wrapper::~smart_reply_dl_wrapper() {

diff --git a/src/system_language_callback.cpp b/src/system_language_callback.cpp
index eeca251..3a040f8 100644 (file)
--- a/src/system_language_callback.cpp
+++ b/src/system_language_callback.cpp
@@ -17,10 +17,8 @@
 #include "system_language_callback.h"
 
 smr::system_language_callback::system_language_callback() {
-
 }
 
 smr::system_language_callback::~system_language_callback() {
-
 }
 

diff --git a/src/system_language_mgr.cpp b/src/system_language_mgr.cpp
index 2a97910..42e4a80 100644 (file)
--- a/src/system_language_mgr.cpp
+++ b/src/system_language_mgr.cpp
@@ -30,7 +30,6 @@ smr::system_language_mgr::~system_language_mgr() {
 }
 
 void smr::system_language_mgr::updateCurrentLanguage() {
-
        char * locale_str = NULL;
        int ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &locale_str);
        if (SYSTEM_SETTINGS_ERROR_NONE == ret) {