[Win32][UI][Qt] Fix character encoding of recent files.

diff --git a/source/src/qt/common/qt_main.h b/source/src/qt/common/qt_main.h
index 5828108..155d8bc 100644 (file)
--- a/source/src/qt/common/qt_main.h
+++ b/source/src/qt/common/qt_main.h
@@ -61,7 +61,7 @@ extern const int screen_mode_height[];
        strcpy(recent[0], path); \
        list.clear(); \
        for(int i = 0; i < MAX_HISTORY; i++) { \
-               QString _tmps = QString::fromUtf8(recent[i]); \
+               QString _tmps = QString::fromLocal8Bit(recent[i]); \
                list << _tmps; \
        } \
 }
@@ -71,7 +71,7 @@ extern const int screen_mode_height[];
 #define SETUP_HISTORY(recent, list) { \
        list.clear(); \
        for(int i = 0; i < MAX_HISTORY; i++) { \
-               QString _tmps = QString::fromUtf8(recent[i]); \
+               QString _tmps = QString::fromLocal8Bit(recent[i]); \
                list << _tmps; \
        } \
 }

diff --git a/source/src/qt/gui/menu_metaclass.cpp b/source/src/qt/gui/menu_metaclass.cpp
index 46784a4..fc99505 100644 (file)
--- a/source/src/qt/gui/menu_metaclass.cpp
+++ b/source/src/qt/gui/menu_metaclass.cpp
@@ -61,7 +61,7 @@ void Menu_MetaClass::do_set_write_protect(bool f)
 
 void Menu_MetaClass::do_set_initialize_directory(const char *s)
 {
-       initial_dir = QString::fromUtf8(s);
+       initial_dir = QString::fromLocal8Bit(s);
 }
 
 void Menu_MetaClass::do_open_media(int drv, QString name) {

diff --git a/source/src/qt/gui/util_binary.cpp b/source/src/qt/gui/util_binary.cpp
index 32750cf..931a30d 100644 (file)
--- a/source/src/qt/gui/util_binary.cpp
+++ b/source/src/qt/gui/util_binary.cpp
@@ -49,10 +49,10 @@ int Ui_MainWindow::set_recent_binary_load(int drv, int num)
        
        if((num < 0) || (num >= MAX_HISTORY)) return -1;
        
-       s_path = QString::fromUtf8(config.recent_binary_path[drv][num]);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       s_path = QString::fromLocal8Bit(config.recent_binary_path[drv][num]);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_binary_path[drv], listBINs[drv]);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
        
        get_parent_dir(path_shadow);
        strcpy(config.initial_binary_dir, path_shadow);
@@ -72,10 +72,10 @@ int Ui_MainWindow::set_recent_binary_save(int drv, int num)
        
        if((num < 0) || (num >= MAX_HISTORY)) return -1;
        
-       s_path = QString::fromUtf8(config.recent_binary_path[drv][num]);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       s_path = QString::fromLocal8Bit(config.recent_binary_path[drv][num]);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_binary_path[drv], listBINs[drv]);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
        
        get_parent_dir(path_shadow);
        strcpy(config.initial_binary_dir, path_shadow);
@@ -94,7 +94,7 @@ void Ui_MainWindow::_open_binary_load(int drv, const QString fname)
        int i;
        if(fname.length() <= 0) return;
        drv = drv & 7;
-       strncpy(path_shadow, fname.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, fname.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_binary_path[drv], listBINs[drv]);
        get_parent_dir(path_shadow);
        strcpy(config.initial_binary_dir, path_shadow);
@@ -111,7 +111,7 @@ void Ui_MainWindow::_open_binary_save(int drv, const QString fname)
        int i;
        if(fname.length() <= 0) return;
        drv = drv & 7;
-       strncpy(path_shadow, fname.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, fname.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_binary_path[drv], listBINs[drv]);
        get_parent_dir(path_shadow);
        strcpy(config.initial_binary_dir, path_shadow);

diff --git a/source/src/qt/gui/util_cart.cpp b/source/src/qt/gui/util_cart.cpp
index 44811ed..b0e2bb9 100644 (file)
--- a/source/src/qt/gui/util_cart.cpp
+++ b/source/src/qt/gui/util_cart.cpp
@@ -34,7 +34,7 @@ void Ui_MainWindow::_open_cart(int drv, const QString fname)
        int i;
 #ifdef USE_CART1
        if(fname.length() <= 0) return;
