diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-10-27 16:08:14 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-27 16:39:32 +0100 |
commit | bea5e37dd32f30d301aca89ba4875657de7c1025 (patch) | |
tree | b0f0384cdaa9f6ff6d7ce511c7aaa876549fdf30 /vcl/inc/generic | |
parent | ac1eb33bfc4ce95779e8a1ed252d928c799afa40 (diff) |
Rename ImplFontSelectData to FontSelectPattern so I know what it does
Rename ImplFontSelectData to FontSelectPattern because I can never remember the
name of the thing. This way I'll be able to remember that its basically the
equivalent of fontconfig's FcPattern
Diffstat (limited to 'vcl/inc/generic')
-rw-r--r-- | vcl/inc/generic/genpspgraphics.h | 2 | ||||
-rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 026113a1dc70..b20db0d6aa29 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -97,7 +97,7 @@ public: virtual void SetROPFillColor( SalROPColor nROPColor ); virtual void SetTextColor( SalColor nSalColor ); - virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); + virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); virtual sal_uLong GetKernPairs( sal_uLong nMaxPairs, ImplKernPairData* ); virtual const ImplFontCharMap* GetImplFontCharMap() const; diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index f08cb2b2c049..6ed1cb81b92e 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -85,7 +85,7 @@ public: const ExtraKernInfo* = NULL ); void AnnounceFonts( ImplDevFontList* ) const; - ServerFont* CacheFont( const ImplFontSelectData& ); + ServerFont* CacheFont( const FontSelectPattern& ); void UncacheFont( ServerFont& ); void InvalidateAllGlyphs(); @@ -105,9 +105,9 @@ private: // the GlyphCache's FontList matches a font request to a serverfont instance // the FontList key's mpFontData member is reinterpreted as integer font id - struct IFSD_Equal{ bool operator()( const ImplFontSelectData&, const ImplFontSelectData& ) const; }; - struct IFSD_Hash{ size_t operator()( const ImplFontSelectData& ) const; }; - typedef ::boost::unordered_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList; + struct IFSD_Equal{ bool operator()( const FontSelectPattern&, const FontSelectPattern& ) const; }; + struct IFSD_Hash{ size_t operator()( const FontSelectPattern& ) const; }; + typedef ::boost::unordered_map<FontSelectPattern,ServerFont*,IFSD_Hash,IFSD_Equal > FontList; FontList maFontList; sal_uLong mnMaxSize; // max overall cache size in bytes mutable sal_uLong mnBytesUsed; @@ -188,7 +188,7 @@ class FtFontInfo; class VCL_DLLPUBLIC ServerFont { public: - ServerFont( const ImplFontSelectData&, FtFontInfo* ); + ServerFont( const FontSelectPattern&, FtFontInfo* ); virtual ~ServerFont(); const ::rtl::OString* GetFontFileName() const; @@ -201,7 +201,7 @@ public: bool NeedsArtificialBold() const { return mbArtBold; } bool NeedsArtificialItalic() const { return mbArtItalic; } - const ImplFontSelectData& GetFontSelData() const { return maFontSelData; } + const FontSelectPattern& GetFontSelData() const { return maFontSelData; } void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const; sal_uLong GetKernPairs( ImplKernPairData** ) const; @@ -246,14 +246,14 @@ private: void ReleaseFromGarbageCollect(); int ApplyGlyphTransform( int nGlyphFlags, FT_GlyphRec_*, bool ) const; - bool ApplyGSUB( const ImplFontSelectData& ); + bool ApplyGSUB( const FontSelectPattern& ); ServerFontLayoutEngine* GetLayoutEngine(); typedef ::boost::unordered_map<int,GlyphData> GlyphList; mutable GlyphList maGlyphList; - const ImplFontSelectData maFontSelData; + const FontSelectPattern maFontSelData; // info for GlyphcachePeer int mnExtInfo; @@ -309,7 +309,7 @@ private: bool mbGotFontOptions; public: - ImplServerFontEntry( ImplFontSelectData& ); + ImplServerFontEntry( FontSelectPattern& ); virtual ~ImplServerFontEntry(); void SetServerFont( ServerFont* p) { mpServerFont = p; } void HandleFontOptions(); |