From: Munkyu Im <munkyu.im@samsung.com>
Date: Thu, 3 Sep 2015 11:57:48 +0000 (+0900)
Subject: extra: support multibyte string
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~40^2~156
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54ed0b3f4a2a31660c8a1f1496d7644f2723b9ec;p=sdk%2Femulator%2Fqemu.git

extra: support multibyte string

Change-Id: I4f91cf1cf30d64e8a5e3bc3addedfc58c5a301fd
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
---

diff --git a/tizen/src/emulator_options.c b/tizen/src/emulator_options.c
index 473bc669bc..a47fe09368 100644
--- a/tizen/src/emulator_options.c
+++ b/tizen/src/emulator_options.c
@@ -226,8 +226,7 @@ bool load_conf(const char * const conf)
 
     assert(!!conf);
     filename = g_strdup(conf);
-
-    file = fopen(filename, "r,css=UTF-8");
+    file = fopen(filename, "r");
     if (!file) {
         fprintf(stderr,
             "Profile configuration file [%s] is not found.\n", filename);
diff --git a/tizen/src/ui/menu/detailedinfodialog.cpp b/tizen/src/ui/menu/detailedinfodialog.cpp
index 9d0e56d162..930af41a88 100644
--- a/tizen/src/ui/menu/detailedinfodialog.cpp
+++ b/tizen/src/ui/menu/detailedinfodialog.cpp
@@ -127,7 +127,8 @@ QTableWidget *DetailedInfoDialog::createVmInfoTable()
     insertTableRow(vmInfo, QString(DETAILED_INFO_DPY_DENSITY),
         QString::number(get_display_pixel_density()));
 
-    QString sharingPath(get_host_directory_sharing_path());
+    QString sharingPath(QString::fromLocal8Bit(
+        get_host_directory_sharing_path()));
     insertTableRow(vmInfo, QString(DETAILED_INFO_HDS_PATH),
         (sharingPath.isEmpty()) ? QString(GENERIC_TEXT_NONE) : sharingPath);
 
@@ -139,25 +140,27 @@ QTableWidget *DetailedInfoDialog::createVmInfoTable()
         (is_gpu_accel_enabled()) ?
         QString(GENERIC_TEXT_ENABLED) : QString(GENERIC_TEXT_DISABLED));
 
-    QString drive_image_file(get_drive_image_file());
+    QString drive_image_file(
+        QString::fromLocal8Bit(get_drive_image_file()));
     if (drive_image_file.isEmpty() == false) {
         insertTableRow(vmInfo, QString(DETAILED_INFO_DRIVE_IMAGE_FILE),
             drive_image_file, drive_image_file);
     }
 
-    QString swap_image_file(get_swap_image_file());
+    QString swap_image_file(QString::fromLocal8Bit(get_swap_image_file()));
     if (swap_image_file.isEmpty() == false) {
         insertTableRow(vmInfo, QString(DETAILED_INFO_SWAP_IMAGE_FILE),
             swap_image_file, swap_image_file);
     }
 
-    QString log_redirect_file(get_log_redirect_file());
+    QString log_redirect_file(QString::fromLocal8Bit(get_log_redirect_file()));
     if (log_redirect_file.isEmpty() == false) {
         insertTableRow(vmInfo, QString(DETAILED_INFO_EMUL_LOG_FILE),
             log_redirect_file, log_redirect_file);
     }
 
-    QString kernel_log_redirect_file(get_kernel_log_redirect_file());
+    QString kernel_log_redirect_file(
+        QString::fromLocal8Bit(get_kernel_log_redirect_file()));
     if (kernel_log_redirect_file.isEmpty() == false) {
         insertTableRow(vmInfo, QString(DETAILED_INFO_KERNEL_LOG_FILE),
             kernel_log_redirect_file, kernel_log_redirect_file);
diff --git a/tizen/src/ui/qt5_supplement.cpp b/tizen/src/ui/qt5_supplement.cpp
index 7c1a2a3a71..48bf3e4068 100644
--- a/tizen/src/ui/qt5_supplement.cpp
+++ b/tizen/src/ui/qt5_supplement.cpp
@@ -114,13 +114,13 @@ void qt5_gui_init(void)
     uiInfo->resolution.setHeight(get_display_resolution_height());
     uiInfo->basePort = get_emul_vm_base_port();
 
-    uiInfo->vmDataPath = QDir(get_vm_data_path()).canonicalPath();
+    uiInfo->vmDataPath = QDir(QString::fromLocal8Bit(get_vm_data_path())).canonicalPath();
     if (uiInfo->vmDataPath.endsWith(QDir::separator()) == false) {
         uiInfo->vmDataPath += QDir::separator();
     }
     qDebug() << "VM path:" <<  uiInfo->vmDataPath;
 
-    uiInfo->skinPath = QDir(get_emul_skin_path()).canonicalPath();
+    uiInfo->skinPath = QDir(QString::fromLocal8Bit(get_emul_skin_path())).canonicalPath();
     if (uiInfo->skinPath.endsWith(QDir::separator()) == false) {
         uiInfo->skinPath += QDir::separator();
     }