From cabee397b9e8d2b1bc400972db538c4bd79f7f59 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sun, 16 Mar 2014 02:55:37 -0500
Subject: rename ImplDevFontListData to PhysicalFontFamily

following the naming of PhysicalFontFace
in an effort to give more explicit and meaning full
names to the many-many ImplFontforbar classes

Change-Id: I6dcf44e8f9ba312d8293298198b92f283dac0362
---
 vcl/inc/outdev.h    |  8 ++++----
 vcl/inc/outfont.hxx | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'vcl/inc')

diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 299e80323c9c..f9b3710097ed 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -41,12 +41,12 @@ class GetDevSizeList;
 #define IMPL_DEVFONT_NONEITALIC     ((sal_uIntPtr)0x00000100)
 #define IMPL_DEVFONT_ITALIC         ((sal_uIntPtr)0x00000200)
 
-// TODO: rename ImplDevFontListData to PhysicalFontFamily
-class ImplDevFontListData
+
+class PhysicalFontFamily
 {
 public:
-                        ImplDevFontListData( const OUString& rSearchName );
-                        ~ImplDevFontListData();
+                        PhysicalFontFamily( const OUString& rSearchName );
+                        ~PhysicalFontFamily();
 
     const OUString&     GetFamilyName() const    { return maName; }
     const OUString&       GetSearchName() const    { return maSearchName; }
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index a6d4def4e547..afcdb5278510 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -30,7 +30,7 @@
 
 #include <boost/unordered_map.hpp>
 
-class ImplDevFontListData;
+class PhysicalFontFamily;
 class ImplGetDevFontList;
 class ImplGetDevSizeList;
 class ImplFontEntry;
@@ -150,7 +150,7 @@ protected:
     long                    mnHeight;   // Height (in pixels)
 
 private:
-friend class ImplDevFontListData;
+friend class PhysicalFontFamily;
     const int               mnMagic;    // poor man's RTTI
     PhysicalFontFace*       mpNext;
 };
@@ -217,7 +217,7 @@ private:
     mutable bool            mbMatchData;    // true if matching attributes are initialized
     bool                    mbMapNames;     // true if MapNames are available
 
-    typedef boost::unordered_map<const OUString, ImplDevFontListData*,FontNameHash> DevFontList;
+    typedef boost::unordered_map<const OUString, PhysicalFontFamily*,FontNameHash> DevFontList;
     DevFontList             maDevFontList;
 
     ImplPreMatchFontSubstitution* mpPreMatchHook;       // device specific prematch substitution
@@ -233,12 +233,12 @@ public:
     int                     Count() const { return maDevFontList.size(); }
 
     // find the device font
-    ImplDevFontListData*    FindFontFamily( const OUString& rFontName ) const;
-    ImplDevFontListData*    ImplFindByFont( FontSelectPattern& ) const;
-    ImplDevFontListData*    ImplFindBySearchName( const OUString& ) const;
+    PhysicalFontFamily*    FindFontFamily( const OUString& rFontName ) const;
+    PhysicalFontFamily*    ImplFindByFont( FontSelectPattern& ) const;
+    PhysicalFontFamily*    ImplFindBySearchName( const OUString& ) const;
 
     // suggest fonts for glyph fallback
-    ImplDevFontListData*    GetGlyphFallbackFont( FontSelectPattern&,
+    PhysicalFontFamily*    GetGlyphFallbackFont( FontSelectPattern&,
                         OUString& rMissingCodes, int nFallbackLevel ) const;
 
     // prepare platform specific font substitutions
@@ -250,22 +250,22 @@ public:
     ImplGetDevFontList*     GetDevFontList() const;
     ImplGetDevSizeList*     GetDevSizeList( const OUString& rFontName ) const;
 
-    ImplDevFontListData*    ImplFindByTokenNames(const OUString& rTokenStr) const;
+    PhysicalFontFamily*    ImplFindByTokenNames(const OUString& rTokenStr) const;
 
 protected:
     void                    InitMatchData() const;
     bool                    AreMapNamesAvailable() const { return mbMapNames; }
 
-    ImplDevFontListData*    ImplFindByAliasName(const OUString& rSearchName,
+    PhysicalFontFamily*    ImplFindByAliasName(const OUString& rSearchName,
         const OUString& rShortName) const;
-    ImplDevFontListData*    ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const;
-    ImplDevFontListData*    ImplFindByAttributes(sal_uLong nSearchType, FontWeight, FontWidth,
+    PhysicalFontFamily*    ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const;
+    PhysicalFontFamily*    ImplFindByAttributes(sal_uLong nSearchType, FontWeight, FontWidth,
                                                  FontItalic, const OUString& rSearchFamily) const;
-    ImplDevFontListData*    FindDefaultFont() const;
+    PhysicalFontFamily*    FindDefaultFont() const;
 
 private:
     void                    InitGenericGlyphFallback() const;
-    mutable ImplDevFontListData**   mpFallbackList;
+    mutable PhysicalFontFamily**   mpFallbackList;
     mutable int                     mnFallbackCount;
 };
 
-- 
cgit