i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Followed Marcus' suggestion and made fHeight mutable - not nice, but cleaner

Browse Source 
than casting away the const.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14614 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-01 13:19:00 +00:00
parent 1ce9b0cb59
commit 297cd250fa
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Font.h
+2 -2
View File
@@ -262,7 +262,7 @@ friend void _font_control_(BFont*, int32, void*);
uint8 fEncoding; uint8 fEncoding;
uint16 fFace; uint16 fFace;
uint32 fFlags; uint32 fFlags;
font_height fHeight; mutable font_height fHeight;
uint32 _reserved[3]; uint32 _reserved[3];
void SetPacket(void *packet) const; void SetPacket(void *packet) const;
@@ -355,4 +355,4 @@ bool unicode_block::operator!=(const unicode_block &block) const {
return ((fData[0] != block.fData[0]) || (fData[1] != block.fData[1])); return ((fData[0] != block.fData[0]) || (fData[1] != block.fData[1]));
} }
#endif #endif /* _FONT_H_ */
src/kits/interface/Font.cpp
+3 -2
View File
@@ -1026,8 +1026,9 @@ BFont::GetHeight(font_height *_height) const
|| code != SERVER_TRUE) || code != SERVER_TRUE)
return; return;
// who put that "const" to this method? :-) // Who put that "const" to this method? :-)
link.Read<font_height>(const_cast<font_height *>(&fHeight)); // We made fHeight mutable for this, but we should drop the "const" when we can
link.Read<font_height>(&fHeight);
} }
*_height = fHeight; *_height = fHeight;