[UI][Qt] Use Qt5. 'Cos Qt4 is obsoleted now.

diff --git a/source/build-cmake/buildvars.dat b/source/build-cmake/buildvars.dat
index 45cf8f6..617383b 100644 (file)
--- a/source/build-cmake/buildvars.dat
+++ b/source/build-cmake/buildvars.dat
@@ -4,7 +4,7 @@ CCMAKE_CXX=g++-5
 
 MAKEFLAGS_CXX="-g -O3 -ftree-vectorize -flto -DNDEBUG" 
 MAKEFLAGS_CC="-g -O3 -ftree-vectorize  -flto -DNDEBUG"
-MAKEFLAGS_GENERAL="-j12"
+MAKEFLAGS_GENERAL="-j6"
 
 BUILD_TYPE="Relwithdebinfo"
 #CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS='${CMAKE_EXE_LINKER_FLAGS} -flto -O3 -ftree-vectorize -g'"

diff --git a/source/build-cmake/cmake/config_commonsource.cmake b/source/build-cmake/cmake/config_commonsource.cmake
index 30498b4..3a151d8 100644 (file)
--- a/source/build-cmake/cmake/config_commonsource.cmake
+++ b/source/build-cmake/cmake/config_commonsource.cmake
@@ -8,12 +8,32 @@ include(CheckFunctionExists)
 SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
 SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
 
+#if(USE_SOCKET)
+#  FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtOpenGL QtNetwork)
+#else()
+#  FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtOpenGL)
+#endif()
+#SET(USE_QT_5 OFF)
+#INCLUDE(${QT_USE_FILE})
+
+  FIND_PACKAGE(Qt5Widgets REQUIRED)
+  FIND_PACKAGE(Qt5Core REQUIRED)
+  FIND_PACKAGE(Qt5Gui REQUIRED)
+  FIND_PACKAGE(Qt5OpenGL REQUIRED)
+  include_directories(${Qt5Widgets_INCLUDE_DIRS})
+  include_directories(${Qt5Core_INCLUDE_DIRS})
+  include_directories(${Qt5Gui_INCLUDE_DIRS})
+  include_directories(${Qt5OpenGL_INCLUDE_DIRS})
 if(USE_SOCKET)
-  FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtOpenGL QtNetwork)
-else()
-  FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtOpenGL)
+  FIND_PACKAGE(Qt5Network)
+  include_directories(${Qt5Network_INCLUDE_DIRS})
 endif()
-INCLUDE(${QT_USE_FILE})
+SET(USE_QT_5 ON)
+add_definitions(-D_USE_QT5)
+
+
+SET(CMAKE_AUTOMOC OFF)
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 add_definitions(-D_USE_QT)
 add_definitions(-DUSE_QT)
@@ -117,6 +137,11 @@ if(WITH_DEBUGGER)
 #   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/3rdparty/qtermwidget/lib)
 endif()
 
+if(USE_QT_5)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+endif()
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common)
@@ -149,8 +174,10 @@ set(BUNDLE_LIBS
                           ${OPENMP_LIBRARY}
 #                         ${SDL_LIBRARY}
                            ${SDL2_LIBRARIES}
-                          ${QT_LIBRARIES}
-                          ${THREADS_LIBRARY}
 )
+if(USE_QT_5)
+  set(BUNDLE_LIBS ${BUNDLE_LIBS} ${QT_LIBRARIES})
+endif()
 
+set(BUNDLE_LIBS ${BUNDLE_LIBS} ${THREADS_LIBRARY})
 

diff --git a/source/src/common.h b/source/src/common.h
index 33a2ad5..4d4614b 100644 (file)
--- a/source/src/common.h
+++ b/source/src/common.h
@@ -35,8 +35,14 @@
 #elif defined(_USE_QT)
 #include <SDL2/SDL.h>
 #include <stdarg.h>
-#include <QtCore/QString>
-#include <QtCore/QFile>
+
+# if defined(_USE_QT5)
+#  include <QString>
+#  include <QFile>
+# else
+#  include <QtCore/QString>
+#  include <QtCore/QFile>
+# endif
 #endif
 
 #if defined(_USE_AGAR) || defined(_USE_SDL) || defined(_USE_QT)
