From f40ea59b4dabeb58dfd3d5054c0961a6f5cd45fc Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 28 Apr 2024 22:42:15 +0100 Subject: [PATCH] BAGEL: Renaming in dev_dlg --- engines/bagel/baglib/command_object.cpp | 10 +- engines/bagel/baglib/dev_dlg.cpp | 189 +++++++++++------------ engines/bagel/baglib/dev_dlg.h | 34 ++-- engines/bagel/baglib/fmovie.cpp | 6 +- engines/bagel/baglib/fmovie.h | 6 +- engines/bagel/baglib/help.cpp | 4 +- engines/bagel/baglib/help.h | 2 +- engines/bagel/baglib/master_win.cpp | 10 +- engines/bagel/baglib/master_win.h | 4 +- engines/bagel/baglib/menu_dlg.cpp | 6 +- engines/bagel/baglib/menu_dlg.h | 3 +- engines/bagel/baglib/pan_window.cpp | 12 +- engines/bagel/baglib/pan_window.h | 6 +- engines/bagel/baglib/storage_dev_bmp.cpp | 2 +- engines/bagel/baglib/storage_dev_win.cpp | 30 ++-- engines/bagel/baglib/storage_dev_win.h | 14 +- engines/bagel/baglib/zoom_pda.cpp | 4 +- engines/bagel/baglib/zoom_pda.h | 2 +- engines/bagel/boflib/gui/button.cpp | 8 +- engines/bagel/boflib/gui/button.h | 8 +- engines/bagel/boflib/gui/dialog.cpp | 4 +- engines/bagel/boflib/gui/dialog.h | 2 +- engines/bagel/boflib/gui/edit_text.cpp | 2 +- engines/bagel/boflib/gui/edit_text.h | 2 +- engines/bagel/boflib/gui/list_box.cpp | 4 +- engines/bagel/boflib/gui/list_box.h | 2 +- engines/bagel/boflib/gui/movie.cpp | 6 +- engines/bagel/boflib/gui/movie.h | 6 +- engines/bagel/boflib/gui/scroll_bar.cpp | 4 +- engines/bagel/boflib/gui/scroll_bar.h | 2 +- engines/bagel/boflib/gui/window.cpp | 14 +- engines/bagel/boflib/gui/window.h | 8 +- engines/bagel/dialogs/credits_dialog.cpp | 6 +- engines/bagel/dialogs/credits_dialog.h | 4 +- engines/bagel/dialogs/next_cd_dialog.cpp | 8 +- engines/bagel/dialogs/next_cd_dialog.h | 12 +- engines/bagel/dialogs/opt_window.cpp | 4 +- engines/bagel/dialogs/opt_window.h | 2 +- engines/bagel/dialogs/quit_dialog.cpp | 8 +- engines/bagel/dialogs/quit_dialog.h | 4 +- engines/bagel/dialogs/restart_dialog.cpp | 12 +- engines/bagel/dialogs/restart_dialog.h | 4 +- engines/bagel/dialogs/restore_dialog.cpp | 4 +- engines/bagel/dialogs/restore_dialog.h | 2 +- engines/bagel/dialogs/save_dialog.cpp | 4 +- engines/bagel/dialogs/save_dialog.h | 2 +- engines/bagel/dialogs/start_dialog.cpp | 8 +- engines/bagel/dialogs/start_dialog.h | 4 +- engines/bagel/spacebar/bib_odds_wnd.cpp | 4 +- engines/bagel/spacebar/bib_odds_wnd.h | 2 +- engines/bagel/spacebar/bibble_window.cpp | 6 +- engines/bagel/spacebar/bibble_window.h | 6 +- engines/bagel/spacebar/computer.cpp | 4 +- engines/bagel/spacebar/computer.h | 4 +- engines/bagel/spacebar/main_window.cpp | 12 +- engines/bagel/spacebar/main_window.h | 6 +- engines/bagel/spacebar/master_win.cpp | 4 +- engines/bagel/spacebar/master_win.h | 2 +- engines/bagel/spacebar/nav_window.cpp | 2 +- engines/bagel/spacebar/nav_window.h | 2 +- engines/bagel/spacebar/slot_wnd.h | 2 +- engines/bagel/spacebar/sraf_computer.cpp | 10 +- engines/bagel/spacebar/sraf_computer.h | 6 +- 63 files changed, 285 insertions(+), 291 deletions(-) diff --git a/engines/bagel/baglib/command_object.cpp b/engines/bagel/baglib/command_object.cpp index 734692e3fb2..f6b2010458e 100644 --- a/engines/bagel/baglib/command_object.cpp +++ b/engines/bagel/baglib/command_object.cpp @@ -263,7 +263,7 @@ bool CBagCommandObject::runObject() { CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\THUDPOP.BMP"); MACROREPLACE(bmpName); CDevDlg dlg; - dlg.Create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::GetApp()->GetPalette(), &tmpRect); + dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::GetApp()->GetPalette(), &tmpRect); dlg.DoModal(); dlg.Destroy(); @@ -272,7 +272,7 @@ bool CBagCommandObject::runObject() { CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\FLEEDAT.BMP"); MACROREPLACE(bmpName); CDevDlg dlg; - dlg.Create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::GetApp()->GetPalette(), &tmpRect); + dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::GetApp()->GetPalette(), &tmpRect); dlg.DoModal(); dlg.Destroy(); @@ -281,7 +281,7 @@ bool CBagCommandObject::runObject() { CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\CLICKPOP.BMP"); MACROREPLACE(bmpName); CDevDlg dlg; - dlg.Create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::GetApp()->GetPalette(), &tmpRect); + dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::GetApp()->GetPalette(), &tmpRect); dlg.DoModal(); dlg.Destroy(); @@ -290,7 +290,7 @@ bool CBagCommandObject::runObject() { CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\CLICKDAT.BMP"); MACROREPLACE(bmpName); CDevDlg dlg; - dlg.Create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::GetApp()->GetPalette(), &tmpRect); + dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::GetApp()->GetPalette(), &tmpRect); dlg.DoModal(); dlg.Destroy(); @@ -299,7 +299,7 @@ bool CBagCommandObject::runObject() { CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\DEVENPOP.BMP"); MACROREPLACE(bmpName); CDevDlg dlg; - dlg.Create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::GetApp()->GetPalette(), &tmpRect, true); + dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::GetApp()->GetPalette(), &tmpRect, true); dlg.DoModal(); dlg.Destroy(); diff --git a/engines/bagel/baglib/dev_dlg.cpp b/engines/bagel/baglib/dev_dlg.cpp index d3f5b78e5b8..7a31c10e939 100644 --- a/engines/bagel/baglib/dev_dlg.cpp +++ b/engines/bagel/baglib/dev_dlg.cpp @@ -29,196 +29,191 @@ namespace Bagel { #define MENU_DFLT_HEIGHT 20 -CDevDlg::CDevDlg(int nButtonX, int nButtonY) { - m_pTitleText = nullptr; - m_nButtonX = nButtonX; - m_nButtonY = nButtonY; - m_achGuess[0] = '\0'; - m_nGuessCount = 0; - m_bUseExtra = false; +CDevDlg::CDevDlg(int nButtonX, int buttonY) { + _titleText = nullptr; + _buttonX = nButtonX; + _buttonY = buttonY; + _achGuess[0] = '\0'; + _guessCount = 0; + _useExtraFl = false; } CDevDlg::~CDevDlg() { - if (m_pTitleText != nullptr) { - delete m_pTitleText; - m_pTitleText = nullptr; + if (_titleText != nullptr) { + delete _titleText; + _titleText = nullptr; } } -ErrorCode CDevDlg::Create(const char *pszBmp, CBofWindow *pWnd, CBofPalette *pPal, CBofRect *pRect, bool bUseEx) { +ErrorCode CDevDlg::create(const char *bmp, CBofWindow *wnd, CBofPalette *pal, CBofRect *rect, bool useExtraFl) { Assert(IsValidObject(this)); - Assert(pszBmp != nullptr); - Assert(pWnd != nullptr); - Assert(pPal != nullptr); - Assert(pRect != nullptr); + Assert(bmp != nullptr); + Assert(wnd != nullptr); + Assert(pal != nullptr); + Assert(rect != nullptr); - CBofString str = "CDevDlg"; - CBofRect cDlgRect, r, txtRect; + _useExtraFl = useExtraFl; - m_bUseExtra = bUseEx; - - if (!pRect) { - r = pWnd->GetWindowRect(); + CBofRect r; + if (!rect) { + r = wnd->GetWindowRect(); r.OffsetRect(-r.left, -r.top); r.bottom = r.top + MENU_DFLT_HEIGHT; } else { - r = *pRect; + r = *rect; } - if ((m_pGuessText = new CBofText()) != nullptr) { - m_pGuessText->SetupText(pRect, JUSTIFY_LEFT); + _guessText = new CBofText(); + if (_guessText != nullptr) { + _guessText->SetupText(rect, JUSTIFY_LEFT); } - m_nGuessCount = 0; - Common::fill(m_achGuess, m_achGuess + MAX_CHARS, 0); + _guessCount = 0; + Common::fill(_achGuess, _achGuess + ACH_GUESS_MAX_CHARS, 0); - CBofBitmap *pBmp = nullptr; + CBofBitmap *bitmap = nullptr; - if (pszBmp != nullptr) { - - if ((pBmp = new CBofBitmap(pszBmp, pPal)) != nullptr) { - - } else { + if (bmp != nullptr) { + bitmap = new CBofBitmap(bmp, pal); + if (bitmap == nullptr) { ReportError(ERR_MEMORY); } - } // Fall back to original dialog on failure - if (pBmp == nullptr) { - if ((pBmp = new CBofBitmap(200, 100, pPal)) != nullptr) { - Assert(pPal != nullptr); + if (bitmap == nullptr) { + bitmap = new CBofBitmap(200, 100, pal); + if (bitmap != nullptr) { + Assert(pal != nullptr); - pBmp->FillRect(nullptr, pPal->GetNearestIndex(RGB(92, 92, 92)) /*RGB(0,0,0)*/); + bitmap->FillRect(nullptr, pal->GetNearestIndex(RGB(92, 92, 92))); - CBofRect rect(pBmp->GetRect()); - pBmp->DrawRect(&rect, pPal->GetNearestIndex(RGB(0, 0, 0)) /*RGB(0,0,0)*/); - pBmp->FillRect(pRect, pPal->GetNearestIndex(RGB(255, 255, 255))); + CBofRect bmpRect(bitmap->GetRect()); + bitmap->DrawRect(&bmpRect, pal->GetNearestIndex(RGB(0, 0, 0))); + bitmap->FillRect(rect, pal->GetNearestIndex(RGB(255, 255, 255))); } else { ReportError(ERR_MEMORY); } } - Assert(pBmp != nullptr); - CBofRect rect(pBmp->GetRect()); - - CBagStorageDevDlg::Create(str, &rect, pWnd, 0); + Assert(bitmap != nullptr); + CBofRect bmpRect(bitmap->GetRect()); + CBofString className = "CDevDlg"; + CBagStorageDevDlg::Create(className, &bmpRect, wnd, 0); Center(); - SetBackdrop(pBmp); + SetBackdrop(bitmap); return m_errCode; } -void CDevDlg::OnLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void *) { +void CDevDlg::onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void *) { } void CDevDlg::onMouseMove(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void *) { } -void CDevDlg::OnClose() { +void CDevDlg::onClose() { Assert(IsValidObject(this)); - CBagVar *pVar; - if ((pVar = VARMNGR->GetVariable("DIALOGRETURN")) != nullptr) { + CBagVar *varDialogReturn = VARMNGR->GetVariable("DIALOGRETURN"); + if (varDialogReturn != nullptr) { // If we need to parse the input for 2 words (Deven-7 Code words) - if (m_bUseExtra) { + if (_useExtraFl) { // Find the break - char *p; - if (((p = strchr(m_achGuess, ',')) != nullptr) || ((p = strchr(m_achGuess, ' ')) != nullptr)) { - CBagVar *pVarEx; - + char *p = strchr(_achGuess, ','); + if ((p != nullptr) || ((p = strchr(_achGuess, ' ')) != nullptr)) { *p = '\0'; p++; // Set variable 2 (DIALOGRETURN2) - if ((pVarEx = VARMNGR->GetVariable("DIALOGRETURN2")) != nullptr) { - pVarEx->SetValue(p); + CBagVar *varDialogReturn2 = VARMNGR->GetVariable("DIALOGRETURN2"); + if (varDialogReturn2 != nullptr) { + varDialogReturn2->SetValue(p); } } } // Set variable 1 (DIALOGRETURN) - pVar->SetValue(m_achGuess); + varDialogReturn->SetValue(_achGuess); } - if (m_pGuessText != nullptr) { // last text area - delete m_pGuessText; - m_pGuessText = nullptr; - } + delete _guessText; + _guessText = nullptr; - CBagStorageDevDlg::OnClose(); + CBagStorageDevDlg::onClose(); } -void CDevDlg::OnKeyHit(uint32 lKeyCode, uint32 nRepCount) { +void CDevDlg::onKeyHit(uint32 keyCode, uint32 repCount) { Assert(IsValidObject(this)); - if (m_nGuessCount < MAX_CHARS) { - bool bPaintGuess = false; + if (_guessCount < ACH_GUESS_MAX_CHARS) { + bool paintGuessFl = false; const char *const MISC_KEYS = " \'$,-%."; - if (Common::isAlnum(lKeyCode) || strchr(MISC_KEYS, lKeyCode)) { - m_achGuess[m_nGuessCount] = toupper(lKeyCode); - m_nGuessCount++; - bPaintGuess = true; + if (Common::isAlnum(keyCode) || strchr(MISC_KEYS, keyCode)) { + _achGuess[_guessCount] = toupper(keyCode); + _guessCount++; + paintGuessFl = true; - } else if (lKeyCode == BKEY_BACK && (m_nGuessCount - 1) >= 0) { - m_nGuessCount--; - m_achGuess[m_nGuessCount] = 0; - bPaintGuess = true; + } else if (keyCode == BKEY_BACK && (_guessCount - 1) >= 0) { + _guessCount--; + _achGuess[_guessCount] = 0; + paintGuessFl = true; } - if (bPaintGuess) { - PaintText(); + if (paintGuessFl) { + paintText(); } // Close dialog box when enter key is hit - if (lKeyCode == BKEY_ENTER) { - OnClose(); + if (keyCode == BKEY_ENTER) { + onClose(); } } // If it maxes out, clear it - if (m_nGuessCount >= MAX_CHARS) { - Common::fill(m_achGuess, m_achGuess + MAX_CHARS, 0); - m_nGuessCount = 0; + if (_guessCount >= ACH_GUESS_MAX_CHARS) { + Common::fill(_achGuess, _achGuess + ACH_GUESS_MAX_CHARS, 0); + _guessCount = 0; } - CBagStorageDevDlg::OnKeyHit(lKeyCode, nRepCount); + CBagStorageDevDlg::onKeyHit(keyCode, repCount); } -void CDevDlg::PaintText() { +void CDevDlg::paintText() { Assert(IsValidObject(this)); - char achTemp[MAX_CHARS]; - snprintf(achTemp, MAX_CHARS, "%s", m_achGuess); + char achTemp[ACH_GUESS_MAX_CHARS]; + snprintf(achTemp, ACH_GUESS_MAX_CHARS, "%s", _achGuess); - m_pGuessText->Display(GetBackdrop(), achTemp, 16, TEXT_MEDIUM); + _guessText->Display(GetBackdrop(), achTemp, 16, TEXT_MEDIUM); } -void CDevDlg::SetText(CBofString &tStr, CBofRect *pcRect) { +void CDevDlg::setText(CBofString &text, CBofRect *textRect) { Assert(IsValidObject(this)); - if ((m_pTitleText = new CBofText) != nullptr) { - m_pTitleText->SetupText(pcRect, JUSTIFY_CENTER, FORMAT_DEFAULT); - m_pTitleText->SetColor(RGB(255, 255, 255)); - m_pTitleText->SetSize(FONT_14POINT); - m_pTitleText->SetWeight(TEXT_BOLD); - m_pTitleText->SetText(tStr); + _titleText = new CBofText; + if (_titleText != nullptr) { + _titleText->SetupText(textRect, JUSTIFY_CENTER, FORMAT_DEFAULT); + _titleText->SetColor(RGB(255, 255, 255)); + _titleText->SetSize(FONT_14POINT); + _titleText->SetWeight(TEXT_BOLD); + _titleText->SetText(text); } } // Override on render to do the painting, but call the default anyway. -ErrorCode CDevDlg::OnRender(CBofBitmap *pBmp, CBofRect *pRect) { +ErrorCode CDevDlg::onRender(CBofBitmap *bmp, CBofRect *rect) { Assert(IsValidObject(this)); - ErrorCode err = CBagStorageDevDlg::OnRender(pBmp, pRect); + ErrorCode errCode = CBagStorageDevDlg::onRender(bmp, rect); - if (m_pTitleText != nullptr) { - m_pTitleText->Display(GetBackdrop()); + if (_titleText != nullptr) { + _titleText->Display(GetBackdrop()); } - return err; + return errCode; } } // namespace Bagel diff --git a/engines/bagel/baglib/dev_dlg.h b/engines/bagel/baglib/dev_dlg.h index 49ebdef0ed9..4547fc46487 100644 --- a/engines/bagel/baglib/dev_dlg.h +++ b/engines/bagel/baglib/dev_dlg.h @@ -28,32 +28,32 @@ namespace Bagel { -#define MAX_CHARS 40 +#define ACH_GUESS_MAX_CHARS 40 class CDevDlg : public CBagStorageDevDlg { private: // for text entry: - char m_achGuess[MAX_CHARS + 2]; - CBofText *m_pGuessText; - int m_nGuessCount; - int m_nButtonX; - int m_nButtonY; - bool m_bUseExtra; - CBofText *m_pTitleText; + char _achGuess[ACH_GUESS_MAX_CHARS + 2]; + CBofText *_guessText; + int _guessCount; + int _buttonX; + int _buttonY; + bool _useExtraFl; + CBofText *_titleText; public: - CDevDlg(int nButtonX = -1, int nButtonY = -1); + CDevDlg(int buttonX = -1, int buttonY = -1); ~CDevDlg(); - ErrorCode Create(const char *pszBmp, CBofWindow *pWnd, CBofPalette *pPal, CBofRect *pRect, bool bUseEx = false); - void PaintText(); - void SetText(CBofString &, CBofRect *); - void OnKeyHit(uint32 lKey, uint32 lRepCount); + ErrorCode create(const char *bmp, CBofWindow *wnd, CBofPalette *pal, CBofRect *rect, bool useExtraFl = false); + void paintText(); + void setText(CBofString &, CBofRect *); + void onKeyHit(uint32 keyCode, uint32 repCount); - virtual void onMouseMove(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); - virtual void OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); - virtual void OnClose(); - virtual ErrorCode OnRender(CBofBitmap *pBmp, CBofRect *pRect = nullptr); + virtual void onMouseMove(uint32 flags, CBofPoint *point, void * = nullptr); + virtual void onLButtonUp(uint32 flags, CBofPoint *point, void * = nullptr); + virtual void onClose(); + virtual ErrorCode onRender(CBofBitmap *bmp, CBofRect *rect = nullptr); }; } // namespace Bagel diff --git a/engines/bagel/baglib/fmovie.cpp b/engines/bagel/baglib/fmovie.cpp index 72b96f3bffe..e0da9feacfe 100644 --- a/engines/bagel/baglib/fmovie.cpp +++ b/engines/bagel/baglib/fmovie.cpp @@ -159,7 +159,7 @@ bool CBagFMovie::OpenMovie(const char *sFilename) { return true; } -void CBagFMovie::OnKeyHit(uint32 lKey, uint32 /*lRepCount*/) { +void CBagFMovie::onKeyHit(uint32 lKey, uint32 /*lRepCount*/) { if (m_bEscCanStop && lKey == BKEY_ESC) { // Clean up and exit m_bLoop = false; @@ -256,9 +256,9 @@ void CBagFMovie::CloseMovie() { } -void CBagFMovie::OnClose() { +void CBagFMovie::onClose() { CloseMovie(); - CBofDialog::OnClose(); + CBofDialog::onClose(); } diff --git a/engines/bagel/baglib/fmovie.h b/engines/bagel/baglib/fmovie.h index f81ae886b6a..79bcc329ff4 100644 --- a/engines/bagel/baglib/fmovie.h +++ b/engines/bagel/baglib/fmovie.h @@ -76,19 +76,19 @@ protected: virtual bool Play(); virtual bool Reverse(); - virtual void OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) { + virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) { OnButtonUp(nFlags, pPoint); } virtual void OnButtonUp(uint32 nFlags, CBofPoint *pPoint); virtual void OnPaint(CBofRect *pRect); virtual void OnMovieDone(); - virtual void OnClose(); + virtual void onClose(); virtual void OnMainLoop(); /** * Catch the ESC key when hit */ - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); public: /** diff --git a/engines/bagel/baglib/help.cpp b/engines/bagel/baglib/help.cpp index a7564df631a..11039920bbc 100644 --- a/engines/bagel/baglib/help.cpp +++ b/engines/bagel/baglib/help.cpp @@ -215,7 +215,7 @@ void CBagHelp::OnPaint(CBofRect *pRect) { } -void CBagHelp::OnKeyHit(uint32 lKey, uint32 nRepCount) { +void CBagHelp::onKeyHit(uint32 lKey, uint32 nRepCount) { Assert(IsValidObject(this)); switch (lKey) { @@ -248,7 +248,7 @@ void CBagHelp::OnKeyHit(uint32 lKey, uint32 nRepCount) { Close(); default: - CBofDialog::OnKeyHit(lKey, nRepCount); + CBofDialog::onKeyHit(lKey, nRepCount); break; } } diff --git a/engines/bagel/baglib/help.h b/engines/bagel/baglib/help.h index 68f870a6a6c..0c60e7167ee 100644 --- a/engines/bagel/baglib/help.h +++ b/engines/bagel/baglib/help.h @@ -43,7 +43,7 @@ public: protected: virtual void OnPaint(CBofRect *pRect); virtual void OnBofButton(CBofObject *pObject, int nState); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); CBofString m_cTextFile; diff --git a/engines/bagel/baglib/master_win.cpp b/engines/bagel/baglib/master_win.cpp index 63e5ee58f05..9876cde454c 100644 --- a/engines/bagel/baglib/master_win.cpp +++ b/engines/bagel/baglib/master_win.cpp @@ -1056,7 +1056,7 @@ ErrorCode CBagMasterWin::OnHelp(const CBofString &sHelpFile, bool /*bSaveBkg*/, bool g_bWaitOK = false; -void CBagMasterWin::OnKeyHit(uint32 lKey, uint32 lRepCount) { +void CBagMasterWin::onKeyHit(uint32 lKey, uint32 lRepCount) { Assert(IsValidObject(this)); int nVol; @@ -1146,18 +1146,18 @@ void CBagMasterWin::OnKeyHit(uint32 lKey, uint32 lRepCount) { // Default action default: if (m_pGameWindow) - m_pGameWindow->OnKeyHit(lKey, lRepCount); + m_pGameWindow->onKeyHit(lKey, lRepCount); break; } - CBofWindow::OnKeyHit(lKey, lRepCount); + CBofWindow::onKeyHit(lKey, lRepCount); } -void CBagMasterWin::OnClose() { +void CBagMasterWin::onClose() { Assert(IsValidObject(this)); if (m_pGameWindow) - m_pGameWindow->OnClose(); + m_pGameWindow->onClose(); g_engine->quitGame(); } diff --git a/engines/bagel/baglib/master_win.h b/engines/bagel/baglib/master_win.h index b59f738b6d3..71e7a7edacd 100644 --- a/engines/bagel/baglib/master_win.h +++ b/engines/bagel/baglib/master_win.h @@ -185,8 +185,8 @@ public: void OnUserMessage(uint32 nMessage, uint32 lParam) override; - void OnKeyHit(uint32 lKey, uint32 lRepCount) override; - void OnClose() override; + void onKeyHit(uint32 lKey, uint32 lRepCount) override; + void onClose() override; ST_OBJ *GetObjList() { return m_pObjList; diff --git a/engines/bagel/baglib/menu_dlg.cpp b/engines/bagel/baglib/menu_dlg.cpp index 719f7297104..d55e7628fc0 100644 --- a/engines/bagel/baglib/menu_dlg.cpp +++ b/engines/bagel/baglib/menu_dlg.cpp @@ -600,18 +600,18 @@ ErrorCode CBagMenuDlg::Create(CBofWindow *pWnd, CBofPalette *pPal, const CBofRec } -void CBagMenuDlg::OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void *) { +void CBagMenuDlg::onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void *) { // We are ignoring all input until the dialog is actually visible if (m_bAcceptInput) { m_pSelectedObject = nullptr; - OnClose(); + onClose(); if (m_bMultipleDialogs) { CBofRect r = GetWindowRect(); r.OffsetRect(-r.left, -r.top); if (r.PtInRect(*pPoint)) { - CBagStorageDevDlg::OnLButtonUp(nFlags, pPoint); + CBagStorageDevDlg::onLButtonUp(nFlags, pPoint); m_pSelectedObject = GetLActiveObject(); } diff --git a/engines/bagel/baglib/menu_dlg.h b/engines/bagel/baglib/menu_dlg.h index 9a3c2ce9a1f..7ce00079c17 100644 --- a/engines/bagel/baglib/menu_dlg.h +++ b/engines/bagel/baglib/menu_dlg.h @@ -88,9 +88,8 @@ public: ErrorCode Create(CBofWindow *pWnd, CBofPalette *pPal, const CBofRect *cRect = nullptr, uint32 nStyle = 0); - // virtual void OnClose(); virtual void onMouseMove(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); - virtual void OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); + virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); virtual void OnDeActivate(); diff --git a/engines/bagel/baglib/pan_window.cpp b/engines/bagel/baglib/pan_window.cpp index 3be0e5e70d5..8612a60db69 100644 --- a/engines/bagel/baglib/pan_window.cpp +++ b/engines/bagel/baglib/pan_window.cpp @@ -164,8 +164,8 @@ CBagPanWindow::~CBagPanWindow() { delete m_pFGObjectList; } -void CBagPanWindow::OnClose() { - CBagStorageDevWnd::OnClose(); +void CBagPanWindow::onClose() { + CBagStorageDevWnd::onClose(); DestroyWindow(); // Destruct the main window } @@ -428,7 +428,7 @@ ErrorCode CBagPanWindow::OnCursorUpdate(int nCurrObj) { return m_errCode; } -void CBagPanWindow::OnKeyHit(uint32 lKey, uint32 lRepCount) { +void CBagPanWindow::onKeyHit(uint32 lKey, uint32 lRepCount) { Assert(IsValidObject(this)); if (m_pSlideBitmap != nullptr) { @@ -475,7 +475,7 @@ void CBagPanWindow::OnKeyHit(uint32 lKey, uint32 lRepCount) { } } - CBagStorageDevWnd::OnKeyHit(lKey, lRepCount); + CBagStorageDevWnd::onKeyHit(lKey, lRepCount); } void CBagPanWindow::onMouseMove(uint32 nFlags, CBofPoint *p, void *) { @@ -593,7 +593,7 @@ void CBagPanWindow::OnLButtonDown(uint32 nFlags, CBofPoint *xPoint, void *) { } } -void CBagPanWindow::OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { +void CBagPanWindow::onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { MOUSE_ACTIVITY nMA = GetLActivity(); CBagObject *pActObj = GetLActiveObject(); @@ -644,7 +644,7 @@ void CBagPanWindow::OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { } } - CBagStorageDevWnd::OnLButtonUp(nFlags, xPoint); + CBagStorageDevWnd::onLButtonUp(nFlags, xPoint); } } diff --git a/engines/bagel/baglib/pan_window.h b/engines/bagel/baglib/pan_window.h index 5e7e6a3d57f..b4b4e561d3b 100644 --- a/engines/bagel/baglib/pan_window.h +++ b/engines/bagel/baglib/pan_window.h @@ -207,11 +207,11 @@ public: public: static void FlushInputEvents(); - void OnClose(); + void onClose(); void onMouseMove(uint32 nFlags, CBofPoint *p, void * = nullptr); void OnLButtonDown(uint32 nFlags, CBofPoint *point, void * = nullptr); - void OnLButtonUp(uint32 nFlags, CBofPoint *point, void * = nullptr); - void OnKeyHit(uint32 lKey, uint32 lRepCount); + void onLButtonUp(uint32 nFlags, CBofPoint *point, void * = nullptr); + void onKeyHit(uint32 lKey, uint32 lRepCount); void OnSize(uint32 nType, int cx, int cy); void OnWindowPosChanging(WindowPos *lpwndpos); diff --git a/engines/bagel/baglib/storage_dev_bmp.cpp b/engines/bagel/baglib/storage_dev_bmp.cpp index 18c7f5df681..66cde080608 100644 --- a/engines/bagel/baglib/storage_dev_bmp.cpp +++ b/engines/bagel/baglib/storage_dev_bmp.cpp @@ -122,7 +122,7 @@ void CBagStorageDevBmp::onLButtonDown(uint32 nFlags, CBofPoint *xPoint, void *in } void CBagStorageDevBmp::onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *info) { - CBagStorageDev::OnLButtonUp(nFlags, xPoint, info); + CBagStorageDev::onLButtonUp(nFlags, xPoint, info); } const CBofPoint CBagStorageDevBmp::DevPtToViewPort(const CBofPoint &xPoint) { diff --git a/engines/bagel/baglib/storage_dev_win.cpp b/engines/bagel/baglib/storage_dev_win.cpp index b8c400cf47a..a4dc0a41bed 100644 --- a/engines/bagel/baglib/storage_dev_win.cpp +++ b/engines/bagel/baglib/storage_dev_win.cpp @@ -503,7 +503,7 @@ void CBagStorageDev::OnLButtonDown(uint32 nFlags, CBofPoint *xPoint, void *vpInf bool g_bNoMenu = false; -void CBagStorageDev::OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *vpInfo) { +void CBagStorageDev::onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *vpInfo) { char szLocalBuff[256]; CBofString sCurrSDev(szLocalBuff, 256); @@ -1468,8 +1468,8 @@ ErrorCode CBagStorageDevWnd::LoadFile(const CBofString &sFile) { } -void CBagStorageDevWnd::OnClose() { - CBofWindow::OnClose(); +void CBagStorageDevWnd::onClose() { + CBofWindow::onClose(); DestroyWindow(); // destruct the main window } @@ -1537,7 +1537,7 @@ void CBagStorageDevWnd::OnLButtonDown(uint32 nFlags, CBofPoint *xPoint, void *) CBofWindow::OnLButtonDown(nFlags, xPoint); } -void CBagStorageDevWnd::OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { +void CBagStorageDevWnd::onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { // If asynch movie playing in PDA don't react to mouse down (8033) // if it's not a wait cursor, then allow the user to access that hotspot. if (CBagPDA::IsMoviePlaying() && CBagMasterWin::GetActiveCursor() == 6) { @@ -1552,13 +1552,13 @@ void CBagStorageDevWnd::OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { Close(); } else { - CBagStorageDev::OnLButtonUp(nFlags, xPoint, GetAssociateWnd()); - CBofWindow::OnLButtonUp(nFlags, xPoint); + CBagStorageDev::onLButtonUp(nFlags, xPoint, GetAssociateWnd()); + CBofWindow::onLButtonUp(nFlags, xPoint); } } -void CBagStorageDevWnd::OnKeyHit(uint32 lKey, uint32 nRepCount) { - CBofWindow::OnKeyHit(lKey, nRepCount); +void CBagStorageDevWnd::onKeyHit(uint32 lKey, uint32 nRepCount) { + CBofWindow::onKeyHit(lKey, nRepCount); } @@ -1612,7 +1612,7 @@ ErrorCode CBagStorageDevDlg::Close() { } -ErrorCode CBagStorageDevDlg::OnRender(CBofBitmap *pBmp, CBofRect *pRect) { +ErrorCode CBagStorageDevDlg::onRender(CBofBitmap *pBmp, CBofRect *pRect) { Assert(IsValidObject(this)); Assert(pBmp != nullptr); @@ -1675,7 +1675,7 @@ ErrorCode CBagStorageDevDlg::PaintScreen(CBofRect *pRect) { pWin->OnRender(pBmp, pRect); } - OnRender(m_pBackdrop, pRect); + onRender(m_pBackdrop, pRect); CBofRect wrect(GetWindowRect()); m_pBackdrop->Paint(pBmp, &wrect, nullptr); @@ -1750,7 +1750,7 @@ ErrorCode CBagStorageDevDlg::Create(const char *pszName, CBofRect *pRect, CBofWi } -void CBagStorageDevDlg::OnClose() { +void CBagStorageDevDlg::onClose() { if (_pDlgBackground != nullptr) { delete _pDlgBackground; _pDlgBackground = nullptr; @@ -1770,7 +1770,7 @@ void CBagStorageDevDlg::OnClose() { } } - CBofDialog::OnClose(); + CBofDialog::onClose(); Destroy(); // Destruct the main window @@ -1796,10 +1796,10 @@ void CBagStorageDevDlg::OnLButtonDown(uint32 nFlags, CBofPoint *xPoint, void *) CBofDialog::OnLButtonDown(nFlags, xPoint); } -void CBagStorageDevDlg::OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { +void CBagStorageDevDlg::onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { if (CBofDialog::GetRect().PtInRect(*xPoint)) { - CBagStorageDev::OnLButtonUp(nFlags, xPoint, GetAssociateWnd()); - CBofDialog::OnLButtonUp(nFlags, xPoint); + CBagStorageDev::onLButtonUp(nFlags, xPoint, GetAssociateWnd()); + CBofDialog::onLButtonUp(nFlags, xPoint); } else { Close(); } diff --git a/engines/bagel/baglib/storage_dev_win.h b/engines/bagel/baglib/storage_dev_win.h index 5e91ce58548..47b945e91ea 100644 --- a/engines/bagel/baglib/storage_dev_win.h +++ b/engines/bagel/baglib/storage_dev_win.h @@ -331,7 +331,7 @@ public: virtual void onMouseMove(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr); virtual ErrorCode OnMouseOver(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr); virtual void OnLButtonDown(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr); - virtual void OnLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr); + virtual void onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr); virtual ErrorCode OnCursorUpdate(int /*nCurrObj*/) { return ERR_NONE; @@ -476,12 +476,12 @@ public: virtual ErrorCode OnRender(CBofBitmap *pBmp, CBofRect *pRect = nullptr); virtual void OnPaint(CBofRect *); virtual void OnMainLoop(); - void OnClose(); + void onClose(); void onMouseMove(uint32 nFlags, CBofPoint *, void * = nullptr); void OnLButtonDown(uint32 nFlags, CBofPoint *point, void * = nullptr); - void OnLButtonUp(uint32 nFlags, CBofPoint *point, void * = nullptr); + void onLButtonUp(uint32 nFlags, CBofPoint *point, void * = nullptr); - void OnKeyHit(uint32 lKey, uint32 nRepCount); + void onKeyHit(uint32 lKey, uint32 nRepCount); protected: virtual ErrorCode SetWorkBmp(); @@ -540,13 +540,13 @@ public: } virtual void OnMainLoop(); - virtual ErrorCode OnRender(CBofBitmap *pBmp, CBofRect *pRect = nullptr); + virtual ErrorCode onRender(CBofBitmap *pBmp, CBofRect *pRect = nullptr); virtual void OnPaint(CBofRect *); - virtual void OnClose(); + virtual void onClose(); void onMouseMove(uint32 nFlags, CBofPoint *, void * = nullptr); void OnLButtonDown(uint32 nFlags, CBofPoint *point, void * = nullptr); - void OnLButtonUp(uint32 nFlags, CBofPoint *point, void * = nullptr); + void onLButtonUp(uint32 nFlags, CBofPoint *point, void * = nullptr); }; /** diff --git a/engines/bagel/baglib/zoom_pda.cpp b/engines/bagel/baglib/zoom_pda.cpp index 3bac46e52d0..fdb304e00d0 100644 --- a/engines/bagel/baglib/zoom_pda.cpp +++ b/engines/bagel/baglib/zoom_pda.cpp @@ -233,7 +233,7 @@ CBagObject *SBZoomPda::OnNewButtonObject(const CBofString &) { return PdaButtObj; } -void SBZoomPda::OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { +void SBZoomPda::onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { // Need to override the CBagStorageDevWnd::onLButtonUp(nFlags, xPoint) // to do our own thing. @@ -264,7 +264,7 @@ void SBZoomPda::OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { } else { // We have no mode yet, then pass it to the default method if (_pdaMode == NOMODE) { - CBagStorageDevWnd::OnLButtonUp(nFlags, xPoint); + CBagStorageDevWnd::onLButtonUp(nFlags, xPoint); } } } diff --git a/engines/bagel/baglib/zoom_pda.h b/engines/bagel/baglib/zoom_pda.h index 4885a584286..7a59220342b 100644 --- a/engines/bagel/baglib/zoom_pda.h +++ b/engines/bagel/baglib/zoom_pda.h @@ -53,7 +53,7 @@ public: virtual void OnMainLoop(); - void OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void * = nullptr); + void onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void * = nullptr); virtual ErrorCode OnRender(CBofBitmap *pBmp, CBofRect *pRect = nullptr); virtual ErrorCode attachActiveObjects(); diff --git a/engines/bagel/boflib/gui/button.cpp b/engines/bagel/boflib/gui/button.cpp index bdc91f32af0..3b5f83b9008 100644 --- a/engines/bagel/boflib/gui/button.cpp +++ b/engines/bagel/boflib/gui/button.cpp @@ -234,7 +234,7 @@ void CBofButton::OnLButtonDown(uint32, CBofPoint *pPoint, void *) { } -void CBofButton::OnLButtonUp(uint32, CBofPoint *pPoint, void *) { +void CBofButton::onLButtonUp(uint32, CBofPoint *pPoint, void *) { Assert(IsValidObject(this)); Assert(pPoint != nullptr); @@ -265,7 +265,7 @@ void CBofRadioButton::OnLButtonDown(uint32, CBofPoint *pPoint, void *) { } -void CBofRadioButton::OnLButtonUp(uint32, CBofPoint *pPoint, void *) { +void CBofRadioButton::onLButtonUp(uint32, CBofPoint *pPoint, void *) { Assert(IsValidObject(this)); Assert(pPoint != nullptr); } @@ -361,7 +361,7 @@ void CBofCheckButton::OnLButtonDown(uint32, CBofPoint *pPoint, void *) { } -void CBofCheckButton::OnLButtonUp(uint32, CBofPoint *pPoint, void *) { +void CBofCheckButton::onLButtonUp(uint32, CBofPoint *pPoint, void *) { Assert(IsValidObject(this)); Assert(pPoint != nullptr); @@ -629,7 +629,7 @@ void CBofBmpButton::OnLButtonDown(uint32, CBofPoint *pPoint, void *) { } -void CBofBmpButton::OnLButtonUp(uint32, CBofPoint *pPoint, void *) { +void CBofBmpButton::onLButtonUp(uint32, CBofPoint *pPoint, void *) { Assert(IsValidObject(this)); Assert(pPoint != nullptr); diff --git a/engines/bagel/boflib/gui/button.h b/engines/bagel/boflib/gui/button.h index 3fabf255b37..ab15bb91d43 100644 --- a/engines/bagel/boflib/gui/button.h +++ b/engines/bagel/boflib/gui/button.h @@ -71,7 +71,7 @@ public: protected: void OnPaint(CBofRect *pRect) override; void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) override; - void OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) override; + void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) override; RGBCOLOR m_cFaceColor; RGBCOLOR m_cHighlightColor; @@ -89,7 +89,7 @@ public: protected: virtual void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); - virtual void OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); + virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); }; class CBofCheckButton : public CBofButton { @@ -103,7 +103,7 @@ public: protected: virtual void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); - virtual void OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); + virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); }; class CBofBmpButton : public CBofWindow { @@ -132,7 +132,7 @@ 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); + virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); CBofBitmap *m_pButtonUp; CBofBitmap *m_pButtonDown; diff --git a/engines/bagel/boflib/gui/dialog.cpp b/engines/bagel/boflib/gui/dialog.cpp index 26f3fb84c1c..0aca4683855 100644 --- a/engines/bagel/boflib/gui/dialog.cpp +++ b/engines/bagel/boflib/gui/dialog.cpp @@ -129,7 +129,7 @@ ErrorCode CBofDialog::Create(const char *pszName, CBofRect *pRect, CBofWindow *p } -void CBofDialog::OnClose() { +void CBofDialog::onClose() { Assert(IsValidObject(this)); // Release any capture/focus that was active @@ -156,7 +156,7 @@ void CBofDialog::OnClose() { _parent->InvalidateRect(nullptr); } - CBofWindow::OnClose(); + CBofWindow::onClose(); // Stop our personal message loop _bEndDialog = true; diff --git a/engines/bagel/boflib/gui/dialog.h b/engines/bagel/boflib/gui/dialog.h index e99613eec1a..20fb55e787c 100644 --- a/engines/bagel/boflib/gui/dialog.h +++ b/engines/bagel/boflib/gui/dialog.h @@ -54,7 +54,7 @@ protected: virtual ErrorCode KillBackground(); virtual void OnPaint(CBofRect *pRect); - virtual void OnClose(); + virtual void onClose(); virtual void OnInitDialog(); public: diff --git a/engines/bagel/boflib/gui/edit_text.cpp b/engines/bagel/boflib/gui/edit_text.cpp index 27318758eee..890e6ff7b88 100644 --- a/engines/bagel/boflib/gui/edit_text.cpp +++ b/engines/bagel/boflib/gui/edit_text.cpp @@ -122,7 +122,7 @@ void CBofEditText::OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void *) { UpdateWindow(); } -void CBofEditText::OnKeyHit(uint32 lKey, uint32 lRepCount) { +void CBofEditText::onKeyHit(uint32 lKey, uint32 lRepCount) { if (lKey >= 32 && lKey <= 127) { CBofString tmp = _text + lKey; CBofRect rect = CalculateTextRect(this, &tmp, 12, 0); diff --git a/engines/bagel/boflib/gui/edit_text.h b/engines/bagel/boflib/gui/edit_text.h index e2f5090469e..9135e5a042c 100644 --- a/engines/bagel/boflib/gui/edit_text.h +++ b/engines/bagel/boflib/gui/edit_text.h @@ -35,7 +35,7 @@ private: protected: void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) override; - void OnKeyHit(uint32 lKey, uint32 lRepCount) override; + void onKeyHit(uint32 lKey, uint32 lRepCount) override; public: CBofEditText() {} diff --git a/engines/bagel/boflib/gui/list_box.cpp b/engines/bagel/boflib/gui/list_box.cpp index ea3934f40fb..3fb143869d9 100644 --- a/engines/bagel/boflib/gui/list_box.cpp +++ b/engines/bagel/boflib/gui/list_box.cpp @@ -229,7 +229,7 @@ void CBofListBox::OnLButtonDblClk(uint32 /*nFlags*/, CBofPoint *pPoint) { } -void CBofListBox::OnKeyHit(uint32 lKey, uint32 lRepCount) { +void CBofListBox::onKeyHit(uint32 lKey, uint32 lRepCount) { Assert(IsValidObject(this)); switch (lKey) { @@ -261,7 +261,7 @@ void CBofListBox::OnKeyHit(uint32 lKey, uint32 lRepCount) { // Call the previous windows onkeyhit CBofWindow *pParent = GetParent(); if (pParent && pParent != this) { - pParent->OnKeyHit(lKey, lRepCount); + pParent->onKeyHit(lKey, lRepCount); } break; } diff --git a/engines/bagel/boflib/gui/list_box.h b/engines/bagel/boflib/gui/list_box.h index 9ae2a0bdbbf..9e61cff341f 100644 --- a/engines/bagel/boflib/gui/list_box.h +++ b/engines/bagel/boflib/gui/list_box.h @@ -140,7 +140,7 @@ public: protected: virtual void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); virtual void OnLButtonDblClk(uint32 nFlags, CBofPoint *pPoint); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); virtual void OnPaint(CBofRect *pRect); /** diff --git a/engines/bagel/boflib/gui/movie.cpp b/engines/bagel/boflib/gui/movie.cpp index b4d4ce0c72b..b339a0d81c7 100644 --- a/engines/bagel/boflib/gui/movie.cpp +++ b/engines/bagel/boflib/gui/movie.cpp @@ -136,7 +136,7 @@ bool CBofMovie::OpenMovie(const char *sFilename) { return true; } -void CBofMovie::OnKeyHit(uint32 lKey, uint32 /*lRepCount*/) { +void CBofMovie::onKeyHit(uint32 lKey, uint32 /*lRepCount*/) { if (m_bEscCanStop && lKey == BKEY_ESC) { // Clean up and exit m_bLoop = false; @@ -201,9 +201,9 @@ void CBofMovie::CloseMovie() { } } -void CBofMovie::OnClose() { +void CBofMovie::onClose() { CloseMovie(); - CBofDialog::OnClose(); + CBofDialog::onClose(); } void CBofMovie::OnMovieDone() { diff --git a/engines/bagel/boflib/gui/movie.h b/engines/bagel/boflib/gui/movie.h index 3beea59371a..b058c803bf5 100644 --- a/engines/bagel/boflib/gui/movie.h +++ b/engines/bagel/boflib/gui/movie.h @@ -55,7 +55,7 @@ protected: virtual bool Play(); virtual bool Reverse(); - virtual void OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) { + virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) { OnButtonUp(nFlags, pPoint); } virtual void OnRButtonUp(uint32 nFlags, CBofPoint *pPoint) { @@ -64,9 +64,9 @@ protected: virtual void OnButtonUp(uint32 nFlags, CBofPoint *pPoint); virtual void OnPaint(CBofRect *pRect); virtual void OnMovieDone(); - virtual void OnClose(); + virtual void onClose(); virtual void OnMainLoop(); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); public: diff --git a/engines/bagel/boflib/gui/scroll_bar.cpp b/engines/bagel/boflib/gui/scroll_bar.cpp index 01d92c3667f..81d10efd8ca 100644 --- a/engines/bagel/boflib/gui/scroll_bar.cpp +++ b/engines/bagel/boflib/gui/scroll_bar.cpp @@ -438,7 +438,7 @@ int CBofScrollBar::PointToPos(CBofPoint *pPoint) { } -void CBofScrollBar::OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void *) { +void CBofScrollBar::onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void *) { Assert(IsValidObject(this)); if (m_bMouseCaptured) { @@ -476,7 +476,7 @@ void CBofScrollBar::OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void *) { m_nScrollState = 0; } - CBofWindow::OnLButtonUp(nFlags, pPoint); + CBofWindow::onLButtonUp(nFlags, pPoint); } diff --git a/engines/bagel/boflib/gui/scroll_bar.h b/engines/bagel/boflib/gui/scroll_bar.h index 88f3ffe364d..10bc47a194a 100644 --- a/engines/bagel/boflib/gui/scroll_bar.h +++ b/engines/bagel/boflib/gui/scroll_bar.h @@ -110,7 +110,7 @@ protected: virtual void OnPaint(CBofRect *pDirtyRect); virtual void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); - virtual void OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); + virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); virtual void onMouseMove(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); virtual void onTimer(uint32); diff --git a/engines/bagel/boflib/gui/window.cpp b/engines/bagel/boflib/gui/window.cpp index 13b0b5874de..222385620a9 100644 --- a/engines/bagel/boflib/gui/window.cpp +++ b/engines/bagel/boflib/gui/window.cpp @@ -548,20 +548,20 @@ Graphics::ManagedSurface *CBofWindow::getSurface() { void CBofWindow::onMouseMove(uint32, CBofPoint *, void *) {} void CBofWindow::OnLButtonDown(uint32, CBofPoint *, void *) {} -void CBofWindow::OnLButtonUp(uint32, CBofPoint *, void *) {} +void CBofWindow::onLButtonUp(uint32, CBofPoint *, void *) {} void CBofWindow::OnLButtonDblClk(uint32, CBofPoint *) {} void CBofWindow::OnRButtonDown(uint32, CBofPoint *) {} void CBofWindow::OnRButtonUp(uint32, CBofPoint *) {} void CBofWindow::OnRButtonDblClk(uint32, CBofPoint *) {} -void CBofWindow::OnKeyHit(uint32, uint32) {} +void CBofWindow::onKeyHit(uint32, uint32) {} void CBofWindow::OnReSize(CBofSize *) {} void CBofWindow::OnPaint(CBofRect *) {} void CBofWindow::onTimer(uint32) {} -void CBofWindow::OnClose() {} +void CBofWindow::onClose() {} void CBofWindow::OnBofButton(CBofObject *, int) {} void CBofWindow::OnBofScrollBar(CBofObject *, int) {} @@ -659,7 +659,7 @@ void CBofWindow::handleEvent(const Common::Event &event) { break; case Common::EVENT_LBUTTONUP: - OnLButtonUp(0, &mousePos); + onLButtonUp(0, &mousePos); break; case Common::EVENT_RBUTTONDOWN: @@ -680,13 +680,13 @@ void CBofWindow::handleEvent(const Common::Event &event) { uint32 lNewKey; if ((lNewKey = TranslateKey(event)) != BKEY_UNKNOWN) { - OnKeyHit(lNewKey, event.kbdRepeat ? 1 : 0); + onKeyHit(lNewKey, event.kbdRepeat ? 1 : 0); } break; case Common::EVENT_CUSTOM_ENGINE_ACTION_START: if (event.customType != KEYBIND_NONE) - OnKeyHit((event.customType == KEYBIND_WAIT) + onKeyHit((event.customType == KEYBIND_WAIT) ? BKEY_SPACE : BKEY_SCRL_LOCK, 0); break; @@ -696,7 +696,7 @@ void CBofWindow::handleEvent(const Common::Event &event) { break; case Common::EVENT_QUIT: - OnClose(); + onClose(); break; default: diff --git a/engines/bagel/boflib/gui/window.h b/engines/bagel/boflib/gui/window.h index a01b774b9f0..f0d8ebb7e3d 100644 --- a/engines/bagel/boflib/gui/window.h +++ b/engines/bagel/boflib/gui/window.h @@ -154,7 +154,7 @@ public: void ReSize(CBofRect *pRect, bool bRepaint = false); void Close() { - OnClose(); + onClose(); } /** @@ -414,7 +414,7 @@ public: */ void handleEvents(); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); void FillWindow(byte iColor); void FillRect(CBofRect *pRect, byte iColor); @@ -424,7 +424,7 @@ protected: virtual void onMouseMove(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); virtual void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); - virtual void OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); + virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); virtual void OnLButtonDblClk(uint32 nFlags, CBofPoint *pPoint); virtual void OnRButtonDown(uint32 nFlags, CBofPoint *pPoint); @@ -433,7 +433,7 @@ protected: virtual void OnReSize(CBofSize *pSize); virtual void OnPaint(CBofRect *pRect); - virtual void OnClose(); + virtual void onClose(); virtual void OnUserMessage(uint32 nMessage, uint32 lParam); diff --git a/engines/bagel/dialogs/credits_dialog.cpp b/engines/bagel/dialogs/credits_dialog.cpp index 206116aca4a..5252cf22b9f 100644 --- a/engines/bagel/dialogs/credits_dialog.cpp +++ b/engines/bagel/dialogs/credits_dialog.cpp @@ -191,7 +191,7 @@ int CBagCreditsDialog::LinesPerPage() { return n; } -void CBagCreditsDialog::OnClose() { +void CBagCreditsDialog::onClose() { Assert(IsValidObject(this)); if (m_pCreditsBmp != nullptr) { @@ -216,7 +216,7 @@ void CBagCreditsDialog::OnClose() { KillBackdrop(); - CBofDialog::OnClose(); + CBofDialog::onClose(); // Can have cursor back now CursorMan.showMouse(true); @@ -236,7 +236,7 @@ void CBagCreditsDialog::OnLButtonDown(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, NextScreen(); } -void CBagCreditsDialog::OnKeyHit(uint32 /*lKey*/, uint32 /*nRepCount*/) { +void CBagCreditsDialog::onKeyHit(uint32 /*lKey*/, uint32 /*nRepCount*/) { Assert(IsValidObject(this)); NextScreen(); diff --git a/engines/bagel/dialogs/credits_dialog.h b/engines/bagel/dialogs/credits_dialog.h index 17f3134c315..5b61a88ebe4 100644 --- a/engines/bagel/dialogs/credits_dialog.h +++ b/engines/bagel/dialogs/credits_dialog.h @@ -36,9 +36,9 @@ public: protected: virtual void OnPaint(CBofRect *pRect); - virtual void OnClose(); + virtual void onClose(); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); virtual void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); virtual void OnMainLoop(); diff --git a/engines/bagel/dialogs/next_cd_dialog.cpp b/engines/bagel/dialogs/next_cd_dialog.cpp index 22411e66a95..ebec84b4611 100644 --- a/engines/bagel/dialogs/next_cd_dialog.cpp +++ b/engines/bagel/dialogs/next_cd_dialog.cpp @@ -71,7 +71,7 @@ void CBagNextCDDialog::OnInitDialog() { CBagCursor::showSystemCursor(); } -void CBagNextCDDialog::OnClose() { +void CBagNextCDDialog::onClose() { Assert(IsValidObject(this)); CBagCursor::hideSystemCursor(); @@ -82,7 +82,7 @@ void CBagNextCDDialog::OnClose() { m_pButton = nullptr; } - CBofDialog::OnClose(); + CBofDialog::onClose(); } void CBagNextCDDialog::OnPaint(CBofRect *pRect) { @@ -101,7 +101,7 @@ void CBagNextCDDialog::OnPaint(CBofRect *pRect) { ValidateAnscestors(); } -void CBagNextCDDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { +void CBagNextCDDialog::onKeyHit(uint32 lKey, uint32 nRepCount) { Assert(IsValidObject(this)); switch (lKey) { @@ -112,7 +112,7 @@ void CBagNextCDDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { break; default: - CBofDialog::OnKeyHit(lKey, nRepCount); + CBofDialog::onKeyHit(lKey, nRepCount); break; } } diff --git a/engines/bagel/dialogs/next_cd_dialog.h b/engines/bagel/dialogs/next_cd_dialog.h index 1f6233fac23..0c7d2449105 100644 --- a/engines/bagel/dialogs/next_cd_dialog.h +++ b/engines/bagel/dialogs/next_cd_dialog.h @@ -39,10 +39,10 @@ public: protected: virtual void OnPaint(CBofRect *pRect); - virtual void OnClose(); + virtual void onClose(); virtual void OnBofButton(CBofObject *pObject, int nState); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); // Data // @@ -57,10 +57,10 @@ public: protected: virtual void OnPaint(CBofRect *pRect); - virtual void OnClose(); + virtual void onClose(); virtual void OnBofButton(CBofObject *pObject, int nState); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); // Data CBofBmpButton *m_pButton; @@ -74,9 +74,9 @@ public: protected: virtual void OnPaint(CBofRect *pRect); - virtual void OnClose(); + virtual void onClose(); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); virtual void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); virtual void OnMainLoop(); diff --git a/engines/bagel/dialogs/opt_window.cpp b/engines/bagel/dialogs/opt_window.cpp index 44a266229ea..448d11e68ee 100644 --- a/engines/bagel/dialogs/opt_window.cpp +++ b/engines/bagel/dialogs/opt_window.cpp @@ -630,7 +630,7 @@ void CBagOptWindow::OnInitDialog() { attach(); } -void CBagOptWindow::OnKeyHit(uint32 lKey, uint32 lRepCount) { +void CBagOptWindow::onKeyHit(uint32 lKey, uint32 lRepCount) { Assert(IsValidObject(this)); CBagMasterWin *pWin; @@ -714,7 +714,7 @@ void CBagOptWindow::OnKeyHit(uint32 lKey, uint32 lRepCount) { break; default: - CBofDialog::OnKeyHit(lKey, lRepCount); + CBofDialog::onKeyHit(lKey, lRepCount); break; } } diff --git a/engines/bagel/dialogs/opt_window.h b/engines/bagel/dialogs/opt_window.h index 34494ef8960..3ed7919c57a 100644 --- a/engines/bagel/dialogs/opt_window.h +++ b/engines/bagel/dialogs/opt_window.h @@ -83,7 +83,7 @@ protected: virtual void OnBofScrollBar(CBofObject *pObject, int nPos); virtual void OnBofButton(CBofObject *pObject, int nState); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); // Data members // diff --git a/engines/bagel/dialogs/quit_dialog.cpp b/engines/bagel/dialogs/quit_dialog.cpp index f737528ca17..e0b9cde670d 100644 --- a/engines/bagel/dialogs/quit_dialog.cpp +++ b/engines/bagel/dialogs/quit_dialog.cpp @@ -98,7 +98,7 @@ void CBagQuitDialog::OnInitDialog() { } -void CBagQuitDialog::OnClose() { +void CBagQuitDialog::onClose() { Assert(IsValidObject(this)); CBagCursor::hideSystemCursor(); @@ -114,7 +114,7 @@ void CBagQuitDialog::OnClose() { if (_nReturnValue == QUIT_BTN || _nReturnValue == SAVE_BTN) KillBackground(); - CBofDialog::OnClose(); + CBofDialog::onClose(); } @@ -127,7 +127,7 @@ void CBagQuitDialog::OnPaint(CBofRect *pRect) { } -void CBagQuitDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { +void CBagQuitDialog::onKeyHit(uint32 lKey, uint32 nRepCount) { Assert(IsValidObject(this)); if (lKey == BKEY_ESC) { @@ -136,7 +136,7 @@ void CBagQuitDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { SetReturnValue(CANCEL_BTN); Close(); } else - CBofDialog::OnKeyHit(lKey, nRepCount); + CBofDialog::onKeyHit(lKey, nRepCount); } diff --git a/engines/bagel/dialogs/quit_dialog.h b/engines/bagel/dialogs/quit_dialog.h index 2a1433499fa..da180d6a716 100644 --- a/engines/bagel/dialogs/quit_dialog.h +++ b/engines/bagel/dialogs/quit_dialog.h @@ -39,10 +39,10 @@ public: protected: virtual void OnPaint(CBofRect *pRect); - virtual void OnClose(); + virtual void onClose(); virtual void OnBofButton(CBofObject *pObject, int nState); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); // Data CBofBmpButton *m_pButtons[NUM_QUIT_BUTTONS]; diff --git a/engines/bagel/dialogs/restart_dialog.cpp b/engines/bagel/dialogs/restart_dialog.cpp index 959c00b39eb..79dbe98e8ff 100644 --- a/engines/bagel/dialogs/restart_dialog.cpp +++ b/engines/bagel/dialogs/restart_dialog.cpp @@ -109,7 +109,7 @@ void CBagRestartDialog::OnInitDialog() { } -void CBagRestartDialog::OnClose() { +void CBagRestartDialog::onClose() { Assert(IsValidObject(this)); CBagCursor::hideSystemCursor(); @@ -122,7 +122,7 @@ void CBagRestartDialog::OnClose() { } } - CBofDialog::OnClose(); + CBofDialog::onClose(); if (_nReturnValue != RESTART_BTN) { CBofApp::GetApp()->SetPalette(m_pSavePalette); @@ -141,7 +141,7 @@ void CBagRestartDialog::OnPaint(CBofRect *pRect) { } -void CBagRestartDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { +void CBagRestartDialog::onKeyHit(uint32 lKey, uint32 nRepCount) { Assert(IsValidObject(this)); switch (lKey) { @@ -173,7 +173,7 @@ void CBagRestartDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { KillBackground(); _nReturnValue = RESTART_BTN; - OnClose(); + onClose(); } } break; @@ -185,7 +185,7 @@ void CBagRestartDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { break; default: - CBofDialog::OnKeyHit(lKey, nRepCount); + CBofDialog::onKeyHit(lKey, nRepCount); break; } } @@ -234,7 +234,7 @@ void CBagRestartDialog::OnBofButton(CBofObject *pObject, int nFlags) { KillBackground(); _nReturnValue = RESTART_BTN; - OnClose(); + onClose(); } } break; diff --git a/engines/bagel/dialogs/restart_dialog.h b/engines/bagel/dialogs/restart_dialog.h index 97329658574..7420839f5fe 100644 --- a/engines/bagel/dialogs/restart_dialog.h +++ b/engines/bagel/dialogs/restart_dialog.h @@ -39,10 +39,10 @@ public: protected: virtual void OnPaint(CBofRect *pRect); - virtual void OnClose(); + virtual void onClose(); virtual void OnBofButton(CBofObject *pObject, int nState); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); // Data CBofBmpButton *m_pButtons[NUM_RESTART_BTNS]; diff --git a/engines/bagel/dialogs/restore_dialog.cpp b/engines/bagel/dialogs/restore_dialog.cpp index 9a81845ae5a..a07e3a87bc8 100644 --- a/engines/bagel/dialogs/restore_dialog.cpp +++ b/engines/bagel/dialogs/restore_dialog.cpp @@ -305,7 +305,7 @@ ErrorCode CBagRestoreDialog::RestoreAndClose() { return m_errCode; } -void CBagRestoreDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { +void CBagRestoreDialog::onKeyHit(uint32 lKey, uint32 nRepCount) { Assert(IsValidObject(this)); switch (lKey) { @@ -346,7 +346,7 @@ void CBagRestoreDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { break; default: - CBofDialog::OnKeyHit(lKey, nRepCount); + CBofDialog::onKeyHit(lKey, nRepCount); break; } } diff --git a/engines/bagel/dialogs/restore_dialog.h b/engines/bagel/dialogs/restore_dialog.h index 3d447fcfa87..2d8202d7080 100644 --- a/engines/bagel/dialogs/restore_dialog.h +++ b/engines/bagel/dialogs/restore_dialog.h @@ -55,7 +55,7 @@ protected: void OnBofButton(CBofObject *pObject, int nState) override; void OnBofListBox(CBofObject *pObject, int nItemIndex) override; - void OnKeyHit(uint32 lKey, uint32 lRepCount) override; + void onKeyHit(uint32 lKey, uint32 lRepCount) override; public: CBagRestoreDialog(); diff --git a/engines/bagel/dialogs/save_dialog.cpp b/engines/bagel/dialogs/save_dialog.cpp index c512b9c4a05..3d7dbeb5dbb 100644 --- a/engines/bagel/dialogs/save_dialog.cpp +++ b/engines/bagel/dialogs/save_dialog.cpp @@ -295,7 +295,7 @@ void CBagSaveDialog::SaveAndClose() { } -void CBagSaveDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { +void CBagSaveDialog::onKeyHit(uint32 lKey, uint32 nRepCount) { Assert(IsValidObject(this)); switch (lKey) { @@ -335,7 +335,7 @@ void CBagSaveDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { break; default: - CBofDialog::OnKeyHit(lKey, nRepCount); + CBofDialog::onKeyHit(lKey, nRepCount); break; } } diff --git a/engines/bagel/dialogs/save_dialog.h b/engines/bagel/dialogs/save_dialog.h index f805c8308bd..a3afa816fd5 100644 --- a/engines/bagel/dialogs/save_dialog.h +++ b/engines/bagel/dialogs/save_dialog.h @@ -57,7 +57,7 @@ protected: virtual void OnPaint(CBofRect *pRect) override; virtual void OnBofButton(CBofObject *pObject, int nState) override; virtual void OnBofListBox(CBofObject *pObject, int nItemIndex) override; - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount) override; + virtual void onKeyHit(uint32 lKey, uint32 lRepCount) override; void SaveAndClose(); diff --git a/engines/bagel/dialogs/start_dialog.cpp b/engines/bagel/dialogs/start_dialog.cpp index 67b9ebc4002..478d8e65c9c 100644 --- a/engines/bagel/dialogs/start_dialog.cpp +++ b/engines/bagel/dialogs/start_dialog.cpp @@ -102,7 +102,7 @@ void CBagStartDialog::OnInitDialog() { } -void CBagStartDialog::OnClose() { +void CBagStartDialog::onClose() { Assert(IsValidObject(this)); CBagCursor::hideSystemCursor(); @@ -117,7 +117,7 @@ void CBagStartDialog::OnClose() { KillBackground(); - CBofDialog::OnClose(); + CBofDialog::onClose(); } @@ -130,7 +130,7 @@ void CBagStartDialog::OnPaint(CBofRect *pRect) { } -void CBagStartDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { +void CBagStartDialog::onKeyHit(uint32 lKey, uint32 nRepCount) { Assert(IsValidObject(this)); switch (lKey) { @@ -140,7 +140,7 @@ void CBagStartDialog::OnKeyHit(uint32 lKey, uint32 nRepCount) { break; default: - CBofDialog::OnKeyHit(lKey, nRepCount); + CBofDialog::onKeyHit(lKey, nRepCount); break; } } diff --git a/engines/bagel/dialogs/start_dialog.h b/engines/bagel/dialogs/start_dialog.h index b45f154b7d4..d6d16da65eb 100644 --- a/engines/bagel/dialogs/start_dialog.h +++ b/engines/bagel/dialogs/start_dialog.h @@ -40,10 +40,10 @@ private: protected: void OnPaint(CBofRect *pRect) override; - void OnClose() override; + void onClose() override; void OnBofButton(CBofObject *pObject, int nState) override; - void OnKeyHit(uint32 lKey, uint32 lRepCount) override; + void onKeyHit(uint32 lKey, uint32 lRepCount) override; public: CBagStartDialog(const char *pszFileName, CBofWindow *pWin); diff --git a/engines/bagel/spacebar/bib_odds_wnd.cpp b/engines/bagel/spacebar/bib_odds_wnd.cpp index 086b88fa088..839530c8197 100644 --- a/engines/bagel/spacebar/bib_odds_wnd.cpp +++ b/engines/bagel/spacebar/bib_odds_wnd.cpp @@ -63,7 +63,7 @@ ErrorCode SBarBibOddsWnd::detach() { return CBagChatWnd::detach(); } -void SBarBibOddsWnd::OnKeyHit(uint32 lKey, uint32 lRepCount) { +void SBarBibOddsWnd::onKeyHit(uint32 lKey, uint32 lRepCount) { CBagVar *pVar = VARMNGR->GetVariable("TORSOSTATE"); if (pVar != nullptr) { @@ -109,7 +109,7 @@ void SBarBibOddsWnd::OnKeyHit(uint32 lKey, uint32 lRepCount) { } } - CBagChatWnd::OnKeyHit(lKey, lRepCount); + CBagChatWnd::onKeyHit(lKey, lRepCount); } void SBarBibOddsWnd::onMouseMove(uint32 nFlags, CBofPoint *pPoint, void *) { diff --git a/engines/bagel/spacebar/bib_odds_wnd.h b/engines/bagel/spacebar/bib_odds_wnd.h index 53ef065d632..08fa59b7029 100644 --- a/engines/bagel/spacebar/bib_odds_wnd.h +++ b/engines/bagel/spacebar/bib_odds_wnd.h @@ -39,7 +39,7 @@ public: virtual ErrorCode detach(); // This function detaches the background and necessary bitmaps void onMouseMove(uint32 nFlags, CBofPoint *xPoint, void * = nullptr); - void OnKeyHit(uint32 lKey, uint32 lRepCount); + void onKeyHit(uint32 lKey, uint32 lRepCount); static void initialize(); static CBagObject *m_pWieldedObject; diff --git a/engines/bagel/spacebar/bibble_window.cpp b/engines/bagel/spacebar/bibble_window.cpp index 52ae445911c..c460651cdb3 100644 --- a/engines/bagel/spacebar/bibble_window.cpp +++ b/engines/bagel/spacebar/bibble_window.cpp @@ -700,7 +700,7 @@ void CBibbleWindow::OnBofButton(CBofObject *pObject, int nState) { } } -void CBibbleWindow::OnClose() { +void CBibbleWindow::onClose() { g_engine->quitGame(); } @@ -1088,7 +1088,7 @@ void CBibbleWindow::OnLButtonDblClk(uint32 /*nFlags*/, CBofPoint *pPoint) { } -void CBibbleWindow::OnLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void *) { +void CBibbleWindow::onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void *) { Assert(IsValidObject(this)); } @@ -1188,7 +1188,7 @@ ErrorCode CBibbleWindow::UnHighlight(CBetArea *pArea) { return m_errCode; } -void CBibbleWindow::OnKeyHit(uint32 lKey, uint32 /*lRepCount*/) { +void CBibbleWindow::onKeyHit(uint32 lKey, uint32 /*lRepCount*/) { Assert(IsValidObject(this)); if (lKey == BKEY_ESC) diff --git a/engines/bagel/spacebar/bibble_window.h b/engines/bagel/spacebar/bibble_window.h index 560e4d6a3e8..9bf69ec7685 100644 --- a/engines/bagel/spacebar/bibble_window.h +++ b/engines/bagel/spacebar/bibble_window.h @@ -83,7 +83,7 @@ public: virtual ErrorCode detach(); virtual void OnBofButton(CBofObject *pButton, int nState); - virtual void OnClose(); + virtual void onClose(); protected: ErrorCode PlayGame(); @@ -96,9 +96,9 @@ protected: ErrorCode UnHighlight(CBetArea *pArea); virtual void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); - virtual void OnLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); + virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); virtual void OnLButtonDblClk(uint32 nFlags, CBofPoint *pPoint); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); virtual void OnPaint(CBofRect *pRect); virtual void OnMainLoop(); diff --git a/engines/bagel/spacebar/computer.cpp b/engines/bagel/spacebar/computer.cpp index 7da7bd4f1c0..d10126e89c7 100644 --- a/engines/bagel/spacebar/computer.cpp +++ b/engines/bagel/spacebar/computer.cpp @@ -854,7 +854,7 @@ void SBarComputer::OnBofButton(CBofObject *pObject, int nState) { } } -void SBarComputer::OnKeyHit(uint32 lKey, uint32 nRepCount) { +void SBarComputer::onKeyHit(uint32 lKey, uint32 nRepCount) { Assert(IsValidObject(this)); switch (lKey) { @@ -899,7 +899,7 @@ void SBarComputer::OnKeyHit(uint32 lKey, uint32 nRepCount) { break; default: - CBagStorageDevWnd::OnKeyHit(lKey, nRepCount); + CBagStorageDevWnd::onKeyHit(lKey, nRepCount); break; } } diff --git a/engines/bagel/spacebar/computer.h b/engines/bagel/spacebar/computer.h index e83572c6622..87f4ca7ddcc 100644 --- a/engines/bagel/spacebar/computer.h +++ b/engines/bagel/spacebar/computer.h @@ -85,7 +85,7 @@ public: void OnBofListBox(CBofObject *pListBox, int nItemIndex); virtual void OnBofButton(CBofObject *pButton, int nState); - virtual void OnKeyHit(uint32 lKey, uint32 nRepCount); + virtual void onKeyHit(uint32 lKey, uint32 nRepCount); /** * This function attaches the background and necessary bitmaps @@ -138,7 +138,7 @@ public: void EraseBackdrop(); void OnLButtonDown(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void * = nullptr) {} - void OnLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void * = nullptr) {} + void onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void * = nullptr) {} void onMouseMove(uint32 nFlags, CBofPoint *, void * = nullptr); }; diff --git a/engines/bagel/spacebar/main_window.cpp b/engines/bagel/spacebar/main_window.cpp index 32a0f84700c..a3c2e1cc0c0 100644 --- a/engines/bagel/spacebar/main_window.cpp +++ b/engines/bagel/spacebar/main_window.cpp @@ -328,7 +328,7 @@ ErrorCode CMainWindow::OnCursorUpdate(int nCurrObj) { } -void CMainWindow::OnKeyHit(uint32 lKey, uint32 lRepCount) { +void CMainWindow::onKeyHit(uint32 lKey, uint32 lRepCount) { // Terminate app on ALT_Q if ((lKey == BKEY_ALT_q) || (lKey == BKEY_ALT_F4)) { Close(); @@ -346,7 +346,7 @@ void CMainWindow::OnKeyHit(uint32 lKey, uint32 lRepCount) { } } else { // Default action - CBagPanWindow::OnKeyHit(lKey, lRepCount); + CBagPanWindow::onKeyHit(lKey, lRepCount); } } @@ -410,13 +410,13 @@ void CMainWindow::onMouseMove(uint32 nFlags, CBofPoint *pPoint, void *) { } -void CMainWindow::OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { +void CMainWindow::onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) { if (GetFilterId() & 0x08) { if (m_bZzazzlVision) // If zzazzl paint is toggled on CorrectZzazzlePoint(xPoint); } - CBagPanWindow::OnLButtonUp(nFlags, xPoint); + CBagPanWindow::onLButtonUp(nFlags, xPoint); } @@ -429,8 +429,8 @@ void CMainWindow::OnLButtonDown(uint32 nFlags, CBofPoint *xPoint, void *) { CBagPanWindow::OnLButtonDown(nFlags, xPoint); } -void CMainWindow::OnClose() { - CBagPanWindow::OnClose(); // Destruct the main window +void CMainWindow::onClose() { + CBagPanWindow::onClose(); // Destruct the main window } diff --git a/engines/bagel/spacebar/main_window.h b/engines/bagel/spacebar/main_window.h index fb0d54da9ef..bbf39ddc2b3 100644 --- a/engines/bagel/spacebar/main_window.h +++ b/engines/bagel/spacebar/main_window.h @@ -111,10 +111,10 @@ public: ErrorCode OnCursorUpdate(int nCurrObj); - void OnClose(); + 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 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); }; diff --git a/engines/bagel/spacebar/master_win.cpp b/engines/bagel/spacebar/master_win.cpp index 4dcf8aadf9a..cdd1a24893a 100644 --- a/engines/bagel/spacebar/master_win.cpp +++ b/engines/bagel/spacebar/master_win.cpp @@ -192,13 +192,13 @@ CBagStorageDev *CSBarMasterWin::OnNewStorageDev(int nType) { } -void CSBarMasterWin::OnKeyHit(uint32 lKey, uint32 lRepCount) { +void CSBarMasterWin::onKeyHit(uint32 lKey, uint32 lRepCount) { Assert(IsValidObject(this)); if (lKey == BKEY_ALT_v) { BofMessageBox(GetBuildVersion(), "Version"); } else { - CBagMasterWin::OnKeyHit(lKey, lRepCount); + CBagMasterWin::onKeyHit(lKey, lRepCount); } } diff --git a/engines/bagel/spacebar/master_win.h b/engines/bagel/spacebar/master_win.h index b3dc8a82769..1968b7e9875 100644 --- a/engines/bagel/spacebar/master_win.h +++ b/engines/bagel/spacebar/master_win.h @@ -39,7 +39,7 @@ public: virtual CBagStorageDev *OnNewStorageDev(const CBofString &typestr); virtual CBagStorageDev *OnNewStorageDev(int nType); - virtual void OnKeyHit(uint32 lKey, uint32 lRepCount); + virtual void onKeyHit(uint32 lKey, uint32 lRepCount); void OnNewFilter(CBagStorageDev *pSDev, const CBofString &typestr); void OnNewFilter(CBagStorageDev *pSDev, const int nType); diff --git a/engines/bagel/spacebar/nav_window.cpp b/engines/bagel/spacebar/nav_window.cpp index 1d9a8fe50e1..ed6044f88d4 100644 --- a/engines/bagel/spacebar/nav_window.cpp +++ b/engines/bagel/spacebar/nav_window.cpp @@ -841,7 +841,7 @@ void CNavWindow::OnLButtonDown(uint32 /*nFlags*/, CBofPoint *pPoint, void *) { } -void CNavWindow::OnKeyHit(uint32 lKey, uint32 /*lRepCount*/) { +void CNavWindow::onKeyHit(uint32 lKey, uint32 /*lRepCount*/) { Assert(IsValidObject(this)); if (lKey == BKEY_ALT_q || lKey == BKEY_ALT_F4) { diff --git a/engines/bagel/spacebar/nav_window.h b/engines/bagel/spacebar/nav_window.h index 69f9e0bf868..4b789f54c2f 100644 --- a/engines/bagel/spacebar/nav_window.h +++ b/engines/bagel/spacebar/nav_window.h @@ -63,7 +63,7 @@ protected: void CalcFuel(double hf); void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr) override; - void OnKeyHit(uint32 lKey, uint32 lRepCount) override; + void onKeyHit(uint32 lKey, uint32 lRepCount) override; void onTimer(uint32 tId) override; void OnPaint(CBofRect *pRect) override; void OnMainLoop() override; diff --git a/engines/bagel/spacebar/slot_wnd.h b/engines/bagel/spacebar/slot_wnd.h index 28a80ac6143..eb7e0477152 100644 --- a/engines/bagel/spacebar/slot_wnd.h +++ b/engines/bagel/spacebar/slot_wnd.h @@ -128,7 +128,7 @@ public: void OnPaint(CBofRect *pRect); void onTimer(uint32 nTimerId); void OnLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr); - void OnLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void * = nullptr) { + void onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void * = nullptr) { } }; diff --git a/engines/bagel/spacebar/sraf_computer.cpp b/engines/bagel/spacebar/sraf_computer.cpp index c0bc78b1891..26021440d75 100644 --- a/engines/bagel/spacebar/sraf_computer.cpp +++ b/engines/bagel/spacebar/sraf_computer.cpp @@ -1045,13 +1045,13 @@ ErrorCode SrafComputer::detach() { } -void SrafComputer::OnLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void *) { +void SrafComputer::onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void *) { } void SrafComputer::OnLButtonDown(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void *) { } -void SrafComputer::OnKeyHit(uint32 lKey, uint32 nRepCount) { +void SrafComputer::onKeyHit(uint32 lKey, uint32 nRepCount) { switch (lKey) { case BKEY_BACK: // Temporary, go back to main screen. DeleteListBox(); @@ -1069,7 +1069,7 @@ void SrafComputer::OnKeyHit(uint32 lKey, uint32 nRepCount) { break; default: - CBagStorageDevWnd::OnKeyHit(lKey, nRepCount); + CBagStorageDevWnd::onKeyHit(lKey, nRepCount); break; } } @@ -4655,8 +4655,8 @@ SrafTextScreen::~SrafTextScreen() { // Called to delete our text object -void SrafTextScreen::OnClose() { - CBofDialog::OnClose(); +void SrafTextScreen::onClose() { + CBofDialog::onClose(); // Set the backdrop to nullptr so that it doesn't get trashed (we borrowed it from // the sraf computer. diff --git a/engines/bagel/spacebar/sraf_computer.h b/engines/bagel/spacebar/sraf_computer.h index 6e4ef2ed18c..1b0ae6ca85d 100644 --- a/engines/bagel/spacebar/sraf_computer.h +++ b/engines/bagel/spacebar/sraf_computer.h @@ -113,7 +113,7 @@ public: void DisplayTextScreen(); void OnBofButton(CBofObject *, int) override; - void OnClose() override; + void onClose() override; void OnPaint(CBofRect * pRect) override; }; @@ -143,11 +143,11 @@ class SrafComputer : public CBagStorageDevWnd { public: SrafComputer(); virtual ~SrafComputer(); - virtual void OnKeyHit(uint32 lKey, uint32 nRepCount); + virtual void onKeyHit(uint32 lKey, uint32 nRepCount); virtual ErrorCode attach(); virtual ErrorCode detach(); void OnLButtonDown(uint32 nFlags, CBofPoint *xPoint, void * = nullptr); - void OnLButtonUp(uint32 nFlags, CBofPoint *xPoint, void * = nullptr); + void onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void * = nullptr); void OnMainLoop(); void OnPaint(CBofRect *pRect); void OnBofButton(CBofObject *, int);