From 338299319e74e978dc97beae41436f392efded3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sat, 2 May 2009 21:32:33 +0000 Subject: [PATCH] * Update header indentation * Unify pointer style, it was a mix before git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30592 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/FontManager.h | 146 +++++++++++++++++++--------------- 1 file changed, 83 insertions(+), 63 deletions(-) diff --git a/src/servers/app/FontManager.h b/src/servers/app/FontManager.h index 9ea78a47c1..2f4d7c5ba5 100644 --- a/src/servers/app/FontManager.h +++ b/src/servers/app/FontManager.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005, Haiku. + * Copyright 2001-2009, Haiku. * Distributed under the terms of the MIT License. * * Authors: @@ -32,83 +32,103 @@ class ServerFont; \brief Manager for the largest part of the font subsystem */ class FontManager : public BLooper { - public: - FontManager(); - virtual ~FontManager(); +public: + FontManager(); + virtual ~FontManager(); - status_t InitCheck() { return fInitStatus; } - void SaveRecentFontMappings(); + status_t InitCheck() { return fInitStatus; } + void SaveRecentFontMappings(); - virtual void MessageReceived(BMessage* message); + virtual void MessageReceived(BMessage* message); - int32 CheckRevision(uid_t user); - int32 CountFamilies(); + int32 CheckRevision(uid_t user); + int32 CountFamilies(); - int32 CountStyles(const char *family); - int32 CountStyles(uint16 familyID); - FontFamily* FamilyAt(int32 index) const; + int32 CountStyles(const char* family); + int32 CountStyles(uint16 familyID); + FontFamily* FamilyAt(int32 index) const; - FontFamily *GetFamily(uint16 familyID) const; - FontFamily *GetFamily(const char *name); + FontFamily* GetFamily(uint16 familyID) const; + FontFamily* GetFamily(const char* name); - FontStyle *GetStyleByIndex(const char *family, int32 index); - FontStyle *GetStyleByIndex(uint16 familyID, int32 index); - FontStyle *GetStyle(const char *family, const char *style, uint16 familyID = 0xffff, - uint16 styleID = 0xffff, uint16 face = 0); - FontStyle *GetStyle(const char *family, uint16 styleID); - FontStyle *GetStyle(uint16 familyID, uint16 styleID) const; - FontStyle* FindStyleMatchingFace(uint16 face) const; + FontStyle* GetStyleByIndex(const char* family, + int32 index); + FontStyle* GetStyleByIndex(uint16 familyID, int32 index); + FontStyle* GetStyle(const char* family, const char* style, + uint16 familyID = 0xffff, + uint16 styleID = 0xffff, uint16 face = 0); + FontStyle* GetStyle(const char *family, uint16 styleID); + FontStyle* GetStyle(uint16 familyID, + uint16 styleID) const; + FontStyle* FindStyleMatchingFace(uint16 face) const; - void RemoveStyle(FontStyle* style); - // this call must not be used by anything else than class FontStyle + void RemoveStyle(FontStyle* style); + // This call must not be used by anything else than class + // FontStyle. - const ServerFont* DefaultPlainFont() const; - const ServerFont* DefaultBoldFont() const; - const ServerFont* DefaultFixedFont() const; + const ServerFont* DefaultPlainFont() const; + const ServerFont* DefaultBoldFont() const; + const ServerFont* DefaultFixedFont() const; - void AttachUser(uid_t userID); - void DetachUser(uid_t userID); + void AttachUser(uid_t userID); + void DetachUser(uid_t userID); - private: - struct font_directory; - struct font_mapping; +private: + struct font_directory; + struct font_mapping; - void _AddDefaultMapping(const char* family, const char* style, const char* path); - bool _LoadRecentFontMappings(); - status_t _AddMappedFont(const char* family, const char* style = NULL); - FontStyle* _GetDefaultStyle(const char* familyName, const char* styleName, - const char* fallbackFamily, const char* fallbackStyle, - uint16 fallbackFace); - status_t _SetDefaultFonts(); - void _AddSystemPaths(); - font_directory* _FindDirectory(node_ref& nodeRef); - void _RemoveDirectory(font_directory* directory); - status_t _CreateDirectories(const char* path); - status_t _AddPath(const char* path); - status_t _AddPath(BEntry& entry, font_directory** _newDirectory = NULL); + void _AddDefaultMapping(const char* family, + const char* style, const char* path); + bool _LoadRecentFontMappings(); + status_t _AddMappedFont(const char* family, + const char* style = NULL); + FontStyle* _GetDefaultStyle(const char* familyName, + const char* styleName, + const char* fallbackFamily, + const char* fallbackStyle, + uint16 fallbackFace); + status_t _SetDefaultFonts(); + void _AddSystemPaths(); + font_directory* _FindDirectory(node_ref& nodeRef); + void _RemoveDirectory(font_directory* directory); + status_t _CreateDirectories(const char* path); + status_t _AddPath(const char* path); + status_t _AddPath(BEntry& entry, + font_directory** _newDirectory = NULL); - void _RemoveStyle(font_directory& directory, FontStyle* style); - void _RemoveStyle(dev_t device, uint64 directory, uint64 node); - FontFamily* _FindFamily(const char* family) const; + void _RemoveStyle(font_directory& directory, + FontStyle* style); + void _RemoveStyle(dev_t device, uint64 directory, + uint64 node); + FontFamily* _FindFamily(const char* family) const; - void _ScanFontsIfNecessary(); - void _ScanFonts(); - status_t _ScanFontDirectory(font_directory& directory); - status_t _AddFont(font_directory& directory, BEntry& entry); + void _ScanFontsIfNecessary(); + void _ScanFonts(); + status_t _ScanFontDirectory(font_directory& directory); + status_t _AddFont(font_directory& directory, + BEntry& entry); - FT_CharMap _GetSupportedCharmap(const FT_Face &face); + FT_CharMap _GetSupportedCharmap(const FT_Face& face); - private: - status_t fInitStatus; - BObjectList fDirectories; - BObjectList fMappings; - BObjectList fFamilies; - HashTable fStyleHashTable; - ServerFont* fDefaultPlainFont; - ServerFont* fDefaultBoldFont; - ServerFont* fDefaultFixedFont; - bool fScanned; - int32 fNextID; +private: + status_t fInitStatus; + + typedef BObjectList DirectoryList; + typedef BObjectList MappingList; + typedef BObjectList FamilyList; + + DirectoryList fDirectories; + MappingList fMappings; + FamilyList fFamilies; + + HashTable fStyleHashTable; + + ServerFont* fDefaultPlainFont; + ServerFont* fDefaultBoldFont; + ServerFont* fDefaultFixedFont; + + bool fScanned; + int32 fNextID; }; extern FT_Library gFreeTypeLibrary;