@@ -524,4 +530,4 @@ typedef struct cur_time_s {
 
 //#endif
 
-#endif
\ No newline at end of file
+#endif

diff --git a/source/src/emu.cpp b/source/src/emu.cpp
index 97c748c..ef91cb3 100644 (file)
--- a/source/src/emu.cpp
+++ b/source/src/emu.cpp
@@ -71,6 +71,7 @@ EMU::EMU(HWND hwnd, HINSTANCE hinst)
 #ifndef _USE_QT
         _TCHAR tmp_path[PATH_MAX], *ptr;
         my_procname.copy(tmp_path, PATH_MAX, 0);
+       memset(app_path, 0x00, sizeof(app_path));
         get_long_full_path_name(tmp_path, app_path);
         //AGAR_DebugLog("APPPATH=%s\n", app_path);
         if(AG_UsingGL(AGDRIVER(main_window_handle))) {
@@ -84,6 +85,7 @@ EMU::EMU(HWND hwnd, HINSTANCE hinst)
 #else
         _TCHAR tmp_path[PATH_MAX], *ptr;
         my_procname.copy(tmp_path, PATH_MAX, 0);
+       memset(app_path, 0x00, sizeof(app_path));
         get_long_full_path_name(tmp_path, app_path);
         //AGAR_DebugLog("APPPATH=%s\n", app_path);
        use_opengl = true;
@@ -311,6 +313,7 @@ void EMU::notify_power_off()
 _TCHAR* EMU::bios_path(_TCHAR* file_name)
 {
        static _TCHAR file_path[_MAX_PATH];
+       memset(file_path, 0x00, sizeof(file_path));
        _stprintf_s(file_path, _MAX_PATH, _T("%s%s"), app_path, file_name);
 #if defined(_USE_AGAR) || defined(_USE_SDL) || defined(_USE_QT)
        AGAR_DebugLog(AGAR_LOG_INFO, "LOAD BIOS: %s", file_path);

diff --git a/source/src/qt/common/CMakeLists.txt b/source/src/qt/common/CMakeLists.txt
index bb81c4f..d2806b0 100644 (file)
--- a/source/src/qt/common/CMakeLists.txt
+++ b/source/src/qt/common/CMakeLists.txt
@@ -6,7 +6,11 @@ set(s_qt_common_headers
          qt_main.h
 )
 
-QT4_WRAP_CPP(s_qt_common_headers_MOC ${s_qt_common_headers})
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_common_headers_MOC ${s_qt_common_headers})
+else()
+  QT4_WRAP_CPP(s_qt_common_headers_MOC ${s_qt_common_headers})
+endif()
 
 set(QT_COMMON_BASE  emuevents_control.cpp
          emu_utils.cpp
@@ -30,7 +34,13 @@ add_executable(${EXEC_TARGET}
          ${QT_COMMON_BASE}
          ${s_qt_common_headers_MOC}
 )
-
+if(USE_QT_5)
+  if(USE_SOCKET)
+    QT5_USE_MODULES(${EXEC_TARGET} Widgets Core Gui OpenGL Network)
+  else()
+    QT5_USE_MODULES(${EXEC_TARGET} Widgets Core Gui OpenGL)
+  endif()
+endif()
 target_link_libraries(${EXEC_TARGET} ${LOCAL_LIBS} ${BUNDLE_LIBS})
 
 install(TARGETS ${EXEC_TARGET} DESTINATION bin)

diff --git a/source/src/qt/common/qt_dialogs.h b/source/src/qt/common/qt_dialogs.h
index b7d6b12..2ed63fe 100644 (file)
--- a/source/src/qt/common/qt_dialogs.h
+++ b/source/src/qt/common/qt_dialogs.h
@@ -9,7 +9,11 @@
 
 #ifndef _CSP_QT_DIALOGS_H
 #define _CSP_QT_DIALOGS_H
+#if defined(_USE_QT5)
+#include <QFileDialog>
+#else
 #include <QtGui/QFileDialog>
+#endif
 #include "emu.h"
 #include "qt_main.h"
 

diff --git a/source/src/qt/debugger/CMakeLists.txt b/source/src/qt/debugger/CMakeLists.txt
index 39f10f8..8beaa08 100644 (file)
--- a/source/src/qt/debugger/CMakeLists.txt
+++ b/source/src/qt/debugger/CMakeLists.txt
@@ -3,8 +3,12 @@ message("* qt/debugger")
 set(s_qt_debugger_headers
          qt_debugger.h
 )
-QT4_WRAP_CPP(s_qt_debugger_headers_MOC ${s_qt_debugger_headers})
 
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_debugger_headers_MOC ${s_qt_debugger_headers})
+else()
+  QT4_WRAP_CPP(s_qt_debugger_headers_MOC ${s_qt_debugger_headers})
+endif()
  
 add_library(qt_debugger
           qt_debugger.cpp

diff --git a/source/src/qt/fm16pi/CMakeLists.txt b/source/src/qt/fm16pi/CMakeLists.txt
index e250725..6856a9f 100644 (file)
--- a/source/src/qt/fm16pi/CMakeLists.txt
+++ b/source/src/qt/fm16pi/CMakeLists.txt
@@ -3,7 +3,12 @@ message("* qt/fm16pi")
 set(s_qt_fm16pi_headers
          menuclasses.h
 )
-QT4_WRAP_CPP(s_qt_fm16pi_headers_MOC ${s_qt_fm16pi_headers})
+
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_fm16pi_headers_MOC ${s_qt_fm16pi_headers})
+else()
+  QT4_WRAP_CPP(s_qt_fm16pi_headers_MOC ${s_qt_fm16pi_headers})
+endif()
 
 add_library(qt_fm16pi
          MainWindow.cpp

diff --git a/source/src/qt/fm16pi/MainWindow.cpp b/source/src/qt/fm16pi/MainWindow.cpp
index f83f34d..b688d9a 100644 (file)
--- a/source/src/qt/fm16pi/MainWindow.cpp
+++ b/source/src/qt/fm16pi/MainWindow.cpp
@@ -6,8 +6,11 @@
  *   History :
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
-
+#if defined(_USE_QT5)
+#include <QVariant>
+#else
 #include <QtCore/QVariant>
+#endif
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -59,23 +62,23 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
 #if 0
    // Set Labels
-  menu_Emu_DipSw->setTitle(QApplication::translate("MainWindow", "DIP Switches", 0, QApplication::UnicodeUTF8));
-  action_Emu_DipSw[0]->setText(QApplication::translate("MainWindow", "Dip Switch 1", 0, QApplication::UnicodeUTF8));
-  action_Emu_DipSw[1]->setText(QApplication::translate("MainWindow", "Dip Switch 2", 0, QApplication::UnicodeUTF8));
-  action_Emu_DipSw[2]->setText(QApplication::translate("MainWindow", "Dip Switch 3", 0, QApplication::UnicodeUTF8));
-  action_Emu_DipSw[3]->setText(QApplication::translate("MainWindow", "Dip Switch 4", 0, QApplication::UnicodeUTF8));
+  menu_Emu_DipSw->setTitle(QApplication::translate("MainWindow", "DIP Switches", 0));
+  action_Emu_DipSw[0]->setText(QApplication::translate("MainWindow", "Dip Switch 1", 0));
+  action_Emu_DipSw[1]->setText(QApplication::translate("MainWindow", "Dip Switch 2", 0));
+  action_Emu_DipSw[2]->setText(QApplication::translate("MainWindow", "Dip Switch 3", 0));
+  action_Emu_DipSw[3]->setText(QApplication::translate("MainWindow", "Dip Switch 4", 0));
 #endif
 } // retranslateUi
 

diff --git a/source/src/qt/fm7/CMakeLists.txt b/source/src/qt/fm7/CMakeLists.txt
index 4918f24..8f387af 100644 (file)
--- a/source/src/qt/fm7/CMakeLists.txt
+++ b/source/src/qt/fm7/CMakeLists.txt
@@ -3,7 +3,12 @@ message("* qt/fm7")
 set(s_qt_fm7_headers
          menuclasses.h
 )
-QT4_WRAP_CPP(s_qt_fm7_headers_MOC ${s_qt_fm7_headers})
+
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_fm7_headers_MOC ${s_qt_fm7_headers})
+else()
+  QT4_WRAP_CPP(s_qt_fm7_headers_MOC ${s_qt_fm7_headers})
+endif()
 
 add_library(qt_fm7
          MainWindow.cpp

diff --git a/source/src/qt/fm7/MainWindow.cpp b/source/src/qt/fm7/MainWindow.cpp
index 2b83859..8b92c9f 100644 (file)
--- a/source/src/qt/fm7/MainWindow.cpp
+++ b/source/src/qt/fm7/MainWindow.cpp
@@ -112,22 +112,22 @@ void META_MainWindow::retranslateUi(void)
        retranslateSoundMenu();
        retranslateScreenMenu();
        
-       this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+       this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
        
        
-       actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+       actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
        
-       actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+       actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
 #ifdef USE_DEBUGGER
-       actionDebugger_1->setText(QApplication::translate("MainWindow", "Debug Main CPU", 0, QApplication::UnicodeUTF8));
-       actionDebugger_2->setText(QApplication::translate("MainWindow", "Debug Sub  CPU", 0, QApplication::UnicodeUTF8));
+       actionDebugger_1->setText(QApplication::translate("MainWindow", "Debug Main CPU", 0));
+       actionDebugger_2->setText(QApplication::translate("MainWindow", "Debug Sub  CPU", 0));
        actionDebugger_3->setVisible(false);
 #endif 
-       //      actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-       //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+       //      actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+       //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
   // 
-       menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-       menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+       menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+       menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
        // FM-7 Specified
        menuCpuType->setTitle("CPU Frequency");
        actionCpuType[0]->setText(QString::fromUtf8("2MHz"));
@@ -146,7 +146,7 @@ void META_MainWindow::retranslateUi(void)
    
        actionCycleSteal->setText(QString::fromUtf8("Cycle Steal"));
        actionIgnoreCRC->setText(QString::fromUtf8("Ignore CRC errors"));
-       menuSoundDevice->setTitle(QApplication::translate("MainWindow", "Sound Boards", 0, QApplication::UnicodeUTF8));
+       menuSoundDevice->setTitle(QApplication::translate("MainWindow", "Sound Boards", 0));
 #if defined(_FM77AV_VARIANTS)
        actionSoundDevice[0]->setVisible(false);
        actionSoundDevice[2]->setVisible(false);
@@ -171,13 +171,13 @@ void META_MainWindow::retranslateUi(void)
 #endif
 // End.
 // 
-//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0, QApplication::UnicodeUTF8));
-//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0, QApplication::UnicodeUTF8));
+//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0));
+//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0));
        
-       menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-       menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+       menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+       menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-       menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+       menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
   
 } // retranslateUi

diff --git a/source/src/qt/fmr50/CMakeLists.txt b/source/src/qt/fmr50/CMakeLists.txt
index 422afbf..2a574e0 100644 (file)
--- a/source/src/qt/fmr50/CMakeLists.txt
+++ b/source/src/qt/fmr50/CMakeLists.txt
@@ -3,7 +3,12 @@ message("* qt/fmr50")
 set(s_qt_fmr50_headers
          menuclasses.h
 )
-QT4_WRAP_CPP(s_qt_fmr50_headers_MOC ${s_qt_fmr50_headers})
+
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_fmr50_headers_MOC ${s_qt_fmr50_headers})
+else()
+  QT4_WRAP_CPP(s_qt_fmr50_headers_MOC ${s_qt_fmr50_headers})
+endif()
 
 add_library(qt_fmr50
          MainWindow.cpp

diff --git a/source/src/qt/fmr50/MainWindow.cpp b/source/src/qt/fmr50/MainWindow.cpp
index 651e835..e29cf63 100644 (file)
--- a/source/src/qt/fmr50/MainWindow.cpp
+++ b/source/src/qt/fmr50/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -27,19 +27,19 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
   // 
-  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
   // FM-7 Specified
   menuCpuType->setTitle("CPU Frequency");
 #if defined(HAS_I286)
@@ -55,13 +55,13 @@ void META_MainWindow::retranslateUi(void)
 
 // End.
 // 
-//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0, QApplication::UnicodeUTF8));
-//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0, QApplication::UnicodeUTF8));
+//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0));
+//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0));
        
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
   
 } // retranslateUi

diff --git a/source/src/qt/fp1100/CMakeLists.txt b/source/src/qt/fp1100/CMakeLists.txt
index 9a06734..35927b3 100644 (file)
--- a/source/src/qt/fp1100/CMakeLists.txt
+++ b/source/src/qt/fp1100/CMakeLists.txt
@@ -3,7 +3,12 @@ message("* qt/fp1100")
 set(s_qt_fp1100_headers
          menuclasses.h
 )
-QT4_WRAP_CPP(s_qt_fp1100_headers_MOC ${s_qt_fp1100_headers})
+
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_fp1100_headers_MOC ${s_qt_fp1100_headers})
+else()
+  QT4_WRAP_CPP(s_qt_fp1100_headers_MOC ${s_qt_fp1100_headers})
+endif()
 
 add_library(qt_fp1100
          MainWindow.cpp

diff --git a/source/src/qt/fp1100/MainWindow.cpp b/source/src/qt/fp1100/MainWindow.cpp
index 6e2cd28..865ba09 100644 (file)
--- a/source/src/qt/fp1100/MainWindow.cpp
+++ b/source/src/qt/fp1100/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -28,25 +28,25 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
   // 
-  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
   // FP1100 Specified
        
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
   
 } // retranslateUi

diff --git a/source/src/qt/fp200/CMakeLists.txt b/source/src/qt/fp200/CMakeLists.txt
index bc66b53..b1cb9fb 100644 (file)
--- a/source/src/qt/fp200/CMakeLists.txt
+++ b/source/src/qt/fp200/CMakeLists.txt
@@ -2,8 +2,12 @@ message("* qt/fp200")
 
 set(s_qt_fp200_headers
          menuclasses.h
-)
-QT4_WRAP_CPP(s_qt_fp200_headers_MOC ${s_qt_fp200_headers})
+         )
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_fp200_headers_MOC ${s_qt_fp200_headers})
+else()
+  QT4_WRAP_CPP(s_qt_fp200_headers_MOC ${s_qt_fp200_headers})
+endif()
 
 add_library(qt_fp200
          MainWindow.cpp

diff --git a/source/src/qt/fp200/MainWindow.cpp b/source/src/qt/fp200/MainWindow.cpp
index 2aea0e4..99d14fe 100644 (file)
--- a/source/src/qt/fp200/MainWindow.cpp
+++ b/source/src/qt/fp200/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -26,28 +26,28 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
        menuBootMode->setTitle("BOOT Mode");
        actionBootMode[0]->setText(QString::fromUtf8("BASIC"));
        actionBootMode[1]->setText(QString::fromUtf8("CETL"));  
 
-   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
   // 
-  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
   // FP1100 Specified
        
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
   
 } // retranslateUi

diff --git a/source/src/qt/gamegear/CMakeLists.txt b/source/src/qt/gamegear/CMakeLists.txt
index 41375ee..f9826ea 100644 (file)
--- a/source/src/qt/gamegear/CMakeLists.txt
+++ b/source/src/qt/gamegear/CMakeLists.txt
@@ -2,9 +2,14 @@ message("* qt/gamegear")
 
 set(s_qt_sms_headers
          menuclasses.h
-)
-QT4_WRAP_CPP(s_qt_sms_headers_MOC ${s_qt_sms_headers})
+         )
 
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_sms_headers_MOC ${s_qt_sms_headers})
+else()
+  QT4_WRAP_CPP(s_qt_sms_headers_MOC ${s_qt_sms_headers})
+endif()
+  
 add_library(qt_sms
          MainWindow.cpp
          ${s_qt_sms_headers_MOC}

diff --git a/source/src/qt/gamegear/MainWindow.cpp b/source/src/qt/gamegear/MainWindow.cpp
index c5e69af..8235294 100644 (file)
--- a/source/src/qt/gamegear/MainWindow.cpp
+++ b/source/src/qt/gamegear/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -30,16 +30,16 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
 } // retranslateUi
 
 

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index 240bf41..87913bc 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -3,8 +3,11 @@ set(s_qt_gui_headers
          commonclasses.h
          mainwidget.h
 )
