diff --git a/src/debugger/gui/AmigaMouseWidget.cxx b/src/debugger/gui/AmigaMouseWidget.cxx
index a2dd9ce4a..67ad33f64 100644
--- a/src/debugger/gui/AmigaMouseWidget.cxx
+++ b/src/debugger/gui/AmigaMouseWidget.cxx
@@ -17,13 +17,14 @@
#include "AmigaMouseWidget.hxx"
-AmigaMouseWidget::AmigaMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
- Controller& controller)
+AmigaMouseWidget::AmigaMouseWidget(GuiObject* boss, const GUI::Font& font,
+ int x, int y, Controller& controller)
: PointingDeviceWidget(boss, font, x, y, controller)
-{}
+{
+}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt8 AmigaMouseWidget::getGrayCodeTable(const int index, const int direction)
{
return myGrayCodeTable[index];
-}
\ No newline at end of file
+}
diff --git a/src/debugger/gui/AmigaMouseWidget.hxx b/src/debugger/gui/AmigaMouseWidget.hxx
index cc72524f7..853b569bf 100644
--- a/src/debugger/gui/AmigaMouseWidget.hxx
+++ b/src/debugger/gui/AmigaMouseWidget.hxx
@@ -23,24 +23,23 @@
class AmigaMouseWidget : public PointingDeviceWidget
{
-public:
- AmigaMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
- Controller& controller);
+ public:
+ AmigaMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
+ Controller& controller);
- virtual ~AmigaMouseWidget() = default;
+ virtual ~AmigaMouseWidget() = default;
-private:
- uInt8 myGrayCodeTable[4] = { 0b00, 0b10, 0b11, 0b01 };
+ private:
+ uInt8 myGrayCodeTable[4] = { 0b00, 0b10, 0b11, 0b01 };
- uInt8 getGrayCodeTable(const int index, const int direction);
+ uInt8 getGrayCodeTable(const int index, const int direction) override;
- // Following constructors and assignment operators not supported
- AmigaMouseWidget() = delete;
- AmigaMouseWidget(const AmigaMouseWidget&) = delete;
- AmigaMouseWidget(AmigaMouseWidget&&) = delete;
- AmigaMouseWidget& operator=(const AmigaMouseWidget&) = delete;
- AmigaMouseWidget& operator=(AmigaMouseWidget&&) = delete;
+ // Following constructors and assignment operators not supported
+ AmigaMouseWidget() = delete;
+ AmigaMouseWidget(const AmigaMouseWidget&) = delete;
+ AmigaMouseWidget(AmigaMouseWidget&&) = delete;
+ AmigaMouseWidget& operator=(const AmigaMouseWidget&) = delete;
+ AmigaMouseWidget& operator=(AmigaMouseWidget&&) = delete;
};
#endif
-
diff --git a/src/debugger/gui/AtariMouseWidget.cxx b/src/debugger/gui/AtariMouseWidget.cxx
index 3056c2423..a53c1e123 100644
--- a/src/debugger/gui/AtariMouseWidget.cxx
+++ b/src/debugger/gui/AtariMouseWidget.cxx
@@ -17,13 +17,14 @@
#include "AtariMouseWidget.hxx"
-AtariMouseWidget::AtariMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
- Controller& controller)
+AtariMouseWidget::AtariMouseWidget(GuiObject* boss, const GUI::Font& font,
+ int x, int y, Controller& controller)
: PointingDeviceWidget(boss, font, x, y, controller)
-{}
+{
+}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt8 AtariMouseWidget::getGrayCodeTable(const int index, const int direction)
{
return myGrayCodeTable[index];
-}
\ No newline at end of file
+}
diff --git a/src/debugger/gui/AtariMouseWidget.hxx b/src/debugger/gui/AtariMouseWidget.hxx
index 821e311f3..9b82dadca 100644
--- a/src/debugger/gui/AtariMouseWidget.hxx
+++ b/src/debugger/gui/AtariMouseWidget.hxx
@@ -23,23 +23,23 @@
class AtariMouseWidget : public PointingDeviceWidget
{
-public:
- AtariMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
- Controller& controller);
+ public:
+ AtariMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
+ Controller& controller);
- virtual ~AtariMouseWidget() = default;
+ virtual ~AtariMouseWidget() = default;
-private:
- uInt8 myGrayCodeTable[4] = { 0b00, 0b01, 0b11, 0b10 };
+ private:
+ uInt8 myGrayCodeTable[4] = { 0b00, 0b01, 0b11, 0b10 };
- uInt8 getGrayCodeTable(const int index, const int direction);
+ uInt8 getGrayCodeTable(const int index, const int direction) override;
- // Following constructors and assignment operators not supported
- AtariMouseWidget() = delete;
- AtariMouseWidget(const AtariMouseWidget&) = delete;
- AtariMouseWidget(AtariMouseWidget&&) = delete;
- AtariMouseWidget& operator=(const AtariMouseWidget&) = delete;
- AtariMouseWidget& operator=(AtariMouseWidget&&) = delete;
+ // Following constructors and assignment operators not supported
+ AtariMouseWidget() = delete;
+ AtariMouseWidget(const AtariMouseWidget&) = delete;
+ AtariMouseWidget(AtariMouseWidget&&) = delete;
+ AtariMouseWidget& operator=(const AtariMouseWidget&) = delete;
+ AtariMouseWidget& operator=(AtariMouseWidget&&) = delete;
};
#endif
diff --git a/src/debugger/gui/PointingDeviceWidget.cxx b/src/debugger/gui/PointingDeviceWidget.cxx
index d52420e9e..e278425a9 100644
--- a/src/debugger/gui/PointingDeviceWidget.cxx
+++ b/src/debugger/gui/PointingDeviceWidget.cxx
@@ -19,8 +19,8 @@
#include "DataGridWidget.hxx"
#include "PointingDeviceWidget.hxx"
-PointingDeviceWidget::PointingDeviceWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
- Controller& controller)
+PointingDeviceWidget::PointingDeviceWidget(GuiObject* boss, const GUI::Font& font,
+ int x, int y, Controller& controller)
: ControllerWidget(boss, font, x, y, controller)
{
bool leftport = controller.jack() == Controller::Left;
@@ -137,6 +137,6 @@ void PointingDeviceWidget::setValue(DataGridWidget* grayValue, const int index,
{
uInt8 grayCode = getGrayCodeTable(index, direction);
- // * 8 = a nasty hack, because the DataGridWidget does not support 2 digit binary output
+ // FIXME * 8 = a nasty hack, because the DataGridWidget does not support 2 digit binary output
grayValue->setList(0, (grayCode & 0b01) + (grayCode & 0b10) * 8);
-}
\ No newline at end of file
+}
diff --git a/src/debugger/gui/PointingDeviceWidget.hxx b/src/debugger/gui/PointingDeviceWidget.hxx
index 5e24f1809..f5be3001f 100644
--- a/src/debugger/gui/PointingDeviceWidget.hxx
+++ b/src/debugger/gui/PointingDeviceWidget.hxx
@@ -25,43 +25,42 @@ class DataGridWidget;
class PointingDeviceWidget : public ControllerWidget
{
-public:
- PointingDeviceWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
- Controller& controller);
+ public:
+ PointingDeviceWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
+ Controller& controller);
- virtual ~PointingDeviceWidget() = default;
+ virtual ~PointingDeviceWidget() = default;
-private:
- enum
- {
- kTBLeft = 'TWlf',
- kTBRight = 'TWrt',
- kTBUp = 'TWup',
- kTBDown = 'TWdn',
- kTBFire = 'TWfr'
- };
- ButtonWidget *myGrayLeft, *myGrayRight;
- DataGridWidget* myGrayValueH;
- ButtonWidget *myGrayUp, *myGrayDown;
- DataGridWidget* myGrayValueV;
- CheckboxWidget* myFire;
+ private:
+ enum {
+ kTBLeft = 'TWlf',
+ kTBRight = 'TWrt',
+ kTBUp = 'TWup',
+ kTBDown = 'TWdn',
+ kTBFire = 'TWfr'
+ };
+ ButtonWidget *myGrayLeft, *myGrayRight;
+ DataGridWidget* myGrayValueH;
+ ButtonWidget *myGrayUp, *myGrayDown;
+ DataGridWidget* myGrayValueV;
+ CheckboxWidget* myFire;
-private:
- virtual uInt8 getGrayCodeTable(const int index, const int direction) = 0;
+ private:
+ virtual uInt8 getGrayCodeTable(const int index, const int direction) = 0;
- void loadConfig() override;
- void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+ void loadConfig() override;
+ void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
- void setGrayCodeH();
- void setGrayCodeV();
- void setValue(DataGridWidget* greyValue, const int index, const int direction);
+ void setGrayCodeH();
+ void setGrayCodeV();
+ void setValue(DataGridWidget* greyValue, const int index, const int direction);
- // Following constructors and assignment operators not supported
- PointingDeviceWidget() = delete;
- PointingDeviceWidget(const PointingDeviceWidget&) = delete;
- PointingDeviceWidget(PointingDeviceWidget&&) = delete;
- PointingDeviceWidget& operator=(const PointingDeviceWidget&) = delete;
- PointingDeviceWidget& operator=(PointingDeviceWidget&&) = delete;
+ // Following constructors and assignment operators not supported
+ PointingDeviceWidget() = delete;
+ PointingDeviceWidget(const PointingDeviceWidget&) = delete;
+ PointingDeviceWidget(PointingDeviceWidget&&) = delete;
+ PointingDeviceWidget& operator=(const PointingDeviceWidget&) = delete;
+ PointingDeviceWidget& operator=(PointingDeviceWidget&&) = delete;
};
-#endif
\ No newline at end of file
+#endif
diff --git a/src/debugger/gui/TrakBallWidget.cxx b/src/debugger/gui/TrakBallWidget.cxx
index 752c8ec3c..eb8701c61 100644
--- a/src/debugger/gui/TrakBallWidget.cxx
+++ b/src/debugger/gui/TrakBallWidget.cxx
@@ -17,15 +17,14 @@
#include "TrakBallWidget.hxx"
-TrakBallWidget::TrakBallWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
- Controller& controller)
+TrakBallWidget::TrakBallWidget(GuiObject* boss, const GUI::Font& font,
+ int x, int y, Controller& controller)
: PointingDeviceWidget(boss, font, x, y, controller)
-{}
+{
+}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt8 TrakBallWidget::getGrayCodeTable(const int index, const int direction)
{
return myGrayCodeTable[(index & 0b1) + direction * 2];
}
-
-
diff --git a/src/debugger/gui/TrakBallWidget.hxx b/src/debugger/gui/TrakBallWidget.hxx
index ef98978cb..b39009702 100644
--- a/src/debugger/gui/TrakBallWidget.hxx
+++ b/src/debugger/gui/TrakBallWidget.hxx
@@ -23,23 +23,23 @@
class TrakBallWidget : public PointingDeviceWidget
{
-public:
- TrakBallWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
- Controller& controller);
+ public:
+ TrakBallWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
+ Controller& controller);
- virtual ~TrakBallWidget() = default;
+ virtual ~TrakBallWidget() = default;
-private:
- uInt8 myGrayCodeTable[4] = { 0b00, 0b10, 0b01, 0b11 };
+ private:
+ uInt8 myGrayCodeTable[4] = { 0b00, 0b10, 0b01, 0b11 };
- uInt8 getGrayCodeTable(const int index, const int direction);
+ uInt8 getGrayCodeTable(const int index, const int direction) override;
- // Following constructors and assignment operators not supported
- TrakBallWidget() = delete;
- TrakBallWidget(const TrakBallWidget&) = delete;
- TrakBallWidget(TrakBallWidget&&) = delete;
- TrakBallWidget& operator=(const TrakBallWidget&) = delete;
- TrakBallWidget& operator=(TrakBallWidget&&) = delete;
+ // Following constructors and assignment operators not supported
+ TrakBallWidget() = delete;
+ TrakBallWidget(const TrakBallWidget&) = delete;
+ TrakBallWidget(TrakBallWidget&&) = delete;
+ TrakBallWidget& operator=(const TrakBallWidget&) = delete;
+ TrakBallWidget& operator=(TrakBallWidget&&) = delete;
};
-#endif
\ No newline at end of file
+#endif
diff --git a/src/windows/Stella.vcxproj b/src/windows/Stella.vcxproj
index 0ea607f30..54e8a5635 100644
--- a/src/windows/Stella.vcxproj
+++ b/src/windows/Stella.vcxproj
@@ -240,6 +240,8 @@
+
+
@@ -286,13 +288,16 @@
+
+
+
@@ -331,9 +336,6 @@
-
-
-
@@ -492,9 +494,6 @@
-
-
-
@@ -515,6 +514,8 @@
+
+
@@ -563,14 +564,17 @@
+
+
+
@@ -625,9 +629,6 @@
-
-
-
@@ -792,7 +793,6 @@
-
diff --git a/src/windows/Stella.vcxproj.filters b/src/windows/Stella.vcxproj.filters
index c40003372..fcedc20ed 100644
--- a/src/windows/Stella.vcxproj.filters
+++ b/src/windows/Stella.vcxproj.filters
@@ -840,22 +840,19 @@
Source Files
-
- Source Files
-
-
+
Source Files\debugger
-
+
Source Files\debugger
-
+
Source Files\debugger
-
+
Source Files\debugger
-
+
Source Files\debugger
@@ -1736,19 +1733,22 @@
Header Files
-
- Header Files\debugger
-
-
- Header Files\debugger
-
-
- Header Files\debugger
-
Header Files\emucore
-
+
+ Header Files\debugger
+
+
+ Header Files\debugger
+
+
+ Header Files\debugger
+
+
+ Header Files\debugger
+
+
Header Files\debugger