[VM][Qt] Fix FTBFSs.

diff --git a/source/src/qt/common/menu_flags.cpp b/source/src/qt/common/menu_flags.cpp
index e534abc..8e5d327 100644 (file)
--- 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)
 #endif
 #if defined(USE_BINARY_FILE)
        use_binary_file = true;
-       max_binary = USE_BINARY;
-       base_binary_num = BASE_BINARY_NUM;
+       max_binary = USE_BINARY_FILE;
+       base_binary_num = BASE_BINARY_FILE_NUM;
 #endif
 #if defined(USE_BUBBLE)
        use_bubble = true;

diff --git a/source/src/qt/machines/babbage2nd/MainWindow.cpp b/source/src/qt/machines/babbage2nd/MainWindow.cpp
index 1aa7aa4..b0a1bfc 100644 (file)
--- a/source/src/qt/machines/babbage2nd/MainWindow.cpp
+++ b/source/src/qt/machines/babbage2nd/MainWindow.cpp
@@ -15,6 +15,7 @@
 #include "emu.h"
 #include "qt_main.h"
 #include "../../vm/babbage2nd/babbage2nd.h"
+#include "menu_binary.h"
 
 //QT_BEGIN_NAMESPACE
 

diff --git a/source/src/qt/machines/ex80/MainWindow.cpp b/source/src/qt/machines/ex80/MainWindow.cpp
index 16717e7..30bb2ee 100644 (file)
--- a/source/src/qt/machines/ex80/MainWindow.cpp
+++ b/source/src/qt/machines/ex80/MainWindow.cpp
@@ -15,7 +15,7 @@
 #include "commonclasses.h"
 #include "menuclasses.h"
 #include "qt_main.h"
-
+#include "menu_binary.h"
 
 void Action_Control_EX80::do_set_sw1()
 {

diff --git a/source/src/qt/machines/familybasic/MainWindow.cpp b/source/src/qt/machines/familybasic/MainWindow.cpp
index b449ca5..1349484 100644 (file)
--- a/source/src/qt/machines/familybasic/MainWindow.cpp
+++ b/source/src/qt/machines/familybasic/MainWindow.cpp
@@ -10,6 +10,7 @@
 #include <QApplication>
 #include <QVariant>
 #include <QtGui>
+#include <QMenu>
 #include "emu.h"
 #include "commonclasses.h"
 #include "menuclasses.h"

diff --git a/source/src/qt/machines/smb80te/MainWindow.cpp b/source/src/qt/machines/smb80te/MainWindow.cpp
index 830e031..8542ce7 100644 (file)
--- a/source/src/qt/machines/smb80te/MainWindow.cpp
+++ b/source/src/qt/machines/smb80te/MainWindow.cpp
@@ -14,6 +14,7 @@
 #include "menuclasses.h"
 #include "emu.h"
 #include "qt_main.h"
+#include "menu_binary.h"
 
 //QT_BEGIN_NAMESPACE
 extern config_t config;

diff --git a/source/src/qt/machines/tk80bs/MainWindow.cpp b/source/src/qt/machines/tk80bs/MainWindow.cpp
index f12262c..f085ff0 100644 (file)
--- a/source/src/qt/machines/tk80bs/MainWindow.cpp
+++ b/source/src/qt/machines/tk80bs/MainWindow.cpp
@@ -10,12 +10,15 @@
 #include <QApplication>
 #include <QVariant>
 #include <QtGui>
+#include <QMenu>
 
 #include "config.h"
 #include "commonclasses.h"
 #include "menuclasses.h"
 #include "emu.h"
 #include "qt_main.h"
+#include "menu_cmt.h"
+#include "menu_binary.h"
 
 extern config_t config;
 //QT_BEGIN_NAMESPACE
@@ -64,10 +67,10 @@ void META_MainWindow::retranslateUi(void)
 #endif
        action_DipSWs[0]->setText(QApplication::translate("MachineTK80BS", "STEP/AUTO", 0));
        action_DipSWs[0]->setToolTip(QApplication::translate("MachineTK80BS", "If enabled, interrupt per instruction.\nUseful for debugging.", 0));
-       action_DipSWs[0]->setToolTipVisible(true);
+       action_DipSWs[0]->setVisible(true);
        
        menuBootMode->setTitle(QApplication::translate("MachineTK80BS", "BOOT Mode", 0));
-       menuBootMode->setToolTipsVisible(true);
+       menuBootMode->setVisible(true);
 #if defined(_TK80BS)
        actionBootMode[0]->setText(QString::fromUtf8("L1 BASIC"));
        actionBootMode[1]->setText(QString::fromUtf8("L2 BASIC"));      
@@ -93,16 +96,16 @@ void META_MainWindow::setupUI_Emu(void)
        menuMachine->addSeparator();
        uint32_t _bit = 0x00000001;
        for(int i = 0; i < 1; i++) {
-               action_DipSWs[i] = Action_Control_TK(this, using_flags);
+               action_DipSWs[i] = new Action_Control_TK(this, using_flags);
                action_DipSWs[i]->setCheckable(true);
                action_DipSWs[i]->setVisible(true);
                action_DipSWs[i]->setEnabled(true);
                menuMachine->addAction(action_DipSWs[i]);
                if((config.dipswitch & _bit) != 0) action_DipSWs[i]->setChecked(true);
-               action_DipSWs[i]->setValue1(i);
+               action_DipSWs[i]->tk_binds->setValue1(i);
                connect(action_DipSWs[i], SIGNAL(toggled(bool)), action_DipSWs[i]->binds, SLOT(do_set_dipsw(bool)));
                connect(action_DipSWs[i]->binds, SIGNAL(sig_emu_update_config()), this, SLOT(do_emu_update_config()));
-               bit <<= 1;
+               _bit <<= 1;
        }
 }
 

diff --git a/source/src/qt/machines/tk80bs/menuclasses.h b/source/src/qt/machines/tk80bs/menuclasses.h
index 5bfc2e4..ef195fe 100644 (file)
--- a/source/src/qt/machines/tk80bs/menuclasses.h
+++ b/source/src/qt/machines/tk80bs/menuclasses.h
@@ -3,6 +3,7 @@
 #define _CSP_QT_MENUCLASSES_H
 
 #include "mainwidget.h"
+#include "commonclasses.h"
 // This extends class CSP_MainWindow as Ui_MainWindow.
 // You may use this as 
 QT_BEGIN_NAMESPACE

diff --git a/source/src/qt/machines/ys6464a/MainWindow.cpp b/source/src/qt/machines/ys6464a/MainWindow.cpp
index 3a359a0..ff001e7 100644 (file)
--- a/source/src/qt/machines/ys6464a/MainWindow.cpp
+++ b/source/src/qt/machines/ys6464a/MainWindow.cpp
@@ -16,6 +16,7 @@
 #include "emu.h"
 #include "qt_main.h"
 #include "../../vm/ys6464a/ys6464a.h"
+#include "menu_binary.h"
 
 //QT_BEGIN_NAMESPACE