-QT4_WRAP_CPP(s_qt_gui_headers_MOC ${s_qt_gui_headers})
-
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_gui_headers_MOC ${s_qt_gui_headers})
+else()
+  QT4_WRAP_CPP(s_qt_gui_headers_MOC ${s_qt_gui_headers})
+endif()
  
 add_library(qt_gui
           qt_input.cpp

diff --git a/source/src/qt/gui/commonclasses.h b/source/src/qt/gui/commonclasses.h
index 9bca9fc..a590b31 100644 (file)
--- a/source/src/qt/gui/commonclasses.h
+++ b/source/src/qt/gui/commonclasses.h
@@ -9,6 +9,20 @@
 #ifndef _CSP_QT_GUI_COMMONCLASSES_H
 #define _CSP_QT_GUI_COMMONCLASSES_H
 
+#if defined(_USE_QT5)
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGraphicsView>
+#include <QHeaderView>
+#include <QMainWindow>
+#include <QMenu>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QWidget>
+#include <QIcon>
+#else
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
@@ -21,6 +35,7 @@
 #include <QtGui/QStatusBar>
 #include <QtGui/QWidget>
 #include <QtGui/QIconSet>
+#endif
 
 #include "simd_types.h"
 #include "common.h"

diff --git a/source/src/qt/gui/mainwidget.h b/source/src/qt/gui/mainwidget.h
index 2d03779..67e3af0 100644 (file)
--- a/source/src/qt/gui/mainwidget.h
+++ b/source/src/qt/gui/mainwidget.h
@@ -7,6 +7,21 @@
 #ifndef _CSP_QT_MAINWIDGET_H
 #define _CSP_QT_MAINWIDGET_H
 
+#if defined(_USE_QT5)
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGraphicsView>
+#include <QHeaderView>
+#include <QMainWindow>
+#include <QMenu>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QWidget>
+#include <QIcon>
+#include <QLabel>
+#else
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
@@ -20,6 +35,7 @@
 #include <QtGui/QWidget>
 #include <QtGui/QIconSet>
 #include <QLabel>
+#endif
 
 #include "simd_types.h"
 #include "common.h"

diff --git a/source/src/qt/gui/menu_binary.cpp b/source/src/qt/gui/menu_binary.cpp
index bdd120d..cf41f8c 100644 (file)
--- a/source/src/qt/gui/menu_binary.cpp
+++ b/source/src/qt/gui/menu_binary.cpp
@@ -168,16 +168,16 @@ void Ui_MainWindow::ConfigBinaryMenuSub(int drv)
 void Ui_MainWindow::retranslateBinaryMenu(int drv, int basedrv)
 {
 #if defined(USE_BINARY_FILE1)
-  QString drive_name = (QApplication::translate("MainWindow", "Binary", 0, QApplication::UnicodeUTF8));
+  QString drive_name = (QApplication::translate("MainWindow", "Binary", 0));
   drive_name += QString::number(basedrv);
   
   if((drv < 0) || (drv >= 8)) return;
-  actionLoad_BIN[drv]->setText(QApplication::translate("MainWindow", "Load", 0, QApplication::UnicodeUTF8));
-  actionSave_BIN[drv]->setText(QApplication::translate("MainWindow", "Save", 0, QApplication::UnicodeUTF8));
+  actionLoad_BIN[drv]->setText(QApplication::translate("MainWindow", "Load", 0));
+  actionSave_BIN[drv]->setText(QApplication::translate("MainWindow", "Save", 0));
 
-  menuBIN_Recent[drv]->setTitle(QApplication::translate("MainWindow", "Recent Opened", 0, QApplication::UnicodeUTF8));
+  menuBIN_Recent[drv]->setTitle(QApplication::translate("MainWindow", "Recent Opened", 0));
 
-  menuBIN[drv]->setTitle(QApplication::translate("MainWindow", drive_name.toUtf8().constData() , 0, QApplication::UnicodeUTF8));
+  menuBIN[drv]->setTitle(QApplication::translate("MainWindow", drive_name.toUtf8().constData() , 0));
 #endif
 }
 

diff --git a/source/src/qt/gui/menu_cart.cpp b/source/src/qt/gui/menu_cart.cpp
index f446982..3bd51ea 100644 (file)
--- a/source/src/qt/gui/menu_cart.cpp
+++ b/source/src/qt/gui/menu_cart.cpp
@@ -165,15 +165,15 @@ void Ui_MainWindow::ConfigCartMenuSub(int drv)
 void Ui_MainWindow::retranslateCartMenu(int drv, int basedrv)
 {
 #ifdef USE_CART1
-       QString drive_name = (QApplication::translate("MainWindow", "Cartridge ", 0, QApplication::UnicodeUTF8));
+       QString drive_name = (QApplication::translate("MainWindow", "Cartridge ", 0));
        drive_name += QString::number(basedrv);
   
        if((drv < 0) || (drv >= 8)) return;
-       actionInsert_CART[drv]->setText(QApplication::translate("MainWindow", "Insert", 0, QApplication::UnicodeUTF8));
-       actionEject_CART[drv]->setText(QApplication::translate("MainWindow", "Eject", 0, QApplication::UnicodeUTF8));
+       actionInsert_CART[drv]->setText(QApplication::translate("MainWindow", "Insert", 0));
+       actionEject_CART[drv]->setText(QApplication::translate("MainWindow", "Eject", 0));
 
-       menuCART_Recent[drv]->setTitle(QApplication::translate("MainWindow", "Recent Opened", 0, QApplication::UnicodeUTF8));
-       menuCART[drv]->setTitle(QApplication::translate("MainWindow", drive_name.toUtf8().constData() , 0, QApplication::UnicodeUTF8));
+       menuCART_Recent[drv]->setTitle(QApplication::translate("MainWindow", "Recent Opened", 0));
+       menuCART[drv]->setTitle(QApplication::translate("MainWindow", drive_name.toUtf8().constData() , 0));
 #endif
 }
 

diff --git a/source/src/qt/gui/menu_cmt.cpp b/source/src/qt/gui/menu_cmt.cpp
index be6541a..41d2203 100644 (file)
--- a/source/src/qt/gui/menu_cmt.cpp
+++ b/source/src/qt/gui/menu_cmt.cpp
@@ -265,26 +265,26 @@ void Ui_MainWindow::ConfigCMTMenuSub(void)
 void Ui_MainWindow::retranslateCMTMenu(void)
 {
 #ifdef USE_TAPE
-       actionInsert_CMT->setText(QApplication::translate("MainWindow", "Insert CMT", 0, QApplication::UnicodeUTF8));
-       actionEject_CMT->setText(QApplication::translate("MainWindow", "Eject CMT", 0, QApplication::UnicodeUTF8));
+       actionInsert_CMT->setText(QApplication::translate("MainWindow", "Insert CMT", 0));
+       actionEject_CMT->setText(QApplication::translate("MainWindow", "Eject CMT", 0));
 
-       actionWaveShaper->setText(QApplication::translate("MainWindow", "Enable Wave Shaper", 0, QApplication::UnicodeUTF8));
-       actionDirectLoadMZT->setText(QApplication::translate("MainWindow", "Direct load from MZT", 0, QApplication::UnicodeUTF8));
+       actionWaveShaper->setText(QApplication::translate("MainWindow", "Enable Wave Shaper", 0));
+       actionDirectLoadMZT->setText(QApplication::translate("MainWindow", "Direct load from MZT", 0));
   
-       menuCMT_Recent->setTitle(QApplication::translate("MainWindow", "Recent Opened", 0, QApplication::UnicodeUTF8));
+       menuCMT_Recent->setTitle(QApplication::translate("MainWindow", "Recent Opened", 0));
   
-       actionProtection_ON_CMT->setText(QApplication::translate("MainWindow", "Protection ON", 0, QApplication::UnicodeUTF8));
-       actionProtection_OFF_CMT->setText(QApplication::translate("MainWindow", "Protection OFF", 0, QApplication::UnicodeUTF8));
+       actionProtection_ON_CMT->setText(QApplication::translate("MainWindow", "Protection ON", 0));
+       actionProtection_OFF_CMT->setText(QApplication::translate("MainWindow", "Protection OFF", 0));
 
-       menuCMT->setTitle(QApplication::translate("MainWindow", "Casette tape" , 0, QApplication::UnicodeUTF8));
-       menuWrite_Protection_CMT->setTitle(QApplication::translate("MainWindow", "Write Protection", 0, QApplication::UnicodeUTF8));
+       menuCMT->setTitle(QApplication::translate("MainWindow", "Casette tape" , 0));
+       menuWrite_Protection_CMT->setTitle(QApplication::translate("MainWindow", "Write Protection", 0));
 
 #ifdef USE_TAPE_BUTTON
-       actionPlay_Stop->setText(QApplication::translate("MainWindow", "Play Stop", 0, QApplication::UnicodeUTF8));
-       actionPlay_Start->setText(QApplication::translate("MainWindow", "Play Start", 0, QApplication::UnicodeUTF8));
+       actionPlay_Stop->setText(QApplication::translate("MainWindow", "Play Stop", 0));
+       actionPlay_Start->setText(QApplication::translate("MainWindow", "Play Start", 0));
 #endif
    
-       actionRecording->setText(QApplication::translate("MainWindow", "Recording", 0, QApplication::UnicodeUTF8));
+       actionRecording->setText(QApplication::translate("MainWindow", "Recording", 0));
 #endif
 }
 

diff --git a/source/src/qt/gui/menu_control.cpp b/source/src/qt/gui/menu_control.cpp
index 339d24c..414b05e 100644 (file)
--- a/source/src/qt/gui/menu_control.cpp
+++ b/source/src/qt/gui/menu_control.cpp
@@ -285,38 +285,38 @@ void Ui_MainWindow::createContextMenu(void)
 
 void Ui_MainWindow::retranslateControlMenu(const char *SpecialResetTitle,  bool WithSpecialReset)
 {
-       actionReset->setText(QApplication::translate("MainWindow", "Reset", 0, QApplication::UnicodeUTF8));
+       actionReset->setText(QApplication::translate("MainWindow", "Reset", 0));
 #ifdef USE_SPECIAL_RESET
-       actionSpecial_Reset->setText(QApplication::translate("MainWindow", SpecialResetTitle, 0, QApplication::UnicodeUTF8));
+       actionSpecial_Reset->setText(QApplication::translate("MainWindow", SpecialResetTitle, 0));
 #endif
-       actionExit_Emulator->setText(QApplication::translate("MainWindow", "Exit Emulator", 0, QApplication::UnicodeUTF8));
+       actionExit_Emulator->setText(QApplication::translate("MainWindow", "Exit Emulator", 0));
 
-       actionSpeed_x1->setText(QApplication::translate("MainWindow", "Speed x1", 0, QApplication::UnicodeUTF8));
-       actionSpeed_x2->setText(QApplication::translate("MainWindow", "Speed x2", 0, QApplication::UnicodeUTF8));
-       actionSpeed_x4->setText(QApplication::translate("MainWindow", "Speed x4", 0, QApplication::UnicodeUTF8));
-       actionSpeed_x8->setText(QApplication::translate("MainWindow", "Seppd x8", 0, QApplication::UnicodeUTF8));
-       actionSpeed_x16->setText(QApplication::translate("MainWindow", "Speed x16", 0, QApplication::UnicodeUTF8));
+       actionSpeed_x1->setText(QApplication::translate("MainWindow", "Speed x1", 0));
+       actionSpeed_x2->setText(QApplication::translate("MainWindow", "Speed x2", 0));
+       actionSpeed_x4->setText(QApplication::translate("MainWindow", "Speed x4", 0));
+       actionSpeed_x8->setText(QApplication::translate("MainWindow", "Seppd x8", 0));
+       actionSpeed_x16->setText(QApplication::translate("MainWindow", "Speed x16", 0));
        
-       actionPaste_from_Clipboard->setText(QApplication::translate("MainWindow", "Paste from Clipboard", 0, QApplication::UnicodeUTF8));
-       actionStop_Pasting->setText(QApplication::translate("MainWindow", "Stop Pasting", 0, QApplication::UnicodeUTF8));
+       actionPaste_from_Clipboard->setText(QApplication::translate("MainWindow", "Paste from Clipboard", 0));
+       actionStop_Pasting->setText(QApplication::translate("MainWindow", "Stop Pasting", 0));
 
 #ifdef USE_STATE
-       actionSave_State->setText(QApplication::translate("MainWindow", "Save State", 0, QApplication::UnicodeUTF8));
-       actionLoad_State->setText(QApplication::translate("MainWindow", "Load State", 0, QApplication::UnicodeUTF8));
+       actionSave_State->setText(QApplication::translate("MainWindow", "Save State", 0));
+       actionLoad_State->setText(QApplication::translate("MainWindow", "Load State", 0));
 #endif
    
 #ifdef USE_DEBUGGER
-       actionDebugger_1->setText(QApplication::translate("MainWindow", "Debugger 1", 0, QApplication::UnicodeUTF8));
-       actionDebugger_2->setText(QApplication::translate("MainWindow", "Debugger 2", 0, QApplication::UnicodeUTF8));
-       actionDebugger_3->setText(QApplication::translate("MainWindow", "Debugger 3", 0, QApplication::UnicodeUTF8));
-       actionClose_Debuggers->setText(QApplication::translate("MainWindow", "Close Debuggers", 0, QApplication::UnicodeUTF8));
-       menuDebugger->setTitle(QApplication::translate("MainWindow", "Debugger", 0, QApplication::UnicodeUTF8));
+       actionDebugger_1->setText(QApplication::translate("MainWindow", "Debugger 1", 0));
+       actionDebugger_2->setText(QApplication::translate("MainWindow", "Debugger 2", 0));
+       actionDebugger_3->setText(QApplication::translate("MainWindow", "Debugger 3", 0));
+       actionClose_Debuggers->setText(QApplication::translate("MainWindow", "Close Debuggers", 0));
+       menuDebugger->setTitle(QApplication::translate("MainWindow", "Debugger", 0));
 #endif   
-       menuControl->setTitle(QApplication::translate("MainWindow", "control", 0, QApplication::UnicodeUTF8));
-       menuState->setTitle(QApplication::translate("MainWindow", "State", 0, QApplication::UnicodeUTF8));
+       menuControl->setTitle(QApplication::translate("MainWindow", "control", 0));
+       menuState->setTitle(QApplication::translate("MainWindow", "State", 0));
 
-       menuCopy_Paste->setTitle(QApplication::translate("MainWindow", "Copy/Paste", 0, QApplication::UnicodeUTF8));
-       menuCpu_Speed->setTitle(QApplication::translate("MainWindow", "Cpu Speed", 0, QApplication::UnicodeUTF8));
+       menuCopy_Paste->setTitle(QApplication::translate("MainWindow", "Copy/Paste", 0));
+       menuCpu_Speed->setTitle(QApplication::translate("MainWindow", "Cpu Speed", 0));
 }
 
 QT_END_NAMESPACE

diff --git a/source/src/qt/gui/menu_disk.cpp b/source/src/qt/gui/menu_disk.cpp
index a05d13b..e2a890f 100644 (file)
--- a/source/src/qt/gui/menu_disk.cpp
+++ b/source/src/qt/gui/menu_disk.cpp
@@ -225,21 +225,21 @@ void Ui_MainWindow::ConfigFloppyMenuSub(int drv)
 void Ui_MainWindow::retranslateFloppyMenu(int drv, int basedrv)
 {
 #ifdef USE_FD1
-       QString drive_name = (QApplication::translate("MainWindow", "Floppy ", 0, QApplication::UnicodeUTF8));
+       QString drive_name = (QApplication::translate("MainWindow", "Floppy ", 0));
        drive_name += QString::number(basedrv);
   
        if((drv < 0) || (drv >= 8)) return;
-       menuFD[drv]->setTitle(QApplication::translate("MainWindow", drive_name.toUtf8().constData() , 0, QApplication::UnicodeUTF8));
-       actionInsert_FD[drv]->setText(QApplication::translate("MainWindow", "Insert", 0, QApplication::UnicodeUTF8));
-       actionEject_FD[drv]->setText(QApplication::translate("MainWindow", "Eject", 0, QApplication::UnicodeUTF8));
+       menuFD[drv]->setTitle(QApplication::translate("MainWindow", drive_name.toUtf8().constData() , 0));
+       actionInsert_FD[drv]->setText(QApplication::translate("MainWindow", "Insert", 0));
+       actionEject_FD[drv]->setText(QApplication::translate("MainWindow", "Eject", 0));
 
-       menuFD_Recent[drv]->setTitle(QApplication::translate("MainWindow", "Recent Opened", 0, QApplication::UnicodeUTF8));
-       menuFD_D88[drv]->setTitle(QApplication::translate("MainWindow", "Select D88 Image", 0, QApplication::UnicodeUTF8));
+       menuFD_Recent[drv]->setTitle(QApplication::translate("MainWindow", "Recent Opened", 0));
+       menuFD_D88[drv]->setTitle(QApplication::translate("MainWindow", "Select D88 Image", 0));
   
 # if defined(USE_DISK_WRITE_PROTECT)
-       actionProtection_ON_FD[drv]->setText(QApplication::translate("MainWindow", "Protection ON", 0, QApplication::UnicodeUTF8));
-       actionProtection_OFF_FD[drv]->setText(QApplication::translate("MainWindow", "Protection OFF", 0, QApplication::UnicodeUTF8));
-       menuWrite_Protection_FD[drv]->setTitle(QApplication::translate("MainWindow", "Write Protection", 0, QApplication::UnicodeUTF8));
+       actionProtection_ON_FD[drv]->setText(QApplication::translate("MainWindow", "Protection ON", 0));
+       actionProtection_OFF_FD[drv]->setText(QApplication::translate("MainWindow", "Protection OFF", 0));
+       menuWrite_Protection_FD[drv]->setTitle(QApplication::translate("MainWindow", "Write Protection", 0));
 # endif
 #endif
 }

diff --git a/source/src/qt/gui/menu_main.cpp b/source/src/qt/gui/menu_main.cpp
index 77e41de..ac986e4 100644 (file)
--- a/source/src/qt/gui/menu_main.cpp
+++ b/source/src/qt/gui/menu_main.cpp
@@ -283,12 +283,12 @@ void Ui_MainWindow::retranslateUi(void)
        retranslateBinaryMenu(0, 1);
        retranslateBinaryMenu(1, 2);
    
-       this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
-       actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
-       menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-       menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+       this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
+       actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
+       menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+       menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-       menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+       menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
 } // retranslateUi
 
 QT_END_NAMESPACE

