• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revision024a5ebd24cb67e31275e2cbe1f79f793a24ea83 (tree)
Time2018-05-29 04:47:07
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[VM][Qt] Fix FTBFSs.

Change Summary

Incremental Difference

--- a/source/src/qt/common/menu_flags.cpp
+++ b/source/src/qt/common/menu_flags.cpp
@@ -302,8 +302,8 @@ USING_FLAGS_EXT::USING_FLAGS_EXT(config_t *cfg) : USING_FLAGS(cfg)
302302 #endif
303303 #if defined(USE_BINARY_FILE)
304304 use_binary_file = true;
305- max_binary = USE_BINARY;
306- base_binary_num = BASE_BINARY_NUM;
305+ max_binary = USE_BINARY_FILE;
306+ base_binary_num = BASE_BINARY_FILE_NUM;
307307 #endif
308308 #if defined(USE_BUBBLE)
309309 use_bubble = true;
--- a/source/src/qt/machines/babbage2nd/MainWindow.cpp
+++ b/source/src/qt/machines/babbage2nd/MainWindow.cpp
@@ -15,6 +15,7 @@
1515 #include "emu.h"
1616 #include "qt_main.h"
1717 #include "../../vm/babbage2nd/babbage2nd.h"
18+#include "menu_binary.h"
1819
1920 //QT_BEGIN_NAMESPACE
2021
--- a/source/src/qt/machines/ex80/MainWindow.cpp
+++ b/source/src/qt/machines/ex80/MainWindow.cpp
@@ -15,7 +15,7 @@
1515 #include "commonclasses.h"
1616 #include "menuclasses.h"
1717 #include "qt_main.h"
18-
18+#include "menu_binary.h"
1919
2020 void Action_Control_EX80::do_set_sw1()
2121 {
--- a/source/src/qt/machines/familybasic/MainWindow.cpp
+++ b/source/src/qt/machines/familybasic/MainWindow.cpp
@@ -10,6 +10,7 @@
1010 #include <QApplication>
1111 #include <QVariant>
1212 #include <QtGui>
13+#include <QMenu>
1314 #include "emu.h"
1415 #include "commonclasses.h"
1516 #include "menuclasses.h"
--- a/source/src/qt/machines/smb80te/MainWindow.cpp
+++ b/source/src/qt/machines/smb80te/MainWindow.cpp
@@ -14,6 +14,7 @@
1414 #include "menuclasses.h"
1515 #include "emu.h"
1616 #include "qt_main.h"
17+#include "menu_binary.h"
1718
1819 //QT_BEGIN_NAMESPACE
1920 extern config_t config;
--- a/source/src/qt/machines/tk80bs/MainWindow.cpp
+++ b/source/src/qt/machines/tk80bs/MainWindow.cpp
@@ -10,12 +10,15 @@
1010 #include <QApplication>
1111 #include <QVariant>
1212 #include <QtGui>
13+#include <QMenu>
1314
1415 #include "config.h"
1516 #include "commonclasses.h"
1617 #include "menuclasses.h"
1718 #include "emu.h"
1819 #include "qt_main.h"
20+#include "menu_cmt.h"
21+#include "menu_binary.h"
1922
2023 extern config_t config;
2124 //QT_BEGIN_NAMESPACE
@@ -64,10 +67,10 @@ void META_MainWindow::retranslateUi(void)
6467 #endif
6568 action_DipSWs[0]->setText(QApplication::translate("MachineTK80BS", "STEP/AUTO", 0));
6669 action_DipSWs[0]->setToolTip(QApplication::translate("MachineTK80BS", "If enabled, interrupt per instruction.\nUseful for debugging.", 0));
67- action_DipSWs[0]->setToolTipVisible(true);
70+ action_DipSWs[0]->setVisible(true);
6871
6972 menuBootMode->setTitle(QApplication::translate("MachineTK80BS", "BOOT Mode", 0));
70- menuBootMode->setToolTipsVisible(true);
73+ menuBootMode->setVisible(true);
7174 #if defined(_TK80BS)
7275 actionBootMode[0]->setText(QString::fromUtf8("L1 BASIC"));
7376 actionBootMode[1]->setText(QString::fromUtf8("L2 BASIC"));
@@ -93,16 +96,16 @@ void META_MainWindow::setupUI_Emu(void)
9396 menuMachine->addSeparator();
9497 uint32_t _bit = 0x00000001;
9598 for(int i = 0; i < 1; i++) {
96- action_DipSWs[i] = Action_Control_TK(this, using_flags);
99+ action_DipSWs[i] = new Action_Control_TK(this, using_flags);
97100 action_DipSWs[i]->setCheckable(true);
98101 action_DipSWs[i]->setVisible(true);
99102 action_DipSWs[i]->setEnabled(true);
100103 menuMachine->addAction(action_DipSWs[i]);
101104 if((config.dipswitch & _bit) != 0) action_DipSWs[i]->setChecked(true);
102- action_DipSWs[i]->setValue1(i);
105+ action_DipSWs[i]->tk_binds->setValue1(i);
103106 connect(action_DipSWs[i], SIGNAL(toggled(bool)), action_DipSWs[i]->binds, SLOT(do_set_dipsw(bool)));
104107 connect(action_DipSWs[i]->binds, SIGNAL(sig_emu_update_config()), this, SLOT(do_emu_update_config()));
105- bit <<= 1;
108+ _bit <<= 1;
106109 }
107110 }
108111
--- a/source/src/qt/machines/tk80bs/menuclasses.h
+++ b/source/src/qt/machines/tk80bs/menuclasses.h
@@ -3,6 +3,7 @@
33 #define _CSP_QT_MENUCLASSES_H
44
55 #include "mainwidget.h"
6+#include "commonclasses.h"
67 // This extends class CSP_MainWindow as Ui_MainWindow.
78 // You may use this as
89 QT_BEGIN_NAMESPACE
--- a/source/src/qt/machines/ys6464a/MainWindow.cpp
+++ b/source/src/qt/machines/ys6464a/MainWindow.cpp
@@ -16,6 +16,7 @@
1616 #include "emu.h"
1717 #include "qt_main.h"
1818 #include "../../vm/ys6464a/ys6464a.h"
19+#include "menu_binary.h"
1920
2021 //QT_BEGIN_NAMESPACE
2122
Show on old repository browser