[Scummvm-git-logs] scummvm master -> 87de02d782193aaba30b72075877296b6e2cd8e8
Strangerke
noreply at scummvm.org
Wed Jun 5 21:38:37 UTC 2024
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:
87de02d782 BAGEL: Remove const qualifier for parameters in function declarations
Commit: 87de02d782193aaba30b72075877296b6e2cd8e8
https://github.com/scummvm/scummvm/commit/87de02d782193aaba30b72075877296b6e2cd8e8
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-05T22:36:05+01:00
Commit Message:
BAGEL: Remove const qualifier for parameters in function declarations
Changed paths:
engines/bagel/baglib/master_win.h
engines/bagel/baglib/pan_bitmap.h
engines/bagel/baglib/storage_dev_win.h
engines/bagel/boflib/gfx/sprite.h
engines/bagel/boflib/gfx/text.h
engines/bagel/boflib/gui/text_box.h
engines/bagel/boflib/sound.h
engines/bagel/spacebar/filter.h
engines/bagel/spacebar/main_window.h
engines/bagel/spacebar/master_win.h
diff --git a/engines/bagel/baglib/master_win.h b/engines/bagel/baglib/master_win.h
index c2c423b4bbc..8c958a4aeab 100644
--- a/engines/bagel/baglib/master_win.h
+++ b/engines/bagel/baglib/master_win.h
@@ -178,7 +178,7 @@ public:
virtual CBagStorageDev *onNewStorageDev(int type) = 0;
virtual void onNewFilter(CBagStorageDev *, const CBofString &typeStr) = 0;
- virtual void onNewFilter(CBagStorageDev *sdev, const int type) = 0;
+ virtual void onNewFilter(CBagStorageDev *sdev, int type) = 0;
virtual ErrorCode onHelp(const CBofString &helpFile, bool saveBkgFl = true, CBofWindow *parent = nullptr);
diff --git a/engines/bagel/baglib/pan_bitmap.h b/engines/bagel/baglib/pan_bitmap.h
index 692a9be5c87..7cbdf079ec1 100644
--- a/engines/bagel/baglib/pan_bitmap.h
+++ b/engines/bagel/baglib/pan_bitmap.h
@@ -68,9 +68,9 @@ public:
return _bPanorama;
}
- ErrorCode paint(CBofBitmap *pBmp, const CBofPoint xDstOffset = CBofPoint(0, 0));
+ ErrorCode paint(CBofBitmap *pBmp, CBofPoint xDstOffset = CBofPoint(0, 0));
ErrorCode paintUncorrected(CBofBitmap *pBmp, CBofRect &dstRect);
- ErrorCode paintWarped(CBofBitmap *pBmp, const CBofRect &dstRect, const CBofRect &srcRect, const int offset = 0, CBofBitmap *pSrcBmp = nullptr, const CBofRect &preSrcRect = CBofRect());
+ ErrorCode paintWarped(CBofBitmap *pBmp, const CBofRect &dstRect, const CBofRect &srcRect, int offset = 0, CBofBitmap *pSrcBmp = nullptr, const CBofRect &preSrcRect = CBofRect());
CBofRect getWarpSrcRect();
CBofPoint warpedPoint(CBofPoint &xPoint);
diff --git a/engines/bagel/baglib/storage_dev_win.h b/engines/bagel/baglib/storage_dev_win.h
index d1313f77441..a6d92b483b3 100644
--- a/engines/bagel/baglib/storage_dev_win.h
+++ b/engines/bagel/baglib/storage_dev_win.h
@@ -69,7 +69,7 @@ public:
};
// Filter function function prototype.
-typedef bool (*FilterFunction)(const uint16 nFilterId, CBofBitmap *, CBofRect *);
+typedef bool (*FilterFunction)(uint16 nFilterId, CBofBitmap *, CBofRect *);
/**
* CBagPanWindow is a window that contains a slide bitmap object. It has specialize
diff --git a/engines/bagel/boflib/gfx/sprite.h b/engines/bagel/boflib/gfx/sprite.h
index 1e75ddf91f8..c3ced48bdda 100644
--- a/engines/bagel/boflib/gfx/sprite.h
+++ b/engines/bagel/boflib/gfx/sprite.h
@@ -55,24 +55,24 @@ public:
bool loadSprite(const char *pszPathName, int nCels = 1);
bool loadSprite(CBofBitmap *pBitmap, int nCels = 1);
- bool paintSprite(CBofBitmap *pBmp, const int x, const int y);
+ bool paintSprite(CBofBitmap *pBmp, int x, int y);
bool paintSprite(CBofBitmap *pBmp, CBofPoint point) {
return paintSprite(pBmp, point.x, point.y);
}
- bool paintSprite(CBofWindow *pWnd, const int x, const int y);
+ bool paintSprite(CBofWindow *pWnd, int x, int y);
bool paintSprite(CBofWindow *pWnd, CBofPoint point) {
return paintSprite(pWnd, point.x, point.y);
}
- bool paintCel(CBofWindow *pWnd, int nCelId, const int x, const int y);
- bool paintCel(CBofBitmap *pBmp, int nCelId, const int x, const int y);
+ bool paintCel(CBofWindow *pWnd, int nCelId, int x, int y);
+ bool paintCel(CBofBitmap *pBmp, int nCelId, int x, int y);
- void batchPaint(const int, const int y);
+ void batchPaint(int, int y);
void batchErase();
- bool setupCels(const int nCels);
- void setCel(const int nCelID);
+ bool setupCels(int nCels);
+ void setCel(int nCelID);
void nextCel();
void prevCel();
diff --git a/engines/bagel/boflib/gfx/text.h b/engines/bagel/boflib/gfx/text.h
index e35fe5e68de..a0dda34db83 100644
--- a/engines/bagel/boflib/gfx/text.h
+++ b/engines/bagel/boflib/gfx/text.h
@@ -262,7 +262,7 @@ public:
* @param nFont Font used (default or mono)
* @return Error return Code
*/
- ErrorCode displayTextEx(CBofBitmap *pBmp, const char *pszText, CBofRect *pRect, const int nSize, const int nWeight, const bool bShadowed, int nFont = FONT_DEFAULT);
+ ErrorCode displayTextEx(CBofBitmap *pBmp, const char *pszText, CBofRect *pRect, int nSize, int nWeight, bool bShadowed, int nFont = FONT_DEFAULT);
static Graphics::Font *getFont(int nFont, int nSize, int nWeight);
@@ -283,8 +283,8 @@ private:
* @param nFont Font used (default or mono)
* @return Error return Code
*/
- ErrorCode displayText(CBofWindow *pWnd, const char *pszText, CBofRect *pRect, const int nSize, const int nWeight, const bool bShadowed, int nFont = FONT_DEFAULT);
- ErrorCode displayText(CBofBitmap *pBmp, const char *pszText, CBofRect *pRect, const int nSize, const int nWeight, const bool bShadowed, int nFont = FONT_DEFAULT);
+ ErrorCode displayText(CBofWindow *pWnd, const char *pszText, CBofRect *pRect, int nSize, int nWeight, bool bShadowed, int nFont = FONT_DEFAULT);
+ ErrorCode displayText(CBofBitmap *pBmp, const char *pszText, CBofRect *pRect, int nSize, int nWeight, bool bShadowed, int nFont = FONT_DEFAULT);
void displayLine(Graphics::Font *font, Graphics::ManagedSurface &surface, const Common::U32String &line,
int left, int top, int width, int color, Graphics::TextAlign align);
@@ -320,10 +320,10 @@ protected:
// Global text functions
//
-ErrorCode paintText(CBofWindow *pWnd, CBofRect *pRect, const char *, const int nSize, const int nWeight, const RGBCOLOR cColor = CTEXT_COLOR, int nJustify = JUSTIFY_CENTER, uint32 nFormat = FORMAT_DEFAULT, int nFont = FONT_DEFAULT);
-ErrorCode paintText(CBofBitmap *pBmp, CBofRect *pRect, const char *, const int nSize, const int nWeight, const RGBCOLOR cColor = CTEXT_COLOR, int nJustify = JUSTIFY_CENTER, uint32 nFormat = FORMAT_DEFAULT, int nFont = FONT_DEFAULT);
+ErrorCode paintText(CBofWindow *pWnd, CBofRect *pRect, const char *, int nSize, int nWeight, RGBCOLOR cColor = CTEXT_COLOR, int nJustify = JUSTIFY_CENTER, uint32 nFormat = FORMAT_DEFAULT, int nFont = FONT_DEFAULT);
+ErrorCode paintText(CBofBitmap *pBmp, CBofRect *pRect, const char *, int nSize, int nWeight, RGBCOLOR cColor = CTEXT_COLOR, int nJustify = JUSTIFY_CENTER, uint32 nFormat = FORMAT_DEFAULT, int nFont = FONT_DEFAULT);
-ErrorCode paintShadowedText(CBofBitmap *, CBofRect *pRect, const char *, const int nSize, const int nWeight, const RGBCOLOR cColor = CTEXT_COLOR, int nJustify = JUSTIFY_CENTER, uint32 n = FORMAT_DEFAULT, int nFont = FONT_DEFAULT);
+ErrorCode paintShadowedText(CBofBitmap *, CBofRect *pRect, const char *, int nSize, int nWeight, RGBCOLOR cColor = CTEXT_COLOR, int nJustify = JUSTIFY_CENTER, uint32 n = FORMAT_DEFAULT, int nFont = FONT_DEFAULT);
/**
* Utility routine that will calculate the rectangle that a text string
diff --git a/engines/bagel/boflib/gui/text_box.h b/engines/bagel/boflib/gui/text_box.h
index 0e82100ae89..06c543db5c0 100644
--- a/engines/bagel/boflib/gui/text_box.h
+++ b/engines/bagel/boflib/gui/text_box.h
@@ -94,12 +94,12 @@ public:
return scrollDown(_nPageSize);
}
- ErrorCode scrollUp(const int nLines);
+ ErrorCode scrollUp(int nLines);
ErrorCode scrollDown(const int nLines) {
return scrollUp(-nLines);
}
- ErrorCode scrollTo(const int nLine);
+ ErrorCode scrollTo(int nLine);
ErrorCode display();
ErrorCode erase();
diff --git a/engines/bagel/boflib/sound.h b/engines/bagel/boflib/sound.h
index 55b4f82bd55..285a896d627 100644
--- a/engines/bagel/boflib/sound.h
+++ b/engines/bagel/boflib/sound.h
@@ -74,7 +74,7 @@ class CBofSound : public CBofError, public CBofObject, public CLList {
public:
friend class MusicPlayer;
- CBofSound(CBofWindow *pWnd, const char *pszPathName, uint16 wFlags, const int nLoops = 1);
+ CBofSound(CBofWindow *pWnd, const char *pszPathName, uint16 wFlags, int nLoops = 1);
virtual ~CBofSound();
bool midiLoopPlaySegment(uint32 LoopBegin, uint32 LoopEnd = 0L, uint32 FirstPassBegin = 0L, uint32 TimeFmt = FMT_MILLISEC);
diff --git a/engines/bagel/spacebar/filter.h b/engines/bagel/spacebar/filter.h
index 51eb746821e..f9bf557794d 100644
--- a/engines/bagel/spacebar/filter.h
+++ b/engines/bagel/spacebar/filter.h
@@ -35,14 +35,14 @@ const uint16 kVildroidFilter = (uint16)4;
const uint16 kZzazzlFilter = (uint16)8;
const uint16 kLightningFilter = (uint16)16;
-typedef bool(*FilterFxn)(const uint16, CBofBitmap *, CBofRect *);
+typedef bool(*FilterFxn)(uint16, CBofBitmap *, CBofRect *);
void vilInitFilters(CBofBitmap *pBmp);
void triInitFilters(CBofBitmap *pBmp);
void lightningInitFilters();
void destroyFilters();
-bool doFilters(const uint16 nFilterId, CBofBitmap *pBmp, CBofRect *pRect);
+bool doFilters(uint16 nFilterId, CBofBitmap *pBmp, CBofRect *pRect);
} // namespace SpaceBar
} // namespace Bagel
diff --git a/engines/bagel/spacebar/main_window.h b/engines/bagel/spacebar/main_window.h
index d1417988ec6..78919e5dc70 100644
--- a/engines/bagel/spacebar/main_window.h
+++ b/engines/bagel/spacebar/main_window.h
@@ -103,7 +103,7 @@ public:
_nGameMode = mode;
}
- ErrorCode setloadFilePos(const CBofPoint dstLoc);
+ ErrorCode setloadFilePos(CBofPoint dstLoc);
CBagObject *onNewLinkObject(const CBofString &sInit);
diff --git a/engines/bagel/spacebar/master_win.h b/engines/bagel/spacebar/master_win.h
index 1e14d20e4b7..0d4c6000209 100644
--- a/engines/bagel/spacebar/master_win.h
+++ b/engines/bagel/spacebar/master_win.h
@@ -42,7 +42,7 @@ public:
virtual void onKeyHit(uint32 lKey, uint32 lRepCount);
void onNewFilter(CBagStorageDev *pSDev, const CBofString &typestr);
- void onNewFilter(CBagStorageDev *pSDev, const int nType);
+ void onNewFilter(CBagStorageDev *pSDev, int nType);
};
} // namespace SpaceBar
More information about the Scummvm-git-logs
mailing list