diff --git a/source/src/qt/gui/menu_quickdisk.cpp b/source/src/qt/gui/menu_quickdisk.cpp
index 528cf07..d509414 100644 (file)
--- a/source/src/qt/gui/menu_quickdisk.cpp
+++ b/source/src/qt/gui/menu_quickdisk.cpp
@@ -193,20 +193,20 @@ void Ui_MainWindow::ConfigQuickDiskMenuSub(int drv)
 void Ui_MainWindow::retranslateQuickDiskMenu(int drv, int basedrv)
 {
 #ifdef USE_QD1
-       QString drive_name = (QApplication::translate("MainWindow", "Quick Disk ", 0, QApplication::UnicodeUTF8));
+       QString drive_name = (QApplication::translate("MainWindow", "Quick Disk ", 0));
        drive_name += QString::number(basedrv);
   
        if((drv < 0) || (drv >= 2)) return;
-       actionInsert_QD[drv]->setText(QApplication::translate("MainWindow", "Insert", 0, QApplication::UnicodeUTF8));
-       actionEject_QD[drv]->setText(QApplication::translate("MainWindow", "Eject", 0, QApplication::UnicodeUTF8));
+       actionInsert_QD[drv]->setText(QApplication::translate("MainWindow", "Insert", 0));
+       actionEject_QD[drv]->setText(QApplication::translate("MainWindow", "Eject", 0));
 
-       menuQD_Recent[drv]->setTitle(QApplication::translate("MainWindow", "Recent Opened", 0, QApplication::UnicodeUTF8));
+       menuQD_Recent[drv]->setTitle(QApplication::translate("MainWindow", "Recent Opened", 0));
   
-       actionProtection_ON_QD[drv]->setText(QApplication::translate("MainWindow", "Protection ON", 0, QApplication::UnicodeUTF8));
-       actionProtection_OFF_QD[drv]->setText(QApplication::translate("MainWindow", "Protection OFF", 0, QApplication::UnicodeUTF8));
+       actionProtection_ON_QD[drv]->setText(QApplication::translate("MainWindow", "Protection ON", 0));
+       actionProtection_OFF_QD[drv]->setText(QApplication::translate("MainWindow", "Protection OFF", 0));
 
-       menuQD[drv]->setTitle(QApplication::translate("MainWindow", drive_name.toUtf8().constData() , 0, QApplication::UnicodeUTF8));
-       menuWrite_Protection_QD[drv]->setTitle(QApplication::translate("MainWindow", "Write Protection", 0, QApplication::UnicodeUTF8));
+       menuQD[drv]->setTitle(QApplication::translate("MainWindow", drive_name.toUtf8().constData() , 0));
+       menuWrite_Protection_QD[drv]->setTitle(QApplication::translate("MainWindow", "Write Protection", 0));
 #endif
 }
                                                                 

