From 6196c1f546bbedb2291b843e6de07b60efb6627a Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Wed, 18 Nov 2020 22:18:07 -0330 Subject: [PATCH] Fix some clang warnings and minor typo. --- src/debugger/gui/Cart3EWidget.cxx | 2 +- src/debugger/gui/RomListWidget.cxx | 2 +- src/gui/VideoAudioDialog.hxx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/debugger/gui/Cart3EWidget.cxx b/src/debugger/gui/Cart3EWidget.cxx index 910f03368..9e0822b51 100644 --- a/src/debugger/gui/Cart3EWidget.cxx +++ b/src/debugger/gui/Cart3EWidget.cxx @@ -117,7 +117,7 @@ void Cartridge3EWidget::loadConfig() myBankWidgets[1]->setSelectedIndex(bank - myCart.romBankCount(), oldBank != bank); } - CartDebugWidget::loadConfig(); + CartDebugWidget::loadConfig(); // Intentionally calling grand-parent method } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/debugger/gui/RomListWidget.cxx b/src/debugger/gui/RomListWidget.cxx index c06675e32..868b72cdf 100644 --- a/src/debugger/gui/RomListWidget.cxx +++ b/src/debugger/gui/RomListWidget.cxx @@ -468,7 +468,7 @@ string RomListWidget::getToolTip(const Common::Point& pos) const const string bytes = myDisasm->list[idx.y].bytes; - if(bytes.length() < size_t(idx.x + 1)) + if(static_cast(bytes.length()) < idx.x + 1) return EmptyString; Int32 val; diff --git a/src/gui/VideoAudioDialog.hxx b/src/gui/VideoAudioDialog.hxx index 0c8c44bf7..550617d2d 100644 --- a/src/gui/VideoAudioDialog.hxx +++ b/src/gui/VideoAudioDialog.hxx @@ -16,7 +16,7 @@ //============================================================================ #ifndef VIDEOAUDIO_DIALOG_HXX -#define D +#define VIDEOAUDIO_DIALOG_HXX class CommandSender; class CheckboxWidget; @@ -38,7 +38,7 @@ class VideoAudioDialog : public Dialog { public: VideoAudioDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, - int max_w, int max_h); + int max_w, int max_h); ~VideoAudioDialog() override = default; private: