[Scummvm-git-logs] scummvm master -> b35e81d1673aec7bfb10d44ee09fb63379c509d5
Strangerke
noreply at scummvm.org
Wed Jun 5 21:45:20 UTC 2024
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2c20511a78 BAGEL: add several missing override keywords
b35e81d167 BAGEL: Some renaming in CMainWindow
Commit: 2c20511a783f8042ffd3a237ab5f74c0fc35c8b8
https://github.com/scummvm/scummvm/commit/2c20511a783f8042ffd3a237ab5f74c0fc35c8b8
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-05T22:44:51+01:00
Commit Message:
BAGEL: add several missing override keywords
Changed paths:
engines/bagel/spacebar/master_win.cpp
engines/bagel/spacebar/master_win.h
diff --git a/engines/bagel/spacebar/master_win.cpp b/engines/bagel/spacebar/master_win.cpp
index 86f37a12ec1..2fbed89009f 100644
--- a/engines/bagel/spacebar/master_win.cpp
+++ b/engines/bagel/spacebar/master_win.cpp
@@ -48,95 +48,95 @@ static const char *GetBuildVersion() {
return buildString("Version: %s, %s", __DATE__, __TIME__);
}
-CBagStorageDev *CSBarMasterWin::onNewStorageDev(const CBofString &typestr) {
+CBagStorageDev *CSBarMasterWin::onNewStorageDev(const CBofString &typeStr) {
assert(isValidObject(this));
CBagStorageDev *pSDev;
- if (!typestr.find("PDA")) {
+ if (!typeStr.find("PDA")) {
pSDev = new CBagPDA();
- } else if (!typestr.find("WIELD")) {
+ } else if (!typeStr.find("WIELD")) {
pSDev = new CBagWield();
- } else if (!typestr.find("BMP")) {
+ } else if (!typeStr.find("BMP")) {
pSDev = new CBagStorageDevBmp();
- } else if (!typestr.find("DLG")) {
+ } else if (!typeStr.find("DLG")) {
pSDev = new CBagStorageDevDlg();
- } else if (!typestr.find("BARCOMP")) {
+ } else if (!typeStr.find("BARCOMP")) {
pSDev = new SBarComputer();
pSDev->setCustom(true);
- } else if (!typestr.find("SRACOMP")) {
+ } else if (!typeStr.find("SRACOMP")) {
pSDev = new SrafComputer();
pSDev->setExitOnEdge(10);
- } else if (!typestr.find("VIDEQUIP")) {
+ } else if (!typeStr.find("VIDEQUIP")) {
pSDev = new SBarVidWnd();
pSDev->setCloseup(true);
pSDev->setExitOnEdge(80);
pSDev->setCustom(true);
- } else if (!typestr.find("FULLSCREEN2")) {
+ } else if (!typeStr.find("FULLSCREEN2")) {
pSDev = new SBarFullWnd();
pSDev->setCloseup(true);
((SBarFullWnd *)pSDev)->_bAllowEventWorld = false;
- } else if (!typestr.find("FULLSCREEN")) {
+ } else if (!typeStr.find("FULLSCREEN")) {
pSDev = new SBarFullWnd();
pSDev->setCloseup(true);
- } else if (!typestr.find("SBARSLOT")) {
+ } else if (!typeStr.find("SBARSLOT")) {
pSDev = new SBarSlotWnd();
pSDev->setCustom(true);
- } else if (!typestr.find("BIBODDS")) {
+ } else if (!typeStr.find("BIBODDS")) {
pSDev = new SBarBibOddsWnd();
pSDev->setCloseup(true);
pSDev->setCustom(true);
- } else if (!typestr.find("INVWLD")) {
+ } else if (!typeStr.find("INVWLD")) {
pSDev = new CBagInv();
- } else if (!typestr.find("MOOWLD")) {
+ } else if (!typeStr.find("MOOWLD")) {
pSDev = new CBagMoo();
- } else if (!typestr.find("ZOOMPDA")) {
+ } else if (!typeStr.find("ZOOMPDA")) {
pSDev = new SBZoomPda();
pSDev->setCloseup(true);
- } else if (!typestr.find("PLAYBIBBLE")) {
+ } else if (!typeStr.find("PLAYBIBBLE")) {
pSDev = new CBibbleWindow();
pSDev->setCustom(true);
- } else if (!typestr.find("PLAYNAV")) {
+ } else if (!typeStr.find("PLAYNAV")) {
pSDev = new CNavWindow();
// delineate cic's
- } else if (!typestr.find("CIC")) {
+ } else if (!typeStr.find("CIC")) {
pSDev = new GAMEWINDOW();
pSDev->setCloseup(true);
pSDev->setCIC(true);
pSDev->setExitOnEdge(80);
- } else if (!typestr.find("CLOSEUP")) {
+ } else if (!typeStr.find("CLOSEUP")) {
pSDev = new GAMEWINDOW();
pSDev->setCloseup(true);
pSDev->setExitOnEdge(80);
- } else if (!typestr.find("CHAT")) {
+ } else if (!typeStr.find("CHAT")) {
pSDev = new CBagChatWnd();
pSDev->setCloseup(true);
- } else if (!typestr.find("EVENT")) { // EVT STUFF
+ } else if (!typeStr.find("EVENT")) { // EVT STUFF
pSDev = new CBagEventSDev();
- } else if (!typestr.find("TURNEVENT")) { // turn based storage device
+ } else if (!typeStr.find("TURNEVENT")) { // turn based storage device
pSDev = new CBagTurnEventSDev();
- } else if (!typestr.find("LOG")) { // PDA LOG STUFF
+ } else if (!typeStr.find("LOG")) { // PDA LOG STUFF
pSDev = new CBagLog();
} else {
@@ -197,7 +197,7 @@ void CSBarMasterWin::onKeyHit(uint32 lKey, uint32 lRepCount) {
}
}
-void CSBarMasterWin::onNewFilter(CBagStorageDev *pSDev, const CBofString &typestr) {
+void CSBarMasterWin::onNewFilter(CBagStorageDev *pSDev, const CBofString &typeStr) {
assert(isValidObject(this));
FilterFxn filterFunction = nullptr;
@@ -207,29 +207,29 @@ void CSBarMasterWin::onNewFilter(CBagStorageDev *pSDev, const CBofString &typest
filterFunction = &doFilters;
}
- if (!typestr.find("PDA")) {
- } else if (!typestr.find("WIELD")) {
- } else if (!typestr.find("BMP")) {
- } else if (!typestr.find("DLG")) {
+ if (!typeStr.find("PDA")) {
+ } else if (!typeStr.find("WIELD")) {
+ } else if (!typeStr.find("BMP")) {
+ } else if (!typeStr.find("DLG")) {
pSDev->onSetFilter(filterFunction);
- } else if (!typestr.find("BARCOMP")) {
- } else if (!typestr.find("SRACOMP")) {
- } else if (!typestr.find("VIDEQUIP")) {
- } else if (!typestr.find("FULLSCREEN")) {
- } else if (!typestr.find("SBARSLOT")) {
- } else if (!typestr.find("BIBODDS")) {
- } else if (!typestr.find("INVWLD")) {
- } else if (!typestr.find("MOOWLD")) {
- } else if (!typestr.find("ZOOMPDA")) {
- } else if (!typestr.find("PLAYBIBBLE")) {
- } else if (!typestr.find("PLAYNAV")) {
- } else if (!typestr.find("CLOSEUP")) {
+ } else if (!typeStr.find("BARCOMP")) {
+ } else if (!typeStr.find("SRACOMP")) {
+ } else if (!typeStr.find("VIDEQUIP")) {
+ } else if (!typeStr.find("FULLSCREEN")) {
+ } else if (!typeStr.find("SBARSLOT")) {
+ } else if (!typeStr.find("BIBODDS")) {
+ } else if (!typeStr.find("INVWLD")) {
+ } else if (!typeStr.find("MOOWLD")) {
+ } else if (!typeStr.find("ZOOMPDA")) {
+ } else if (!typeStr.find("PLAYBIBBLE")) {
+ } else if (!typeStr.find("PLAYNAV")) {
+ } else if (!typeStr.find("CLOSEUP")) {
pSDev->onSetFilter(filterFunction);
- } else if (!typestr.find("CHAT")) {
+ } else if (!typeStr.find("CHAT")) {
pSDev->onSetFilter(filterFunction);
- } else if (!typestr.find("EVENT")) {
- } else if (!typestr.find("TURNEVENT")) {
- } else if (!typestr.find("LOG")) {
+ } else if (!typeStr.find("EVENT")) {
+ } else if (!typeStr.find("TURNEVENT")) {
+ } else if (!typeStr.find("LOG")) {
} else {
// The game window
pSDev->onSetFilter(filterFunction);
diff --git a/engines/bagel/spacebar/master_win.h b/engines/bagel/spacebar/master_win.h
index 0d4c6000209..5ddffd99ca9 100644
--- a/engines/bagel/spacebar/master_win.h
+++ b/engines/bagel/spacebar/master_win.h
@@ -36,12 +36,12 @@ namespace SpaceBar {
*/
class CSBarMasterWin : public CBagMasterWin {
public:
- virtual CBagStorageDev *onNewStorageDev(const CBofString &typestr);
+ virtual CBagStorageDev *onNewStorageDev(const CBofString &typeStr);
virtual CBagStorageDev *onNewStorageDev(int nType);
virtual void onKeyHit(uint32 lKey, uint32 lRepCount);
- void onNewFilter(CBagStorageDev *pSDev, const CBofString &typestr);
+ void onNewFilter(CBagStorageDev *pSDev, const CBofString &typeStr);
void onNewFilter(CBagStorageDev *pSDev, int nType);
};
Commit: b35e81d1673aec7bfb10d44ee09fb63379c509d5
https://github.com/scummvm/scummvm/commit/b35e81d1673aec7bfb10d44ee09fb63379c509d5
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-05T22:45:13+01:00
Commit Message:
BAGEL: Some renaming in CMainWindow
Changed paths:
engines/bagel/spacebar/main_window.h
diff --git a/engines/bagel/spacebar/main_window.h b/engines/bagel/spacebar/main_window.h
index 78919e5dc70..10b9bffa858 100644
--- a/engines/bagel/spacebar/main_window.h
+++ b/engines/bagel/spacebar/main_window.h
@@ -75,8 +75,8 @@ public:
CMainWindow();
virtual ~CMainWindow();
- ErrorCode attach();
- ErrorCode detach();
+ ErrorCode attach() override;
+ ErrorCode detach() override;
static void setZzazzlVision(bool newValue);
static CBofRect &getFilterRect() {
return *_xFilterRect;
@@ -103,20 +103,20 @@ public:
_nGameMode = mode;
}
- ErrorCode setloadFilePos(CBofPoint dstLoc);
+ ErrorCode setloadFilePos(CBofPoint dstLoc) override;
- CBagObject *onNewLinkObject(const CBofString &sInit);
+ CBagObject *onNewLinkObject(const CBofString &sInit) override;
void correctZzazzlePoint(CBofPoint *p);
- ErrorCode onCursorUpdate(int nCurrObj);
+ ErrorCode onCursorUpdate(int nCurrObj) override;
- void onClose();
- void onSize(uint32 nType, int cx, int cy);
- void onKeyHit(uint32 lKey, uint32 lRepCount);
- void onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void * = nullptr);
- void onLButtonDown(uint32 nFlags, CBofPoint *xPoint, void * = nullptr);
- void onMouseMove(uint32 nFlags, CBofPoint *p, void * = nullptr);
+ void onClose() override;
+ void onSize(uint32 nType, int cx, int cy) override;
+ void onKeyHit(uint32 lKey, uint32 lRepCount) override;
+ void onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void * = nullptr) override;
+ void onLButtonDown(uint32 nFlags, CBofPoint *xPoint, void * = nullptr) override;
+ void onMouseMove(uint32 nFlags, CBofPoint *p, void * = nullptr) override;
};
} // namespace SpaceBar
More information about the Scummvm-git-logs
mailing list