diff --git a/source/src/qt/gui/menu_screen.cpp b/source/src/qt/gui/menu_screen.cpp
index 8bceb18..b0b3fed 100644 (file)
--- a/source/src/qt/gui/menu_screen.cpp
+++ b/source/src/qt/gui/menu_screen.cpp
@@ -174,28 +174,28 @@ void Ui_MainWindow::retranslateScreenMenu(void)
        int i;
        QString tmps_w, tmps_h, tmps;
        int w, h;
-       actionZoom->setText(QApplication::translate("MainWindow", "Zoom Screen", 0, QApplication::UnicodeUTF8));
-       actionDisplay_Mode->setText(QApplication::translate("MainWindow", "Display Mode", 0, QApplication::UnicodeUTF8));
+       actionZoom->setText(QApplication::translate("MainWindow", "Zoom Screen", 0));
+       actionDisplay_Mode->setText(QApplication::translate("MainWindow", "Display Mode", 0));
 #ifdef USE_SCANLINE
-       actionScanLine->setText(QApplication::translate("MainWindow", "Set ScanLine", 0, QApplication::UnicodeUTF8));
+       actionScanLine->setText(QApplication::translate("MainWindow", "Set ScanLine", 0));
 #endif
-       actionCRT_Filter->setText(QApplication::translate("MainWindow", "CRT Filter", 0, QApplication::UnicodeUTF8));
-       actionDot_by_Dot->setText(QApplication::translate("MainWindow", "Dot by Dot", 0, QApplication::UnicodeUTF8));
-       actionKeep_Aspect->setText(QApplication::translate("MainWindow", "Keep Aspect", 0, QApplication::UnicodeUTF8));
-       actionFill_Display->setText(QApplication::translate("MainWindow", "Fill Display", 0, QApplication::UnicodeUTF8));
+       actionCRT_Filter->setText(QApplication::translate("MainWindow", "CRT Filter", 0));
+       actionDot_by_Dot->setText(QApplication::translate("MainWindow", "Dot by Dot", 0));
+       actionKeep_Aspect->setText(QApplication::translate("MainWindow", "Keep Aspect", 0));
+       actionFill_Display->setText(QApplication::translate("MainWindow", "Fill Display", 0));
   
-       actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+       actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
 
-       menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-       menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+       menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+       menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
 
-       actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-       actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+       actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+       actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
 
-       menuRecord_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0, QApplication::UnicodeUTF8));
+       menuRecord_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0));
 
 
-       menuScreenSize->setTitle(QApplication::translate("MainWindow", "Screen size", 0, QApplication::UnicodeUTF8));
+       menuScreenSize->setTitle(QApplication::translate("MainWindow", "Screen size", 0));
        for(i = 0; i < _SCREEN_MODE_NUM; i++) {
                if(actionScreenSize[i] == NULL) continue;
                actionScreenSize[i]->binds->getSize(&w, &h);

diff --git a/source/src/qt/gui/menu_sound.cpp b/source/src/qt/gui/menu_sound.cpp
index b6e604d..1143959 100644 (file)
--- a/source/src/qt/gui/menu_sound.cpp
+++ b/source/src/qt/gui/menu_sound.cpp
@@ -127,23 +127,23 @@ void Ui_MainWindow::retranslateSoundMenu(void)
   
        for(i = 0; i < 8; i++) {
                tmps.setNum(s_freq_table[i]);
-               tmps = tmps + QApplication::translate("MainWindow", "Hz", 0, QApplication::UnicodeUTF8);
+               tmps = tmps + QApplication::translate("MainWindow", "Hz", 0);
                action_Freq[i]->setText(tmps);
        }
        for(i = 0; i < 5; i++) {
                dval = s_late_table[i];
                dval = dval * 1000.0;
                tmps.setNum((int)dval);
-               tmps = tmps + QApplication::translate("MainWindow", "mSec", 0, QApplication::UnicodeUTF8);
+               tmps = tmps + QApplication::translate("MainWindow", "mSec", 0);
                action_Latency[i]->setText(tmps);
        }
-       actionStart_Record->setText(QApplication::translate("MainWindow", "Start Recording sound", 0, QApplication::UnicodeUTF8));
+       actionStart_Record->setText(QApplication::translate("MainWindow", "Start Recording sound", 0));
 #ifdef DATAREC_SOUND
-       actionSoundCMT->setText(QApplication::translate("MainWindow", "Sound CMT", 0, QApplication::UnicodeUTF8));
+       actionSoundCMT->setText(QApplication::translate("MainWindow", "Sound CMT", 0));
 #endif
-       menuSound->setTitle(QApplication::translate("MainWindow", "Sound", 0, QApplication::UnicodeUTF8));
-       menuOutput_Frequency->setTitle(QApplication::translate("MainWindow", "Output Frequency", 0, QApplication::UnicodeUTF8));
-       menuSound_Latency->setTitle(QApplication::translate("MainWindow", "Sound Latency", 0, QApplication::UnicodeUTF8));
+       menuSound->setTitle(QApplication::translate("MainWindow", "Sound", 0));
+       menuOutput_Frequency->setTitle(QApplication::translate("MainWindow", "Output Frequency", 0));
+       menuSound_Latency->setTitle(QApplication::translate("MainWindow", "Sound Latency", 0));
 }
  
 QT_END_NAMESPACE

diff --git a/source/src/qt/hc20/CMakeLists.txt b/source/src/qt/hc20/CMakeLists.txt
index a4d2cef..2468440 100644 (file)
--- a/source/src/qt/hc20/CMakeLists.txt
+++ b/source/src/qt/hc20/CMakeLists.txt
@@ -3,7 +3,11 @@ message("* qt/hc20")
 set(s_qt_hc20_headers
          menuclasses.h
 )
-QT4_WRAP_CPP(s_qt_hc20_headers_MOC ${s_qt_hc20_headers})
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_hc20_headers_MOC ${s_qt_hc20_headers})
+else()
+  QT4_WRAP_CPP(s_qt_hc20_headers_MOC ${s_qt_hc20_headers})
+endif()
 
 add_library(qt_hc20
          MainWindow.cpp

diff --git a/source/src/qt/hc20/MainWindow.cpp b/source/src/qt/hc20/MainWindow.cpp
index ce5d53e..25d04e1 100644 (file)
--- a/source/src/qt/hc20/MainWindow.cpp
+++ b/source/src/qt/hc20/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -79,22 +79,22 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
-  menu_Emu_DipSw->setTitle(QApplication::translate("MainWindow", "DIP Switches", 0, QApplication::UnicodeUTF8));
-  action_Emu_DipSw[0]->setText(QApplication::translate("MainWindow", "Dip Switch 1", 0, QApplication::UnicodeUTF8));
-  action_Emu_DipSw[1]->setText(QApplication::translate("MainWindow", "Dip Switch 2", 0, QApplication::UnicodeUTF8));
-  action_Emu_DipSw[2]->setText(QApplication::translate("MainWindow", "Dip Switch 3", 0, QApplication::UnicodeUTF8));
-  action_Emu_DipSw[3]->setText(QApplication::translate("MainWindow", "Dip Switch 4", 0, QApplication::UnicodeUTF8));
+  menu_Emu_DipSw->setTitle(QApplication::translate("MainWindow", "DIP Switches", 0));
+  action_Emu_DipSw[0]->setText(QApplication::translate("MainWindow", "Dip Switch 1", 0));
+  action_Emu_DipSw[1]->setText(QApplication::translate("MainWindow", "Dip Switch 2", 0));
+  action_Emu_DipSw[2]->setText(QApplication::translate("MainWindow", "Dip Switch 3", 0));
+  action_Emu_DipSw[3]->setText(QApplication::translate("MainWindow", "Dip Switch 4", 0));
 } // retranslateUi
 
 

diff --git a/source/src/qt/hc40/CMakeLists.txt b/source/src/qt/hc40/CMakeLists.txt
index 932c406..4483c24 100644 (file)
--- a/source/src/qt/hc40/CMakeLists.txt
+++ b/source/src/qt/hc40/CMakeLists.txt
@@ -3,7 +3,11 @@ message("* qt/hc40")
 set(s_qt_hc40_headers
          menuclasses.h
 )
