MapleShrine/mkxp
1
0
Fork 0
Code Issues32 Pull requests11 Projects Releases Wiki Activity

Pass value object attributes by reference (instead of pointer)

Browse source 
This underlines that no reference inside the setter is taken,
and that these attributes are non-nullable.

Also removes a couple of superfluous attribute macros.
This commit is contained in:
Jonas Kulla 2014-10-25 23:33:41 +02:00
parent 5549ff78f0
commit c9d5059238
29 changed files with 92 additions and 110 deletions

12
src/bitmap.cpp
View file

@ -941,12 +941,12 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
return;
TTF_Font *font = p->font->getSdlFont();
Color *fontColor = p->font->getColor();
const Color &fontColor = p->font->getColor();
SDL_Color c;
fontColor->toSDLColor(c);
fontColor.toSDLColor(c);
float txtAlpha = fontColor->norm.w;
float txtAlpha = fontColor.norm.w;
SDL_Surface *txtSurf;
@ -1186,11 +1186,11 @@ IntRect Bitmap::textSize(const char *str)
return IntRect(0, 0, w, h);
}
DEF_ATTR_RD_SIMPLE(Bitmap, Font, Font*, p->font)
DEF_ATTR_RD_SIMPLE(Bitmap, Font, Font&, *p->font)
void Bitmap::setFont(Font *value)
void Bitmap::setFont(Font &value)
{
*p->font = *value;
*p->font = value;
}
void Bitmap::setInitFont(Font *value)