Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up : Add some const.

Browse source
This commit is contained in:
Joris 2012-11-12 11:47:00 +01:00
parent acb4a72739
commit 46d3f1d358
3 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/include/font.h
View file

@ -165,7 +165,7 @@ extern void SetDefaultTextColors(const std::string &normal, const std::string &r
/// Get the default text colors for normal and reverse text
extern void GetDefaultTextColors(std::string &normalp, std::string &reversep);
/// Return the 'line' line of the string 's'.
extern std::string GetLineFont(unsigned int line, const std::string &s, unsigned int maxlen, CFont *font);
extern std::string GetLineFont(unsigned int line, const std::string &s, unsigned int maxlen, const CFont *font);
/// Get the hot key from a string
extern int GetHotKey(const std::string &text);

31
src/ui/botpanel.cpp
View file

@ -324,7 +324,7 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
/* virtual */ int CPopupContentTypeButtonInfo::GetWidth(const ButtonAction &button, int *) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
const CFont &font = this->Font ? *this->Font : GetSmallFont();
std::string draw("");
switch (this->InfoType) {
case PopupButtonInfo_Hint:
@ -353,9 +353,9 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
/* virtual */ int CPopupContentTypeButtonInfo::GetHeight(const ButtonAction &button, int *) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
int height = 0;
std::string draw("");
const CFont &font = this->Font ? *this->Font : GetSmallFont();
std::string draw;
switch (this->InfoType) {
case PopupButtonInfo_Hint:
draw = button.Hint;
@ -367,6 +367,7 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
draw = PrintDependencies(*ThisPlayer, button);
break;
}
int height = 0;
if (draw.length()) {
int i = 1;
while ((GetLineFont(i++, draw, this->MaxWidth, &font)).length()) {
@ -378,7 +379,7 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
/* virtual */ void CPopupContentTypeButtonInfo::Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction &button, int *) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
const CFont &font = this->Font ? *this->Font : GetSmallFont();
CLabel label(font, this->TextColor, this->HighlightColor);
std::string draw("");
switch (this->InfoType) {
@ -409,13 +410,13 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
/* virtual */ int CPopupContentTypeText::GetWidth(const ButtonAction &button, int *) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
const CFont &font = this->Font ? *this->Font : GetSmallFont();
int width = 0;
std::string sub;
if (this->MaxWidth) {
return std::min((unsigned int)font.getWidth(this->Text), this->MaxWidth);
}
int width = 0;
std::string sub;
int i = 1;
while (!(sub = GetLineFont(i++, this->Text, 0, &font)).empty()) {
width = std::max(width, font.getWidth(sub));
@ -436,7 +437,7 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
/* virtual */ void CPopupContentTypeText::Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction &button, int *) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
const CFont &font = this->Font ? *this->Font : GetSmallFont();
CLabel label(font, this->TextColor, this->HighlightColor);
std::string sub;
int i = 0;
@ -453,7 +454,7 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
/* virtual */ int CPopupContentTypeCosts::GetWidth(const ButtonAction &button, int *Costs) const
{
int popupWidth = 0;
CFont &font = this->Font ? *this->Font : GetSmallFont();
const CFont &font = this->Font ? *this->Font : GetSmallFont();
for (unsigned int i = 1; i < MaxCosts; ++i) {
if (Costs[i]) {
@ -494,7 +495,7 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
/* virtual */ int CPopupContentTypeCosts::GetHeight(const ButtonAction &button, int *Costs) const
{
int popupHeight = 0;
CFont &font = this->Font ? *this->Font : GetSmallFont();
const CFont &font = this->Font ? *this->Font : GetSmallFont();
for (unsigned int i = 1; i <= MaxCosts; ++i) {
if (Costs[i] && UI.Resources[i].G) {
@ -506,7 +507,7 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
/* virtual */ void CPopupContentTypeCosts::Draw(int x, int y, const CPopup *, const unsigned int, const ButtonAction &button, int *Costs) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
const CFont &font = this->Font ? *this->Font : GetSmallFont();
CLabel label(font, this->TextColor, this->HighlightColor);
for (unsigned int i = 1; i < MaxCosts; ++i) {
@ -526,9 +527,9 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
}
}
if (Costs[MaxCosts]) {
const SpellType *spell = SpellTypeTable[button.Value];
const SpellType &spell = *SpellTypeTable[button.Value];
const CGraphic *G = UI.Resources[ManaResCost].G;
if (spell->ManaCost) {
if (spell.ManaCost) {
int y_offset = 0;
if (G) {
int x_offset = UI.Resources[ManaResCost].IconWidth;
@ -539,7 +540,7 @@ static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
y_offset -= font.Height();
y_offset /= 2;
}
label.Draw(x, y + y_offset, spell->ManaCost);
label.Draw(x, y + y_offset, spell.ManaCost);
}
}
}

4
src/video/font.cpp
View file

@ -701,7 +701,7 @@ static int FormatNumber(int number, char *buf)
**
** @return computed value.
*/
static int strchrlen(const std::string &s, char c, unsigned int maxlen, CFont *font)
static int strchrlen(const std::string &s, char c, unsigned int maxlen, const CFont *font)
{
if (s.empty()) {
return 0;
@ -745,7 +745,7 @@ static int strchrlen(const std::string &s, char c, unsigned int maxlen, CFont *f
**
** @return computed value.
*/
std::string GetLineFont(unsigned int line, const std::string &s, unsigned int maxlen, CFont *font)
std::string GetLineFont(unsigned int line, const std::string &s, unsigned int maxlen, const CFont *font)
{
unsigned int res;
std::string s1 = s;