From 343b19d57a072a503ea9f63e8c2a427e33e9072d Mon Sep 17 00:00:00 2001
From: Graeme Geldenhuys <graeme@mastermaths.co.za>
Date: Tue, 9 Mar 2010 11:15:43 +0200
Subject: docview: renamed local variables to reduce future confusion.

We don't want to confuse properties and local variables, so the latter gets
 a different style: normally prefixed with the letter 'l'.
---
 docview/components/richtext/CanvasFontManager.pas | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'docview')

diff --git a/docview/components/richtext/CanvasFontManager.pas b/docview/components/richtext/CanvasFontManager.pas
index de81570d..38f87cd1 100644
--- a/docview/components/richtext/CanvasFontManager.pas
+++ b/docview/components/richtext/CanvasFontManager.pas
@@ -177,6 +177,8 @@ constructor TLogicalFont.Create;
   PointSize := 10;
   Attributes := [];
   FixedWidth := False;
+  UseFaceName := '';
+  FaceName := '';
 end;
 
 // frees allocated memory, if any.
@@ -558,8 +560,8 @@ constructor TCanvasFontManager.Create(Canvas: TfpgCanvas; AllowBitmapFonts: bool
 destructor TCanvasFontManager.Destroy;
 var
   i: integer;
-  Font: TLogicalFont;
-  face: TFontFace;
+  lFont: TLogicalFont;
+  lface: TFontFace;
 begin
   // select default font so none of our logical fonts are in use
   FCanvas.Font := fpgApplication.DefaultFont;
@@ -567,8 +569,8 @@ destructor TCanvasFontManager.Destroy;
   // delete each logical font and our record of it
   for i := 0 to FLogicalFonts.Count - 1 do
   begin
-    Font := TLogicalFont(FLogicalFonts[ i ]);
-    Font.Free;
+    lFont := TLogicalFont(FLogicalFonts[ i ]);
+    lFont.Free;
   end;
   FLogicalFonts.Clear;
   FLogicalFonts.Free;
@@ -576,8 +578,8 @@ destructor TCanvasFontManager.Destroy;
   // TCanvasFontManager asked for FontFaces to be created, so lets take responsibility to destroy it.
   for i := 0 to FontFaces.Count-1 do
   begin
-    face := TFontFace(Fontfaces[i]);
-    face.Free;
+    lface := TFontFace(Fontfaces[i]);
+    lface.Free;
   end;
   FontFaces.Clear;
   FontFaces.Free;
-- 
cgit v1.2.3-54-g00ecf