Fixed a crash, in Release mode, when the HW labels setting is turned on.

[clinton/Virtual-Jaguar-Rx.git] / src / debugger / debuggertab.cpp

diff --git a/src/debugger/debuggertab.cpp b/src/debugger/debuggertab.cpp
index f9e97ac..032db33 100644 (file)
--- a/src/debugger/debuggertab.cpp
+++ b/src/debugger/debuggertab.cpp
@@ -1,52 +1,83 @@
-//
-// debuggertab.cpp: "Debugger" tab on the settings dialog
-//
-// by Jean-Paul Mari
-//
-// JPM = Jean-Paul Mari <djipi.mari@gmail.com>
-//
-// WHO  WHEN        WHAT
-// ---  ----------  ------------------------------------------------------------
-// JPM  06/19/2016  Created this file
-// JPM  06/19/2016  Soft debugger support
-
-#include "debuggertab.h"
-
-
-DebuggerTab::DebuggerTab(QWidget * parent/*= 0*/): QWidget(parent)
-{
-       QLabel * label3 = new QLabel("Disassembly lines:");
-       edit3 = new QLineEdit("");
-       edit3->setPlaceholderText("Number of disassembly lines");
-       QVBoxLayout * layout1 = new QVBoxLayout;
-       layout1->addWidget(label3);
-
-       QVBoxLayout * layout2 = new QVBoxLayout;
-       layout2->addWidget(edit3);
-
-       QHBoxLayout * layout3 = new QHBoxLayout;
-       layout3->addLayout(layout1);
-       layout3->addLayout(layout2);
-
-       QVBoxLayout * layout4 = new QVBoxLayout;
-       layout4->addLayout(layout3);
-
-       // Checkboxes...
-       displayHWlabels = new QCheckBox(tr("Display HW labels"));
-       disasmopcodes   = new QCheckBox(tr("Display M68000 opcodes"));
-       displayFullSourceFilename = new QCheckBox(tr("Display source filename"));
-       disasmopcodes->setDisabled(false);
-       displayHWlabels->setDisabled(false);
-       displayFullSourceFilename->setDisabled(false);
-
-       layout4->addWidget(disasmopcodes);
-       layout4->addWidget(displayHWlabels);
-       layout4->addWidget(displayFullSourceFilename);
-
-       setLayout(layout4);
-}
-
-
-DebuggerTab::~DebuggerTab()
-{
-}
+//\r
+// debuggertab.cpp: "Debugger" tab on the settings dialog\r
+//\r
+// by Jean-Paul Mari\r
+//\r
+// JPM = Jean-Paul Mari <djipi.mari@gmail.com>\r
+//\r
+// WHO  WHEN        WHAT\r
+// ---  ----------  ------------------------------------------------------------\r
+// JPM  06/19/2016  Created this file\r
+// JPM  06/19/2016  Soft debugger support\r
+\r
+#include "debuggertab.h"\r
+#include "settings.h"\r
+\r
+\r
+DebuggerTab::DebuggerTab(QWidget * parent/*= 0*/): QWidget(parent)\r
+{\r
+       QLabel * label3 = new QLabel("Disassembly lines:");\r
+       edit3 = new QLineEdit("");\r
+       edit3->setPlaceholderText("Number of disassembly lines");\r
+       QVBoxLayout * layout1 = new QVBoxLayout;\r
+       layout1->addWidget(label3);\r
+\r
+       QVBoxLayout * layout2 = new QVBoxLayout;\r
+       layout2->addWidget(edit3);\r
+\r
+       QHBoxLayout * layout3 = new QHBoxLayout;\r
+       layout3->addLayout(layout1);\r
+       layout3->addLayout(layout2);\r
+\r
+       QVBoxLayout * layout4 = new QVBoxLayout;\r
+       layout4->addLayout(layout3);\r
+\r
+       // Checkboxes...\r
+       displayHWlabels = new QCheckBox(tr("Display HW labels"));\r
+       disasmopcodes   = new QCheckBox(tr("Display M68000 opcodes"));\r
+       displayFullSourceFilename = new QCheckBox(tr("Display source filename"));\r
+       disasmopcodes->setDisabled(false);\r
+       displayHWlabels->setDisabled(false);\r
+       displayFullSourceFilename->setDisabled(false);\r
+\r
+       layout4->addWidget(disasmopcodes);\r
+       layout4->addWidget(displayHWlabels);\r
+       layout4->addWidget(displayFullSourceFilename);\r
+\r
+       setLayout(layout4);\r
+}\r
+\r
+\r
+DebuggerTab::~DebuggerTab()\r
+{\r
+}\r
+\r
+\r
+// Save / Update the settings from the tabs dialog\r
+void DebuggerTab::SetSettings(void)\r
+{\r
+       bool ok;\r
+\r
+       //strcpy(vjs.debuggerROMPath, debuggerTab->edit1->text().toUtf8().data());\r
+       //strcpy(vjs.absROMPath, debuggerTab->edit2->text().toUtf8().data());\r
+       vjs.nbrdisasmlines = edit3->text().toUInt(&ok, 10);\r
+       //vjs.allowWritesToROM = debuggerTab->writeROM->isChecked();\r
+       vjs.displayHWlabels = displayHWlabels->isChecked();\r
+       vjs.disasmopcodes = disasmopcodes->isChecked();\r
+       vjs.displayFullSourceFilename = displayFullSourceFilename->isChecked();\r
+}\r
+\r
+\r
+// Load / Update the tabs dialog from the settings\r
+void DebuggerTab::GetSettings(void)\r
+{\r
+       QVariant v(vjs.nbrdisasmlines);\r
+       //debuggerTab->edit1->setText(vjs.debuggerROMPath);\r
+       //debuggerTab->edit2->setText(vjs.absROMPath);\r
+       edit3->setText(v.toString());\r
+       //debuggerTab->writeROM->setChecked(vjs.allowWritesToROM\r
+       displayHWlabels->setChecked(vjs.displayHWlabels);\r
+       disasmopcodes->setChecked(vjs.disasmopcodes);\r
+       displayFullSourceFilename->setChecked(vjs.displayFullSourceFilename);\r
+}\r
+\r