[Scummvm-git-logs] scummvm master -> 52fcf3ef58bd19a2b16f32cc65f9359d04036245

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
52fcf3ef58 BAGEL: Fix some more PVS Studio issues, add some missing override keywords


Commit: 52fcf3ef58bd19a2b16f32cc65f9359d04036245
    https://github.com/scummvm/scummvm/commit/52fcf3ef58bd19a2b16f32cc65f9359d04036245
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-22T23:44:26+01:00

Commit Message:
BAGEL: Fix some more PVS Studio issues, add some missing override keywords

Changed paths:
    engines/bagel/boflib/gfx/text.cpp
    engines/bagel/boflib/gui/button.cpp
    engines/bagel/boflib/gui/button.h
    engines/bagel/boflib/gui/scroll_bar.cpp


diff --git a/engines/bagel/boflib/gfx/text.cpp b/engines/bagel/boflib/gfx/text.cpp
index dde92a414e4..564a7311c99 100644
--- a/engines/bagel/boflib/gfx/text.cpp
+++ b/engines/bagel/boflib/gfx/text.cpp
@@ -341,8 +341,8 @@ ErrorCode CBofText::displayTextEx(CBofBitmap *pBmp, const char *pszText, CBofRec
 		break;
 
 	case JUSTIFY_LEFT:
+		// align left
 		_cPosition.x = 0;
-		align = Graphics::kTextAlignLeft;
 		break;
 
 	case JUSTIFY_RIGHT:
@@ -351,6 +351,7 @@ ErrorCode CBofText::displayTextEx(CBofBitmap *pBmp, const char *pszText, CBofRec
 		break;
 
 	case JUSTIFY_WRAP:
+		// Align left
 		_bMultiLine = true;
 		break;
 	}
diff --git a/engines/bagel/boflib/gui/button.cpp b/engines/bagel/boflib/gui/button.cpp
index 4b405a2819d..87e00878822 100644
--- a/engines/bagel/boflib/gui/button.cpp
+++ b/engines/bagel/boflib/gui/button.cpp
@@ -249,7 +249,7 @@ void CBofRadioButton::onLButtonDown(uint32, CBofPoint *pPoint, void *) {
 	assert(isValidObject(this));
 	assert(pPoint != nullptr);
 
-	if ((_nState != BUTTON_DISABLED) && (_nState == BUTTON_UP)) {
+	if (_nState == BUTTON_UP) {
 		setState(BUTTON_DOWN, true);
 	}
 }
diff --git a/engines/bagel/boflib/gui/button.h b/engines/bagel/boflib/gui/button.h
index b9aee7c6db1..e00fb257140 100644
--- a/engines/bagel/boflib/gui/button.h
+++ b/engines/bagel/boflib/gui/button.h
@@ -60,8 +60,8 @@ public:
 
 	virtual ErrorCode paint(CBofRect *pRect = nullptr);
 
-	virtual void enable() override;
-	virtual void disable() override;
+	void enable() override;
+	void disable() override;
 
 	ErrorCode setState(int nNewState, bool bRepaintNow = true);
 	int getState() {
@@ -99,11 +99,11 @@ public:
 		return (_nState == BUTTON_CHECKED);
 	}
 
-	virtual ErrorCode paint(CBofRect *pRect = nullptr);
+	ErrorCode paint(CBofRect *pRect = nullptr) override;
 
 protected:
-	virtual void onLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr);
-	virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr);
+	void onLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) override;
+	void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) override;
 };
 
 class CBofBmpButton : public CBofWindow {
@@ -130,9 +130,9 @@ public:
 	}
 
 protected:
-	virtual void onPaint(CBofRect *pRect);
-	virtual void onLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr);
-	virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr);
+	void onPaint(CBofRect *pRect) override;
+	void onLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) override;
+	void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) override;
 
 	CBofBitmap *_pButtonUp;
 	CBofBitmap *_pButtonDown;
diff --git a/engines/bagel/boflib/gui/scroll_bar.cpp b/engines/bagel/boflib/gui/scroll_bar.cpp
index d9e30eaa5eb..39304664684 100644
--- a/engines/bagel/boflib/gui/scroll_bar.cpp
+++ b/engines/bagel/boflib/gui/scroll_bar.cpp
@@ -185,7 +185,7 @@ void CBofScrollBar::setScrollRange(int nMin, int nMax, bool bRepaint) {
 
 	// Should we repaint the scroll bar now?
 	if (bRepaint) {
-		paint(nullptr);
+		paint();
 	}
 }