[Libreoffice-commits] core.git: vcl/generic vcl/inc vcl/unx

[Chris Sherlock]

 vcl/generic/glyphs/gcach_ftyp.cxx       |    4 ++--
 vcl/generic/glyphs/glyphcache.cxx       |    6 +++---
 vcl/generic/print/genpspgraphics.cxx    |    2 +-
 vcl/inc/generic/glyphcache.hxx          |    8 ++++----
 vcl/unx/generic/gdi/cairotextrender.cxx |    4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 67925c3b5cf713cfb85a92baebd13708b8649974
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sat Jan 9 13:55:21 2016 +1100

    vcl: Rename ImplServerFontEntry to ServerFontInstance
    
    I want to keep this class in line with the naming of the base class.
    ImplServerFontEntry derives from LogicalFontInstance, so the name
    ServerFontInstance is a better fit.
    
    Change-Id: I2d2e3919634c2aaa8e5d6d63b0bf718dec18c336
    Reviewed-on: https://gerrit.libreoffice.org/21284
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 0af7cd9..777cdea 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -434,7 +434,7 @@ ImplFTSFontData::ImplFTSFontData( FreetypeFontInfo* pFI, const ImplFontAttribute
 
 LogicalFontInstance* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) const
 {
-    ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD );
+    ServerFontInstance* pEntry = new ServerFontInstance( rFSD );
     return pEntry;
 }
 
@@ -464,7 +464,7 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FreetypeFontInfo* pFI )
 {
     // TODO: move update of mpFontInstance into FontEntry class when
     // it becomes responsible for the ServerFont instantiation
-    static_cast<ImplServerFontEntry*>(rFSD.mpFontInstance)->SetServerFont( this );
+    static_cast<ServerFontInstance*>(rFSD.mpFontInstance)->SetServerFont( this );
 
     maFaceFT = pFI->GetFaceFT();
 
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index eab5277..bfac328 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -353,13 +353,13 @@ void ServerFont::GarbageCollect( long nMinLruIndex )
     }
 }
 
-ImplServerFontEntry::ImplServerFontEntry( FontSelectPattern& rFSD )
+ServerFontInstance::ServerFontInstance( FontSelectPattern& rFSD )
 :   LogicalFontInstance( rFSD )
 ,   mpServerFont( nullptr )
 ,   mbGotFontOptions( false )
 {}
 
-void ImplServerFontEntry::SetServerFont(ServerFont* p)
+void ServerFontInstance::SetServerFont(ServerFont* p)
 {
     if (p == mpServerFont)
         return;
@@ -370,7 +370,7 @@ void ImplServerFontEntry::SetServerFont(ServerFont* p)
         mpServerFont->AddRef();
 }
 
-ImplServerFontEntry::~ImplServerFontEntry()
+ServerFontInstance::~ServerFontInstance()
 {
     // TODO: remove the ServerFont here instead of in the GlyphCache
     if (mpServerFont)
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 335f40c..420437e 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -560,7 +560,7 @@ ImplPspFontData::ImplPspFontData( const psp::FastPrintFontInfo& rInfo )
 
 LogicalFontInstance* ImplPspFontData::CreateFontInstance( FontSelectPattern& rFSD ) const
 {
-    ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD );
+    ServerFontInstance* pEntry = new ServerFontInstance( rFSD );
     return pEntry;
 }
 
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 951c211..b3666f5 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -185,7 +185,7 @@ public:
 private:
     friend class GlyphCache;
     friend class ServerFontLayout;
-    friend class ImplServerFontEntry;
+    friend class ServerFontInstance;
     friend class X11SalGraphics;
     friend class CairoTextRender;
 
@@ -243,11 +243,11 @@ private:
 };
 
 // a class for cache entries for physical font instances that are based on serverfonts
-class VCL_DLLPUBLIC ImplServerFontEntry : public LogicalFontInstance
+class VCL_DLLPUBLIC ServerFontInstance : public LogicalFontInstance
 {
 public:
-                            ImplServerFontEntry( FontSelectPattern& );
-    virtual                 ~ImplServerFontEntry();
+                            ServerFontInstance( FontSelectPattern& );
+    virtual                 ~ServerFontInstance();
 
     void                    SetServerFont(ServerFont* p);
     void                    HandleFontOptions();
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 52de75d..e574011 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -90,7 +90,7 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev
         mpServerFont[ nFallbackLevel ] = pServerFont;
 
         // apply font specific-hint settings
-        ImplServerFontEntry* pSFE = static_cast<ImplServerFontEntry*>( pEntry->mpFontInstance );
+        ServerFontInstance* pSFE = static_cast<ServerFontInstance*>( pEntry->mpFontInstance );
         pSFE->HandleFontOptions();
 
         return true;
@@ -101,7 +101,7 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev
 
 FontConfigFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize);
 
-void ImplServerFontEntry::HandleFontOptions()
+void ServerFontInstance::HandleFontOptions()
 {
     if( !mpServerFont )
         return;