-QT4_WRAP_CPP(s_qt_hc40_headers_MOC ${s_qt_hc40_headers})
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_hc40_headers_MOC ${s_qt_hc40_headers})
+else()
+  QT4_WRAP_CPP(s_qt_hc40_headers_MOC ${s_qt_hc40_headers})
+endif()
 
 add_library(qt_hc40
          MainWindow.cpp

diff --git a/source/src/qt/hc40/MainWindow.cpp b/source/src/qt/hc40/MainWindow.cpp
index 862c168..03d1104 100644 (file)
--- a/source/src/qt/hc40/MainWindow.cpp
+++ b/source/src/qt/hc40/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -32,16 +32,16 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
 } // retranslateUi
 

diff --git a/source/src/qt/hc80/CMakeLists.txt b/source/src/qt/hc80/CMakeLists.txt
index f560cfc..38bc3ad 100644 (file)
--- a/source/src/qt/hc80/CMakeLists.txt
+++ b/source/src/qt/hc80/CMakeLists.txt
@@ -3,7 +3,12 @@ message("* qt/hc80")
 set(s_qt_hc80_headers
          menuclasses.h
 )
-QT4_WRAP_CPP(s_qt_hc80_headers_MOC ${s_qt_hc80_headers})
+
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_hc80_headers_MOC ${s_qt_hc80_headers})
+else()
+  QT4_WRAP_CPP(s_qt_hc80_headers_MOC ${s_qt_hc80_headers})
+endif()
 
 add_library(qt_hc80
          MainWindow.cpp

diff --git a/source/src/qt/hc80/MainWindow.cpp b/source/src/qt/hc80/MainWindow.cpp
index 862c168..03d1104 100644 (file)
--- a/source/src/qt/hc80/MainWindow.cpp
+++ b/source/src/qt/hc80/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -32,16 +32,16 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
 } // retranslateUi
 

diff --git a/source/src/qt/msx1/CMakeLists.txt b/source/src/qt/msx1/CMakeLists.txt
index 493949e..1dbeb0a 100644 (file)
--- a/source/src/qt/msx1/CMakeLists.txt
+++ b/source/src/qt/msx1/CMakeLists.txt
@@ -3,7 +3,11 @@ message("* qt/msx1")
 set(s_qt_msx1_headers
          menuclasses.h
 )
-QT4_WRAP_CPP(s_qt_msx1_headers_MOC ${s_qt_msx1_headers})
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_msx1_headers_MOC ${s_qt_msx1_headers})
+else()
+  QT4_WRAP_CPP(s_qt_msx1_headers_MOC ${s_qt_msx1_headers})
+endif()
 
 add_library(qt_msx1
          MainWindow.cpp

diff --git a/source/src/qt/msx1/MainWindow.cpp b/source/src/qt/msx1/MainWindow.cpp
index 9e62a14..40fbf1f 100644 (file)
--- a/source/src/qt/msx1/MainWindow.cpp
+++ b/source/src/qt/msx1/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -31,16 +31,16 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
 } // retranslateUi
 

diff --git a/source/src/qt/mz2500/CMakeLists.txt b/source/src/qt/mz2500/CMakeLists.txt
new file mode 100644 (file)
index 0000000..cbdc2e3
--- /dev/null
+++ b/source/src/qt/mz2500/CMakeLists.txt
@@ -0,0 +1,13 @@
+message("* qt/mz2500")
+
+set(s_qt_mz2500_headers
+         menuclasses.h
+)
+QT4_WRAP_CPP(s_qt_mz2500_headers_MOC ${s_qt_mz2500_headers})
+
+add_library(qt_mz2500
+         MainWindow.cpp
+         ${s_qt_mz2500_headers_MOC}
+)
+
+

diff --git a/source/src/qt/mz2500/MainWindow.cpp b/source/src/qt/mz2500/MainWindow.cpp
new file mode 100644 (file)
index 0000000..a8332b0
--- /dev/null
+++ b/source/src/qt/mz2500/MainWindow.cpp
@@ -0,0 +1,79 @@
+/*
+ * Common Source code Project:
+ * Ui->Qt->MainWindow for X1TurboZ .
+ * (C) 2015 K.Ohta <whatisthis.sowhat _at_ gmail.com>
+ *   License : GPLv2
+ *   History :
+ * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
+ */
+
+#include <QVariant>
+#include <QtGui>
+#include "menuclasses.h"
+#include "emu.h"
+#include "qt_main.h"
+
+//QT_BEGIN_NAMESPACE
+
+       
+
+void META_MainWindow::setupUI_Emu(void)
+{
+   menuMachine->setVisible(false);
+}
+
+void META_MainWindow::retranslateUi(void)
+{
+  retranslateControlMenu("Reset",  true);
+  retranslateFloppyMenu(0, 1);
+  retranslateFloppyMenu(1, 2);
+  retranslateFloppyMenu(2, 3);
+  retranslateFloppyMenu(3, 4);
+#if defined(USE_QD1)
+   retranslateQuickDiskMenu(0,0);
+#endif   
+  retranslateCMTMenu();
+  retranslateSoundMenu();
+  retranslateScreenMenu();
+   
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
+  
+  actionReset->setText(QApplication::translate("MainWindow", "IPL Reset", 0));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
+  
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
+  
+
+  //   actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
+
+   menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+   menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
+       
+       
+//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0));
+//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0));
+       
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
+   // Set Labels
+} // retranslateUi
+
+
+
+META_MainWindow::META_MainWindow(QWidget *parent) : Ui_MainWindow(parent)
+{
+   setupUI_Emu();
+   retranslateUi();
+}
+
+
+META_MainWindow::~META_MainWindow()
+{
+}
+
+//QT_END_NAMESPACE
+
+
+

diff --git a/source/src/qt/mz2500/menuclasses.h b/source/src/qt/mz2500/menuclasses.h
new file mode 100644 (file)
index 0000000..3608586
--- /dev/null
+++ b/source/src/qt/mz2500/menuclasses.h
@@ -0,0 +1,27 @@
+
+#ifndef _CSP_QT_MENUCLASSES_H
+#define _CSP_QT_MENUCLASSES_H
+
+#include "mainwidget.h"
+// This extends class CSP_MainWindow as Ui_MainWindow.
+// You may use this as 
+QT_BEGIN_NAMESPACE
+
+
+
+class Ui_MainWindow;
+//  wrote of X1 Specific menu.
+class META_MainWindow : public Ui_MainWindow {
+  Q_OBJECT
+ protected:
+  void setupUI_Emu(void);
+   void retranslateUi(void);
+ public:
+  META_MainWindow(QWidget *parent = 0);
+  ~META_MainWindow();
+ public slots:
+};
+
+QT_END_NAMESPACE
+
+#endif // END

diff --git a/source/src/qt/mz700/MainWindow.cpp b/source/src/qt/mz700/MainWindow.cpp
index 0b7f177..e162a45 100644 (file)
--- a/source/src/qt/mz700/MainWindow.cpp
+++ b/source/src/qt/mz700/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -39,8 +39,8 @@ void Object_Menu_Control_MZ700::do_monitor_type(void)
 
 void META_MainWindow::set_monitor_type(int num)
 {
-   if((num < 0) || (num >= USE_MONITOR_TYPE)) return;
 #ifdef USE_MONITOR_TYPE
+   if((num < 0) || (num >= USE_MONITOR_TYPE)) return;
    if(emu) {
       config.monitor_type = num;
       emu->LockVM();
@@ -101,24 +101,24 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  //   actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+  //   actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
 
 #if defined(USE_QD1)   
-   menuQD[0]->setTitle(QApplication::translate("MainWindow", "QD1", 0, QApplication::UnicodeUTF8));
-   menuWrite_Protection_QD[0]->setTitle(QApplication::translate("MainWindow", "Write Protection", 0, QApplication::UnicodeUTF8));
+   menuQD[0]->setTitle(QApplication::translate("MainWindow", "QD1", 0));
+   menuWrite_Protection_QD[0]->setTitle(QApplication::translate("MainWindow", "Write Protection", 0));
 #endif   
 #if defined(USE_QD2)   
-   menuQD[1]->setTitle(QApplication::translate("MainWindow", "QD2", 0, QApplication::UnicodeUTF8));
-   menuWrite_Protection_QD[1]->setTitle(QApplication::translate("MainWindow", "Write Protection", 0, QApplication::UnicodeUTF8));
+   menuQD[1]->setTitle(QApplication::translate("MainWindow", "QD2", 0));
+   menuWrite_Protection_QD[1]->setTitle(QApplication::translate("MainWindow", "Write Protection", 0));
 #endif   
 #if defined(_MZ800)
        menuBootMode->setTitle("BOOT Mode");
@@ -126,21 +126,21 @@ void META_MainWindow::retranslateUi(void)
        actionBootMode[1]->setText(QString::fromUtf8("MZ-700"));
    
        menuMonitorType->setTitle("Monitor Type");
-       actionMonitorType[0]->setText(QApplication::translate("MainWindow", "Color", 0, QApplication::UnicodeUTF8));
-       actionMonitorType[1]->setText(QApplication::translate("MainWindow", "Monochrome", 0, QApplication::UnicodeUTF8));
-       menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));;
+       actionMonitorType[0]->setText(QApplication::translate("MainWindow", "Color", 0));
+       actionMonitorType[1]->setText(QApplication::translate("MainWindow", "Monochrome", 0));
+       menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));;
 
 #endif
-       menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-       menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+       menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+       menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
        
        
-//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0, QApplication::UnicodeUTF8));
-//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0, QApplication::UnicodeUTF8));
+//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0));
+//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0));
        
-   menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
+   menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
 } // retranslateUi
 

diff --git a/source/src/qt/mz80k/MainWindow.cpp b/source/src/qt/mz80k/MainWindow.cpp
index 4ad409b..03fb066 100644 (file)
--- a/source/src/qt/mz80k/MainWindow.cpp
+++ b/source/src/qt/mz80k/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -36,26 +36,26 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
-  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  //   actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+  //   actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
 
-   menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-   menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+   menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+   menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
        
        
-//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0, QApplication::UnicodeUTF8));
-//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0, QApplication::UnicodeUTF8));
+//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0));
+//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0));
        
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
 } // retranslateUi
 