-       strncpy(path_shadow, fname.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, fname.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_cart_path[drv], listCARTs[drv]);
        get_parent_dir(path_shadow);
        strcpy(config.initial_cart_dir, path_shadow);
@@ -61,10 +61,10 @@ void Ui_MainWindow::set_recent_cart(int drv, int num)
     
        if((num < 0) || (num >= MAX_HISTORY)) return;
  
-       s_path = QString::fromUtf8(config.recent_cart_path[drv][num]);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       s_path = QString::fromLocal8Bit(config.recent_cart_path[drv][num]);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_cart_path[drv], listCARTs[drv]);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
    
        get_parent_dir(path_shadow);
        strcpy(config.initial_cart_dir, path_shadow);

diff --git a/source/src/qt/gui/util_cmt.cpp b/source/src/qt/gui/util_cmt.cpp
index f20a089..337c7c0 100644 (file)
--- a/source/src/qt/gui/util_cmt.cpp
+++ b/source/src/qt/gui/util_cmt.cpp
@@ -102,13 +102,13 @@ int Ui_MainWindow::set_recent_cmt(int drv, int num)
        int i;
        if((num < 0) || (num >= MAX_HISTORY)) return -1;
     
-       s_path = QString::fromUtf8(config.recent_tape_path[num]);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       s_path = QString::fromLocal8Bit(config.recent_tape_path[num]);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_tape_path, listCMT);
    
        get_parent_dir(path_shadow);
        strcpy(config.initial_tape_dir, path_shadow);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
        AGAR_DebugLog(AGAR_LOG_DEBUG, "Tape: Open READ");
        
        emit sig_close_tape();
@@ -226,12 +226,12 @@ void Ui_MainWindow::do_open_read_cmt(int dummy, QString path)
        int i;
 
        if(path.length() <= 0) return;
-       strncpy(path_shadow, path.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, path.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_tape_path, listCMT);
        get_parent_dir(path_shadow);
        strcpy(config.initial_tape_dir, path_shadow);
        // Copy filename again.
-       strncpy(path_shadow, path.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, path.toLocal8Bit().constData(), PATH_MAX);
 
        emit sig_close_tape();
        AGAR_DebugLog(AGAR_LOG_DEBUG, "Tape: Open READ : filename = %s", path_shadow);
@@ -246,12 +246,12 @@ void Ui_MainWindow::do_open_write_cmt(QString path)
        int i;
 
        if(path.length() <= 0) return;
-       strncpy(path_shadow, path.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, path.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_tape_path, listCMT);
        get_parent_dir(path_shadow);
        strcpy(config.initial_tape_dir, path_shadow);
        // Copy filename again.
-       strncpy(path_shadow, path.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, path.toLocal8Bit().constData(), PATH_MAX);
 
        emit sig_close_tape();
        if(menu_CMT->getWriteProtect() != false) {

diff --git a/source/src/qt/gui/util_fd.cpp b/source/src/qt/gui/util_fd.cpp
index e14ecb0..add48ec 100644 (file)
--- a/source/src/qt/gui/util_fd.cpp
+++ b/source/src/qt/gui/util_fd.cpp
@@ -122,14 +122,14 @@ int Ui_MainWindow::set_recent_disk(int drv, int num)
        char path_shadow[PATH_MAX];
        int i;
        if((num < 0) || (num >= MAX_HISTORY)) return -1;
-       s_path = QString::fromUtf8(config.recent_floppy_disk_path[drv][num]);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       s_path = QString::fromLocal8Bit(config.recent_floppy_disk_path[drv][num]);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_floppy_disk_path[drv], listFDs[drv]);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
    
        get_parent_dir(path_shadow);
        strcpy(config.initial_floppy_disk_dir, path_shadow);
-       strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
 
        if(emu) {
                emit sig_close_disk(drv);
@@ -143,7 +143,7 @@ int Ui_MainWindow::set_recent_disk(int drv, int num)
                        menu_fds[drv]->do_clear_inner_media();
                }
 # ifdef USE_FD2
