[Scummvm-git-logs] scummvm master -> 6c391b6649e3e3b28cdb7d5730a9ad5490c38a7c

[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:
6c391b6649 BAGEL: More cleanup (add virtual/override keywords, remove useless includes)


Commit: 6c391b6649e3e3b28cdb7d5730a9ad5490c38a7c
    https://github.com/scummvm/scummvm/commit/6c391b6649e3e3b28cdb7d5730a9ad5490c38a7c
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-31T23:17:33+01:00

Commit Message:
BAGEL: More cleanup (add virtual/override keywords, remove useless includes)

Changed paths:
    engines/bagel/dialogs/next_cd_dialog.h
    engines/bagel/dialogs/opt_window.h
    engines/bagel/dialogs/start_dialog.h
    engines/bagel/spacebar/filter.cpp
    engines/bagel/spacebar/slot_wnd.cpp


diff --git a/engines/bagel/dialogs/next_cd_dialog.h b/engines/bagel/dialogs/next_cd_dialog.h
index bc0d7462374..c932047708f 100644
--- a/engines/bagel/dialogs/next_cd_dialog.h
+++ b/engines/bagel/dialogs/next_cd_dialog.h
@@ -25,7 +25,6 @@
 
 #include "bagel/boflib/gui/dialog.h"
 #include "bagel/boflib/gui/button.h"
-#include "bagel/boflib/gfx/text.h"
 
 namespace Bagel {
 
@@ -35,14 +34,14 @@ class CBagQuitDialog : public CBofDialog {
 public:
 	CBagQuitDialog();
 
-	virtual void onInitDialog();
+	void onInitDialog() override;
 
 protected:
-	virtual void onPaint(CBofRect *pRect);
-	virtual void onClose();
-	virtual void onBofButton(CBofObject *pObject, int nState);
+	void onPaint(CBofRect *pRect) override;
+	void onClose() override;
+	void onBofButton(CBofObject *pObject, int nState) override;
 
-	virtual void onKeyHit(uint32 lKey, uint32 lRepCount);
+	void onKeyHit(uint32 lKey, uint32 lRepCount) override;
 
 	// Data
 	//
@@ -53,14 +52,14 @@ class CBagNextCDDialog : public CBofDialog {
 public:
 	CBagNextCDDialog();
 
-	virtual void onInitDialog();
+	void onInitDialog() override;
 
 protected:
-	virtual void onPaint(CBofRect *pRect);
-	virtual void onClose();
-	virtual void onBofButton(CBofObject *pObject, int nState);
+	void onPaint(CBofRect *pRect) override;
+	void onClose() override;
+	void onBofButton(CBofObject *pObject, int nState) override;
 
-	virtual void onKeyHit(uint32 lKey, uint32 lRepCount);
+	void onKeyHit(uint32 lKey, uint32 lRepCount) override;
 
 	// Data
 	CBofBmpButton *_pButton;
@@ -70,16 +69,16 @@ class CBagCreditsDialog : public CBofDialog {
 public:
 	CBagCreditsDialog();
 
-	virtual void onInitDialog();
+	void onInitDialog() override;
 
 protected:
-	virtual void onPaint(CBofRect *pRect);
-	virtual void onClose();
+	void onPaint(CBofRect *pRect) override;
+	void onClose() override;
 
-	virtual void onKeyHit(uint32 lKey, uint32 lRepCount);
-	virtual void onLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr);
+	void onKeyHit(uint32 lKey, uint32 lRepCount) override;
+	void onLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) override;
 
-	virtual void onMainLoop();
+	void onMainLoop() override;
 
 	ErrorCode nextScreen();
 	ErrorCode displayCredits();
diff --git a/engines/bagel/dialogs/opt_window.h b/engines/bagel/dialogs/opt_window.h
index 59e4af6989b..f7932b58c6c 100644
--- a/engines/bagel/dialogs/opt_window.h
+++ b/engines/bagel/dialogs/opt_window.h
@@ -24,7 +24,6 @@
 #define BAGEL_DIALOGS_OPT_WINDOW_H
 
 #include "bagel/boflib/gui/dialog.h"
-#include "bagel/boflib/string.h"
 #include "bagel/boflib/gui/button.h"
 #include "bagel/boflib/gui/scroll_bar.h"
 #include "bagel/boflib/gui/text_box.h"
@@ -76,12 +75,12 @@ public:
 	void getDialogData();
 
 protected:
-	virtual void onPaint(CBofRect *pRect);
-	virtual void onInitDialog();
+	void onPaint(CBofRect *pRect) override;
+	void onInitDialog() override;
 
-	virtual void onBofScrollBar(CBofObject *pObject, int nPos);
-	virtual void onBofButton(CBofObject *pObject, int nState);
-	virtual void onKeyHit(uint32 lKey, uint32 lRepCount);
+	void onBofScrollBar(CBofObject *pObject, int nPos) override;
+	void onBofButton(CBofObject *pObject, int nState) override;
+	void onKeyHit(uint32 lKey, uint32 lRepCount) override;
 
 	// Data members
 	//
diff --git a/engines/bagel/dialogs/start_dialog.h b/engines/bagel/dialogs/start_dialog.h
index d796d218d6a..b42c1878a25 100644
--- a/engines/bagel/dialogs/start_dialog.h
+++ b/engines/bagel/dialogs/start_dialog.h
@@ -26,7 +26,6 @@
 #include "bagel/boflib/gui/list_box.h"
 #include "bagel/boflib/gui/button.h"
 #include "bagel/boflib/gui/text_box.h"
-#include "bagel/boflib/string.h"
 #include "bagel/dialogs/save_dialog.h"
 
 namespace Bagel {
diff --git a/engines/bagel/spacebar/filter.cpp b/engines/bagel/spacebar/filter.cpp
index a11c25ca9ea..526e92bac04 100644
--- a/engines/bagel/spacebar/filter.cpp
+++ b/engines/bagel/spacebar/filter.cpp
@@ -21,7 +21,6 @@
 
 #include "bagel/spacebar/filter.h"
 #include "bagel/spacebar/main_window.h"
-#include "bagel/spacebar/master_win.h"
 #include "bagel/spacebar/spacebar.h"
 #include "bagel/boflib/gfx/palette.h"
 #include "bagel/boflib/string.h"
diff --git a/engines/bagel/spacebar/slot_wnd.cpp b/engines/bagel/spacebar/slot_wnd.cpp
index 8cf2928950b..78518b93087 100644
--- a/engines/bagel/spacebar/slot_wnd.cpp
+++ b/engines/bagel/spacebar/slot_wnd.cpp
@@ -214,9 +214,7 @@ ErrorCode  SBarSlotWnd::attach() {
 		}
 
 		// Read in their total nuggets from game
-		CBagVar *pVar = nullptr;
-
-		pVar = g_VarManager->getVariable("NUGGETS");
+		CBagVar *pVar = g_VarManager->getVariable("NUGGETS");
 
 		if (pVar)
 			_nCredit = pVar->getNumValue();