[Scummvm-git-logs] scummvm master -> 83f46024e2fc4846f2c8a41ed90fc579e6d16f95
dreammaster
noreply at scummvm.org
Wed Dec 24 04:09:17 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
83f46024e2 BAGEL: Rename static DoWaitCursor to avoid shadowing warnings
Commit: 83f46024e2fc4846f2c8a41ed90fc579e6d16f95
https://github.com/scummvm/scummvm/commit/83f46024e2fc4846f2c8a41ed90fc579e6d16f95
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-12-24T15:09:05+11:00
Commit Message:
BAGEL: Rename static DoWaitCursor to avoid shadowing warnings
Changed paths:
engines/bagel/hodjnpodj/hnplibs/rules.cpp
engines/bagel/hodjnpodj/hnplibs/rules.h
engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
engines/bagel/hodjnpodj/metagame/bgen/backpack.h
engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
engines/bagel/hodjnpodj/metagame/bgen/notebook.h
engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
engines/bagel/hodjnpodj/metagame/gtl/pawn.h
engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
engines/bagel/hodjnpodj/metagame/gtl/rules.h
engines/bagel/hodjnpodj/metagame/gtl/store.cpp
engines/bagel/hodjnpodj/metagame/gtl/store.h
diff --git a/engines/bagel/hodjnpodj/hnplibs/rules.cpp b/engines/bagel/hodjnpodj/hnplibs/rules.cpp
index 716e1d09dca..5bf5111671d 100644
--- a/engines/bagel/hodjnpodj/hnplibs/rules.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/rules.cpp
@@ -360,7 +360,7 @@ void CRules::OnPaint() {
CPalette *pPalOld = nullptr;
CDibDoc *pDibDoc;
- DoWaitCursor(); // put up the hourglass cursor
+ ShowWaitCursor(); // put up the hourglass cursor
if (pScrollPalette != nullptr) { // map in our palette
pPalOld = dc.SelectPalette(pScrollPalette, false);
@@ -1423,7 +1423,7 @@ bool CRules::OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message
}
-void CRules::DoWaitCursor() {
+void CRules::ShowWaitCursor() {
CWinApp *pMyApp;
pMyApp = AfxGetApp();
diff --git a/engines/bagel/hodjnpodj/hnplibs/rules.h b/engines/bagel/hodjnpodj/hnplibs/rules.h
index 4d2831c422b..bb3dc634a10 100644
--- a/engines/bagel/hodjnpodj/hnplibs/rules.h
+++ b/engines/bagel/hodjnpodj/hnplibs/rules.h
@@ -61,7 +61,7 @@ private:
void UnfurlScroll(CDC *pDC);
void UpdateMore(CDC *pDC);
void WritePage(CDC *pDC, int nPage);
- void DoWaitCursor();
+ void ShowWaitCursor();
void DoWaitCursor(int nCode) override {
CDialog::DoWaitCursor(nCode);
}
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp b/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
index 5d01a6281e8..bf5bc487f0e 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
@@ -357,7 +357,7 @@ void CBackpack::OnPaint() {
void CBackpack::UpdateBackpack(CDC *pDC) {
CPalette *pPalOld;
- DoWaitCursor(); // put up the hourglass cursor
+ ShowWaitCursor(); // put up the hourglass cursor
pPalOld = (*pDC).SelectPalette(pBackgroundPalette, false); // setup the proper palette
(*pDC).RealizePalette();
@@ -390,7 +390,7 @@ void CBackpack::UpdatePage(CDC *pDC) {
if (pWorkDC == nullptr) // update everything if no work area
(*pBackpackDialog).InvalidateRect(nullptr, false);
else { // otherwise just update central area
- DoWaitCursor(); // put up the hourglass cursor
+ ShowWaitCursor(); // put up the hourglass cursor
pPalOld = (*pDC).SelectPalette(pBackgroundPalette, false); // setup the proper palette
(*pDC).RealizePalette();
PaintMaskedBitmap(pWorkDC, pBackgroundPalette, pBackpackBitmap, 0, 0, BACKPACK_DX, BACKPACK_DY);
@@ -792,7 +792,7 @@ bool CBackpack::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int
}
-void CBackpack::DoWaitCursor() {
+void CBackpack::ShowWaitCursor() {
CWinApp *pMyApp;
pMyApp = AfxGetApp();
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/backpack.h b/engines/bagel/hodjnpodj/metagame/bgen/backpack.h
index 4071e3b76b1..c357ef98f66 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/backpack.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/backpack.h
@@ -74,7 +74,7 @@ public:
static void UpdatePage(CDC *pDC);
static void ClearDialogImage();
static void RefreshBackground();
- static void DoWaitCursor();
+ static void ShowWaitCursor();
static void DoArrowCursor();
private:
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp b/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
index 8c7f846a34c..2b51164ce0b 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
@@ -381,7 +381,7 @@ void CNotebook::OnPaint() {
void CNotebook::UpdateNotebook(CDC *pDC) {
CPalette *pPalOld;
- DoWaitCursor(); // put up the hourglass cursor
+ ShowWaitCursor(); // put up the hourglass cursor
pPalOld = (*pDC).SelectPalette(pBackgroundPalette, false); // setup the proper palette
(*pDC).RealizePalette();
@@ -414,7 +414,7 @@ void CNotebook::UpdateNote(CDC *pDC) {
if (pWorkDC == nullptr) // update everything if no work area
(*pNotebookDialog).InvalidateRect(nullptr, false);
else { // otherwise just update central area
- DoWaitCursor(); // put up the hourglass cursor
+ ShowWaitCursor(); // put up the hourglass cursor
pPalOld = (*pDC).SelectPalette(pBackgroundPalette, false); // setup the proper palette
(*pDC).RealizePalette();
PaintMaskedBitmap(pWorkDC, pBackgroundPalette, pNotebookBitmap, 0, 0, NOTEBOOK_DX, NOTEBOOK_DY);
@@ -791,7 +791,7 @@ bool CNotebook::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int
}
-void CNotebook::DoWaitCursor() {
+void CNotebook::ShowWaitCursor() {
CWinApp *pMyApp;
pMyApp = AfxGetApp();
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/notebook.h b/engines/bagel/hodjnpodj/metagame/bgen/notebook.h
index 38ae1c6f03b..dec96c4d7d5 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/notebook.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/notebook.h
@@ -91,7 +91,7 @@ public:
static void UpdateNote(CDC *pDC);
static void ClearDialogImage();
static void RefreshBackground();
- static void DoWaitCursor();
+ static void ShowWaitCursor();
static void DoArrowCursor();
private:
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp b/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
index a03aa28f9b6..7f1365a3290 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
@@ -374,7 +374,7 @@ void CPawnShop::OnPaint() {
void CPawnShop::UpdatePawn(CDC *pDC) {
CPalette *pPalOld;
- DoWaitCursor(); // put up the hourglass cursor
+ ShowWaitCursor(); // put up the hourglass cursor
pPalOld = (*pDC).SelectPalette(pBackgroundPalette, false); // setup the proper palette
(*pDC).RealizePalette();
@@ -407,7 +407,7 @@ void CPawnShop::UpdatePage(CDC *pDC) {
if (pWorkDC == nullptr) // update everything if no work area
(*pPawnDialog).InvalidateRect(nullptr, false);
else { // otherwise just update central area
- DoWaitCursor(); // put up the hourglass cursor
+ ShowWaitCursor(); // put up the hourglass cursor
pPalOld = (*pDC).SelectPalette(pBackgroundPalette, false); // setup the proper palette
(*pDC).RealizePalette();
if (pBackgroundBitmap != nullptr)
@@ -841,7 +841,7 @@ bool CPawnShop::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int
}
-void CPawnShop::DoWaitCursor() {
+void CPawnShop::ShowWaitCursor() {
CWinApp *pMyApp;
pMyApp = AfxGetApp();
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/pawn.h b/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
index 813547ee53a..d9fe06e06ef 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
@@ -80,7 +80,7 @@ public:
static void UpdateCrowns(CDC *pDC);
static void ClearDialogImage();
static void RefreshBackground();
- static void DoWaitCursor();
+ static void ShowWaitCursor();
static void DoArrowCursor();
// Included to stop warning about the static DoWaitCursor hiding inherited version
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp b/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
index 0e2b0541370..29190729588 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
@@ -378,7 +378,7 @@ void CRules::OnPaint() {
CPalette *pPalOld = nullptr;
CDibDoc *pDibDoc;
- DoWaitCursor(); // put up the hourglass cursor
+ ShowWaitCursor(); // put up the hourglass cursor
if (pScrollPalette != nullptr) { // map in our palette
pPalOld = dc.SelectPalette(pScrollPalette, false);
@@ -1437,7 +1437,7 @@ bool CRules::OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message
}
-void CRules::DoWaitCursor() {
+void CRules::ShowWaitCursor() {
CWinApp *pMyApp;
pMyApp = AfxGetApp();
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/rules.h b/engines/bagel/hodjnpodj/metagame/gtl/rules.h
index 13b1a376d10..c689ad16307 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/rules.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/rules.h
@@ -62,7 +62,7 @@ private:
void UnfurlScroll(CDC *pDC);
void UpdateMore(CDC *pDC);
void WritePage(CDC *pDC, int nPage);
- void DoWaitCursor();
+ void ShowWaitCursor();
void DoWaitCursor(int nCode) override {
CDialog::DoWaitCursor(nCode);
}
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/store.cpp b/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
index b8b6765f085..880a1e242d7 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
@@ -376,7 +376,7 @@ void CGeneralStore::OnPaint() {
void CGeneralStore::UpdateStore(CDC *pDC) {
CPalette *pPalOld;
- DoWaitCursor(); // put up the hourglass cursor
+ ShowWaitCursor(); // put up the hourglass cursor
pPalOld = (*pDC).SelectPalette(pBackgroundPalette, false); // setup the proper palette
(*pDC).RealizePalette();
@@ -409,7 +409,7 @@ void CGeneralStore::UpdatePage(CDC *pDC) {
if (pWorkDC == nullptr) // update everything if no work area
(*pStoreDialog).InvalidateRect(nullptr, false);
else { // otherwise just update central area
- DoWaitCursor(); // put up the hourglass cursor
+ ShowWaitCursor(); // put up the hourglass cursor
pPalOld = (*pDC).SelectPalette(pBackgroundPalette, false); // setup the proper palette
(*pDC).RealizePalette();
if (pBackgroundBitmap != nullptr)
@@ -846,7 +846,7 @@ bool CGeneralStore::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned
}
-void CGeneralStore::DoWaitCursor() {
+void CGeneralStore::ShowWaitCursor() {
CWinApp *pMyApp;
pMyApp = AfxGetApp();
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/store.h b/engines/bagel/hodjnpodj/metagame/gtl/store.h
index 3ad930be5d6..0b674a0f8f8 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/store.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/store.h
@@ -81,7 +81,7 @@ public:
static void UpdateCrowns(CDC *pDC);
static void ClearDialogImage();
static void RefreshBackground();
- static void DoWaitCursor();
+ static void ShowWaitCursor();
static void DoArrowCursor();
private:
More information about the Scummvm-git-logs
mailing list