diff --git a/source/src/qt/pc6001/MainWindow.cpp b/source/src/qt/pc6001/MainWindow.cpp
index dae1464..8cc8d21 100644 (file)
--- a/source/src/qt/pc6001/MainWindow.cpp
+++ b/source/src/qt/pc6001/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -71,32 +71,32 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 #ifdef USE_DEBUGGER
-       actionDebugger_1->setText(QApplication::translate("MainWindow", "Main CPU", 0, QApplication::UnicodeUTF8));
-       actionDebugger_2->setText(QApplication::translate("MainWindow", "Sub  CPU", 0, QApplication::UnicodeUTF8));
-       actionDebugger_3->setText(QApplication::translate("MainWindow", "PC-80S31K", 0, QApplication::UnicodeUTF8));
+       actionDebugger_1->setText(QApplication::translate("MainWindow", "Main CPU", 0));
+       actionDebugger_2->setText(QApplication::translate("MainWindow", "Sub  CPU", 0));
+       actionDebugger_3->setText(QApplication::translate("MainWindow", "PC-80S31K", 0));
 #endif 
 
-   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
   // 
-  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
 // End.
 // 
-//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0, QApplication::UnicodeUTF8));
-//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0, QApplication::UnicodeUTF8));
+//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0));
+//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0));
        
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
   
 } // retranslateUi

diff --git a/source/src/qt/pc8801ma/MainWindow.cpp b/source/src/qt/pc8801ma/MainWindow.cpp
index 0fd1af3..1fda8aa 100644 (file)
--- a/source/src/qt/pc8801ma/MainWindow.cpp
+++ b/source/src/qt/pc8801ma/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -76,19 +76,19 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
   // 
-  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
   // PC88 Specified
   menuCpuType->setTitle("CPU Frequency");
   actionCpuType[0]->setText(QString::fromUtf8("8MHz"));
@@ -108,30 +108,30 @@ void META_MainWindow::retranslateUi(void)
 #endif
 
 #if defined(SUPPORT_PC88_OPNA)
-   menuSoundDevice->setTitle(QApplication::translate("MainWindow", "Sound Board", 0, QApplication::UnicodeUTF8));
+   menuSoundDevice->setTitle(QApplication::translate("MainWindow", "Sound Board", 0));
    actionSoundDevice[0]->setText(QString::fromUtf8("PC-8801-23 (OPNA)"));
    actionSoundDevice[1]->setText(QString::fromUtf8("PC-8801-11 (OPN)"));
 #endif
 #ifdef USE_DEBUGGER
-       actionDebugger_1->setText(QApplication::translate("MainWindow", "Main CPU", 0, QApplication::UnicodeUTF8));
-       actionDebugger_2->setText(QApplication::translate("MainWindow", "Sub  CPU", 0, QApplication::UnicodeUTF8));
+       actionDebugger_1->setText(QApplication::translate("MainWindow", "Main CPU", 0));
+       actionDebugger_2->setText(QApplication::translate("MainWindow", "Sub  CPU", 0));
        actionDebugger_3->setVisible(false);
 #endif 
 #if defined(USE_DEVICE_TYPE)
-       actionDeviceType[0]->setText(QApplication::translate("MainWindow", "Joystick", 0, QApplication::UnicodeUTF8));
-       actionDeviceType[1]->setText(QApplication::translate("MainWindow", "Bus Mouse", 0, QApplication::UnicodeUTF8));
-       menuDeviceType->setTitle(QApplication::translate("MainWindow", "Joy Port", 0, QApplication::UnicodeUTF8));
+       actionDeviceType[0]->setText(QApplication::translate("MainWindow", "Joystick", 0));
+       actionDeviceType[1]->setText(QApplication::translate("MainWindow", "Bus Mouse", 0));
+       menuDeviceType->setTitle(QApplication::translate("MainWindow", "Joy Port", 0));
 #endif
-       actionMemoryWait->setText(QApplication::translate("MainWindow", "Wait Memory", 0, QApplication::UnicodeUTF8));
+       actionMemoryWait->setText(QApplication::translate("MainWindow", "Wait Memory", 0));
 // End.
 // 
-//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0, QApplication::UnicodeUTF8));
-//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0, QApplication::UnicodeUTF8));
+//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0));
+//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0));
        
-       menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-       menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+       menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+       menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-       menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+       menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
   
 } // retranslateUi

diff --git a/source/src/qt/pc9801/MainWindow.cpp b/source/src/qt/pc9801/MainWindow.cpp
index d6ab105..b7ca19b 100644 (file)
--- a/source/src/qt/pc9801/MainWindow.cpp
+++ b/source/src/qt/pc9801/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -90,16 +90,16 @@ void META_MainWindow::retranslateUi(void)
 #endif
 #if defined(_PC9801) || defined(_PC9801E)
    // Drive 3,4
-   menuFD[2]->setTitle(QApplication::translate("MainWindow", "2DD-1", 0, QApplication::UnicodeUTF8));
-   menuFD[3]->setTitle(QApplication::translate("MainWindow", "2DD-2", 0, QApplication::UnicodeUTF8));
+   menuFD[2]->setTitle(QApplication::translate("MainWindow", "2DD-1", 0));
+   menuFD[3]->setTitle(QApplication::translate("MainWindow", "2DD-2", 0));
    // Drive 5, 6
-   menuFD[4]->setTitle(QApplication::translate("MainWindow", "2D-1", 0, QApplication::UnicodeUTF8));
-   menuFD[5]->setTitle(QApplication::translate("MainWindow", "2D-2", 0, QApplication::UnicodeUTF8));
+   menuFD[4]->setTitle(QApplication::translate("MainWindow", "2D-1", 0));
+   menuFD[5]->setTitle(QApplication::translate("MainWindow", "2D-2", 0));
 #elif defined(_PC98DO)
-   menuFD[0]->setTitle(QApplication::translate("MainWindow", "PC98-1", 0, QApplication::UnicodeUTF8));
-   menuFD[1]->setTitle(QApplication::translate("MainWindow", "PC98-2", 0, QApplication::UnicodeUTF8));
-   menuFD[2]->setTitle(QApplication::translate("MainWindow", "PC88-1", 0, QApplication::UnicodeUTF8));
-   menuFD[3]->setTitle(QApplication::translate("MainWindow", "PC88-2", 0, QApplication::UnicodeUTF8));
+   menuFD[0]->setTitle(QApplication::translate("MainWindow", "PC98-1", 0));
+   menuFD[1]->setTitle(QApplication::translate("MainWindow", "PC98-2", 0));
+   menuFD[2]->setTitle(QApplication::translate("MainWindow", "PC88-1", 0));
+   menuFD[3]->setTitle(QApplication::translate("MainWindow", "PC88-2", 0));
 #endif
    
 #if defined(USE_TAPE)
@@ -110,32 +110,32 @@ void META_MainWindow::retranslateUi(void)
 #ifdef USE_DEBUGGER
 
 #if defined(_PC9801) || defined(_PC9801)
-       actionDebugger_1->setText(QApplication::translate("MainWindow", "Main CPU", 0, QApplication::UnicodeUTF8));
-       actionDebugger_2->setText(QApplication::translate("MainWindow", "PC-80S31K CPU", 0, QApplication::UnicodeUTF8));
+       actionDebugger_1->setText(QApplication::translate("MainWindow", "Main CPU", 0));
+       actionDebugger_2->setText(QApplication::translate("MainWindow", "PC-80S31K CPU", 0));
        actionDebugger_3->setVisible(false);
 #elif defined(_PC98DO)
-       actionDebugger_1->setText(QApplication::translate("MainWindow", "PC-9801 Main CPU", 0, QApplication::UnicodeUTF8));
-       actionDebugger_2->setText(QApplication::translate("MainWindow", "PC-8801 Main CPU", 0, QApplication::UnicodeUTF8));
-       actionDebugger_3->setText(QApplication::translate("MainWindow", "PC-8801 Sub CPU", 0, QApplication::UnicodeUTF8));
+       actionDebugger_1->setText(QApplication::translate("MainWindow", "PC-9801 Main CPU", 0));
+       actionDebugger_2->setText(QApplication::translate("MainWindow", "PC-8801 Main CPU", 0));
+       actionDebugger_3->setText(QApplication::translate("MainWindow", "PC-8801 Sub CPU", 0));
 #else
-       actionDebugger_1->setText(QApplication::translate("MainWindow", "Main CPU", 0, QApplication::UnicodeUTF8));
+       actionDebugger_1->setText(QApplication::translate("MainWindow", "Main CPU", 0));
        actionDebugger_2->setVisible(false);
        actionDebugger_3->setVisible(false);
 #endif 
 #endif   
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
   // 
-  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
 
 #ifdef USE_CPU_TYPE
   menuCpuType->setTitle("CPU Frequency");
@@ -159,17 +159,17 @@ void META_MainWindow::retranslateUi(void)
 # endif
 #endif
 #ifdef _PC98DO
-       actionMemoryWait->setText(QApplication::translate("MainWindow", "Memory Wait", 0, QApplication::UnicodeUTF8));;
+       actionMemoryWait->setText(QApplication::translate("MainWindow", "Memory Wait", 0));;
 #endif
  // End.
  // 
-//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0, QApplication::UnicodeUTF8));
-//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0, QApplication::UnicodeUTF8));
+//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0));
+//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0));
        
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
   
 } // retranslateUi

diff --git a/source/src/qt/pc98ha/MainWindow.cpp b/source/src/qt/pc98ha/MainWindow.cpp
index 6e788a8..db645d0 100644 (file)
--- a/source/src/qt/pc98ha/MainWindow.cpp
+++ b/source/src/qt/pc98ha/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -34,28 +34,28 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
  
-  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
   // 
-  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
 
  // End.
  // 
-//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0, QApplication::UnicodeUTF8));
-//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0, QApplication::UnicodeUTF8));
+//        menuRecord->setTitle(QApplication::translate("MainWindow", "Record", 0));
+//        menuRecoad_as_movie->setTitle(QApplication::translate("MainWindow", "Recoad as movie", 0));
        
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
   
 } // retranslateUi