-               strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
+               strncpy(path_shadow, s_path.toLocal8Bit().constData(), PATH_MAX);
                if(check_file_extension(path_shadow, ".d88") || check_file_extension(path_shadow, ".d77")) {
                        if(((drv & 1) == 0) && (drv + 1 < MAX_FD) && (1 < emu->d88_file[drv].bank_num)) {
                                int drv2 = drv + 1;
@@ -169,12 +169,12 @@ void Ui_MainWindow::_open_disk(int drv, const QString fname)
 #ifdef USE_FD1
        if(fname.length() <= 0) return;
        drv = drv & 7;
-       strncpy(path_shadow, fname.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, fname.toLocal8Bit().constData(), PATH_MAX);
        UPDATE_HISTORY(path_shadow, config.recent_floppy_disk_path[drv], listFDs[drv]);
        get_parent_dir(path_shadow);
        strcpy(config.initial_floppy_disk_dir, path_shadow);
        // Update List
-       strncpy(path_shadow, fname.toUtf8().constData(), PATH_MAX);
+       strncpy(path_shadow, fname.toLocal8Bit().constData(), PATH_MAX);
        if(emu) {
                emit sig_close_disk(drv);
                //emu->LockVM();
@@ -194,7 +194,7 @@ void Ui_MainWindow::_open_disk(int drv, const QString fname)
                        int drv2 = drv + 1;
                        emit sig_close_disk(drv2);
                        //emu->LockVM();
-                       strncpy(path_shadow, fname.toUtf8().constData(), PATH_MAX);
+                       strncpy(path_shadow, fname.toLocal8Bit().constData(), PATH_MAX);
                        emit sig_open_disk(drv2, fname, 1);
                        menu_fds[drv2]->do_update_histories(listFDs[drv2]);
                        menu_fds[drv2]->do_set_initialize_directory(config.initial_floppy_disk_dir);

diff --git a/source/src/qt/gui/util_qd.cpp b/source/src/qt/gui/util_qd.cpp
index 992b333..5e9675e 100644 (file)
--- a/source/src/qt/gui/util_qd.cpp
+++ b/source/src/qt/gui/util_qd.cpp
@@ -73,7 +73,7 @@ void Ui_MainWindow::open_quick_disk_dialog(int drv)
                char app[_MAX_PATH];
                QDir df;
                dirname = df.currentPath();
-               strncpy(app, dirname.toUtf8().constData(), _MAX_PATH);
+               strncpy(app, dirname.toLocal8Bit().constData(), _MAX_PATH);
                dirname = get_parent_dir(app);
        }
        QStringList filter;
@@ -108,11 +108,11 @@ int Ui_MainWindow::set_recent_quick_disk(int drv, int num)
        char path_shadow[_MAX_PATH];
        int i;
        if((num < 0) || (num >= MAX_HISTORY)) return -1;
-       s_path = QString::fromUtf8(config.recent_quick_disk_path[drv][num]);
-       strncpy(path_shadow, s_path.toUtf8().constData(), _MAX_PATH);
+       s_path = QString::fromLocal8Bit(config.recent_quick_disk_path[drv][num]);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), _MAX_PATH);
        UPDATE_HISTORY(path_shadow, config.recent_quick_disk_path[drv], listQDs[drv]);
     
-       strncpy(path_shadow, s_path.toUtf8().constData(), _MAX_PATH);
+       strncpy(path_shadow, s_path.toLocal8Bit().constData(), _MAX_PATH);
        get_parent_dir(path_shadow);
        strncpy(config.initial_quick_disk_dir, path_shadow, _MAX_PATH);
        
@@ -136,11 +136,11 @@ void Ui_MainWindow::_open_quick_disk(int drv, const QString fname)
        int i;
 #ifdef USE_QD1
        if(fname.length() <= 0) return;
-       strncpy(path_shadow, s_name.toUtf8().constData(), _MAX_PATH);
+       strncpy(path_shadow, s_name.toLocal8Bit().constData(), _MAX_PATH);
 
        UPDATE_HISTORY(path_shadow, config.recent_quick_disk_path[drv], listQDs[drv]);
        
-       strncpy(path_shadow, s_name.toUtf8().constData(), _MAX_PATH);
+       strncpy(path_shadow, s_name.toLocal8Bit().constData(), _MAX_PATH);
        get_parent_dir(path_shadow);
        strncpy(config.initial_quick_disk_dir, path_shadow, _MAX_PATH);