diff --git a/source/src/qt/pcengine/MainWindow.cpp b/source/src/qt/pcengine/MainWindow.cpp
index 95a0845..1c0c880 100644 (file)
--- a/source/src/qt/pcengine/MainWindow.cpp
+++ b/source/src/qt/pcengine/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -28,16 +28,16 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
 } // retranslateUi
 
 

diff --git a/source/src/qt/pyuta/MainWindow.cpp b/source/src/qt/pyuta/MainWindow.cpp
index f5fa234..86d3387 100644 (file)
--- a/source/src/qt/pyuta/MainWindow.cpp
+++ b/source/src/qt/pyuta/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -29,16 +29,16 @@ void META_MainWindow::retranslateUi(void)
   retranslateSoundMenu();
   retranslateScreenMenu();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
 } // retranslateUi
 
 

diff --git a/source/src/qt/tk80bs/MainWindow.cpp b/source/src/qt/tk80bs/MainWindow.cpp
index 7e6badb..1a8115c 100644 (file)
--- a/source/src/qt/tk80bs/MainWindow.cpp
+++ b/source/src/qt/tk80bs/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -32,25 +32,25 @@ void META_MainWindow::retranslateUi(void)
   actionBootMode[0]->setText(QString::fromUtf8("L1 BASIC"));
   actionBootMode[1]->setText(QString::fromUtf8("L2 BASIC"));   
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0, QApplication::UnicodeUTF8));
+  actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0, QApplication::UnicodeUTF8));
-  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0, QApplication::UnicodeUTF8));
+   //  actionStart_Record_Movie->setText(QApplication::translate("MainWindow", "Start Record Movie", 0));
+  //      actionStop_Record_Movie->setText(QApplication::translate("MainWindow", "Stop Record Movie", 0));
   // 
-  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0, QApplication::UnicodeUTF8));
-  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0, QApplication::UnicodeUTF8));
+  menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
+  menuStretch_Mode->setTitle(QApplication::translate("MainWindow", "Stretch Mode", 0));
   // FP1100 Specified
        
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
   
 } // retranslateUi

diff --git a/source/src/qt/x1turboz/MainWindow.cpp b/source/src/qt/x1turboz/MainWindow.cpp
index 9974a8f..d260475 100644 (file)
--- a/source/src/qt/x1turboz/MainWindow.cpp
+++ b/source/src/qt/x1turboz/MainWindow.cpp
@@ -7,7 +7,7 @@
  * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
  */
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QtGui>
 #include "menuclasses.h"
 #include "emu.h"
@@ -171,41 +171,41 @@ void META_MainWindow::retranslateUi(void)
 #if defined(_X1TWIN)
      retranslateCartMenu(0, 1);
 #endif
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
 
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
    // Set Labels
-  menu_Emu_SoundDevice->setTitle(QApplication::translate("MainWindow", "Sound Device", 0, QApplication::UnicodeUTF8));
-  action_Emu_SoundDevice[0]->setText(QApplication::translate("MainWindow", "PSG", 0, QApplication::UnicodeUTF8));
-  action_Emu_SoundDevice[1]->setText(QApplication::translate("MainWindow", "CZ-8BS1 Single", 0, QApplication::UnicodeUTF8));
-  action_Emu_SoundDevice[2]->setText(QApplication::translate("MainWindow", "CZ-8BS1 Double", 0, QApplication::UnicodeUTF8));
+  menu_Emu_SoundDevice->setTitle(QApplication::translate("MainWindow", "Sound Device", 0));
+  action_Emu_SoundDevice[0]->setText(QApplication::translate("MainWindow", "PSG", 0));
+  action_Emu_SoundDevice[1]->setText(QApplication::translate("MainWindow", "CZ-8BS1 Single", 0));
+  action_Emu_SoundDevice[2]->setText(QApplication::translate("MainWindow", "CZ-8BS1 Double", 0));
 
 #if defined(_X1TURBOZ)
-  menu_Emu_DisplayMode->setTitle(QApplication::translate("MainWindow", "Display Mode", 0, QApplication::UnicodeUTF8));
-  action_Emu_DisplayMode[0]->setText(QApplication::translate("MainWindow", "High Resolution (400line)", 0, QApplication::UnicodeUTF8));
-  action_Emu_DisplayMode[1]->setText(QApplication::translate("MainWindow", "Standarsd Resolution (200line)", 0, QApplication::UnicodeUTF8));
+  menu_Emu_DisplayMode->setTitle(QApplication::translate("MainWindow", "Display Mode", 0));
+  action_Emu_DisplayMode[0]->setText(QApplication::translate("MainWindow", "High Resolution (400line)", 0));
+  action_Emu_DisplayMode[1]->setText(QApplication::translate("MainWindow", "Standarsd Resolution (200line)", 0));
 #endif
 #if defined(USE_DEVICE_TYPE)
-  menuDeviceType->setTitle(QApplication::translate("MainWindow", "Keyboard Mode", 0, QApplication::UnicodeUTF8));
-  actionDeviceType[0]->setText(QApplication::translate("MainWindow", "Mode A", 0, QApplication::UnicodeUTF8));
-  actionDeviceType[1]->setText(QApplication::translate("MainWindow", "Mode B", 0, QApplication::UnicodeUTF8));
+  menuDeviceType->setTitle(QApplication::translate("MainWindow", "Keyboard Mode", 0));
+  actionDeviceType[0]->setText(QApplication::translate("MainWindow", "Mode A", 0));
+  actionDeviceType[1]->setText(QApplication::translate("MainWindow", "Mode B", 0));
 #endif
 #if defined(USE_DRIVE_TYPE)
-  menuDriveType->setTitle(QApplication::translate("MainWindow", "Floppy Type", 0, QApplication::UnicodeUTF8));
-  actionDriveType[0]->setText(QApplication::translate("MainWindow", "2D", 0, QApplication::UnicodeUTF8));
-  actionDriveType[1]->setText(QApplication::translate("MainWindow", "2HD", 0, QApplication::UnicodeUTF8));
+  menuDriveType->setTitle(QApplication::translate("MainWindow", "Floppy Type", 0));
+  actionDriveType[0]->setText(QApplication::translate("MainWindow", "2D", 0));
+  actionDriveType[1]->setText(QApplication::translate("MainWindow", "2HD", 0));
 #endif
 #ifdef USE_DEBUGGER
-       actionDebugger_1->setText(QApplication::translate("MainWindow", "Main CPU", 0, QApplication::UnicodeUTF8));
-       actionDebugger_2->setText(QApplication::translate("MainWindow", "Sub CPU", 0, QApplication::UnicodeUTF8));
-       actionDebugger_3->setText(QApplication::translate("MainWindow", "Keyboard CPU", 0, QApplication::UnicodeUTF8));
+       actionDebugger_1->setText(QApplication::translate("MainWindow", "Main CPU", 0));
+       actionDebugger_2->setText(QApplication::translate("MainWindow", "Sub CPU", 0));
+       actionDebugger_3->setText(QApplication::translate("MainWindow", "Keyboard CPU", 0));
 #endif 
    
 } // retranslateUi

diff --git a/source/src/vm/mc6809.cpp b/source/src/vm/mc6809.cpp
index 8860052..4a5ccc5 100644 (file)
--- a/source/src/vm/mc6809.cpp
+++ b/source/src/vm/mc6809.cpp
@@ -1013,13 +1013,15 @@ static const _TCHAR *const m6809_regs_te[16] =
        _T("A"), _T("B"), _T("CC"), _T("DP"), _T("inv"), _T("inv"), _T("inv"), _T("inv")
 };
 
-uint32 cpu_disassemble_m6809(_TCHAR *buffer, uint32 pc, const uint8 *oprom, const uint8 *opram)
+uint32 MC6809::cpu_disassemble_m6809(_TCHAR *buffer, uint32 pc, const uint8 *oprom, const uint8 *opram)
 {
        uint8 opcode, mode, pb, pbm, reg;
        const uint8 *operandarray;
        unsigned int ea;//, flags;
-       int numoperands, offset, indirect;
-       int i, p = 0, page = 0, opcode_found = FALSE;
+       int numoperands, offset;
+       int i, p = 0, page = 0;
+       bool opcode_found = false;
+       bool indirect;
 
        do {
                opcode = oprom[p++];
@@ -1029,7 +1031,7 @@ uint32 cpu_disassemble_m6809(_TCHAR *buffer, uint32 pc, const uint8 *oprom, cons
                                break;
 
                if (i < m6809_numops[page])
-                       opcode_found = TRUE;
+                       opcode_found = true;
                else
                {
                        _stprintf(buffer, _T("Illegal Opcode %02X"), opcode);
@@ -1039,7 +1041,7 @@ uint32 cpu_disassemble_m6809(_TCHAR *buffer, uint32 pc, const uint8 *oprom, cons
                if (m6809_pgpointers[page][i].mode >= PG1)
                {
                        page = m6809_pgpointers[page][i].mode - PG1 + 1;
-                       opcode_found = FALSE;
+                       opcode_found = false;
                }
        } while (!opcode_found);
 
@@ -1131,7 +1133,7 @@ uint32 cpu_disassemble_m6809(_TCHAR *buffer, uint32 pc, const uint8 *oprom, cons
                pb = operandarray[0];
                reg = (pb >> 5) & 3;
                pbm = pb & 0x8f;
-               indirect = ((pb & 0x90) == 0x90 )? TRUE : FALSE;
+               indirect = ((pb & 0x90) == 0x90 )? true : false;
 
                // open brackets if indirect
                if (indirect && pbm != 0x80 && pbm != 0x82)

diff --git a/source/src/vm/mc6809.h b/source/src/vm/mc6809.h
index f7b2908..a9cff15 100644 (file)
--- a/source/src/vm/mc6809.h
+++ b/source/src/vm/mc6809.h
@@ -436,6 +436,7 @@ public:
        bool debug_write_reg(_TCHAR *reg, uint32 data);
        void debug_regs_info(_TCHAR *buffer, size_t buffer_len);
        int debug_dasm(uint32 pc, _TCHAR *buffer, size_t buffer_len);
+       uint32 cpu_disassemble_m6809(_TCHAR *buffer, uint32 pc, const uint8 *oprom, const uint8 *opram);
 #endif
        // common functions
        void reset();