From fe05cdcdbf4131ced5dc575ac5402398c636436e Mon Sep 17 00:00:00 2001
From: Graeme Geldenhuys <graeme@mastermaths.co.za>
Date: Tue, 21 Aug 2012 23:09:04 +0100
Subject: changes param type from String to TfpgString

---
 src/corelib/fpg_main.pas | 10 +++++-----
 src/gui/fpg_iniutils.pas | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas
index 70855035..1535a00c 100644
--- a/src/corelib/fpg_main.pas
+++ b/src/corelib/fpg_main.pas
@@ -277,7 +277,7 @@ type
   public
     constructor Create(const AParams: string = ''); override;
     destructor  Destroy; override;
-    function    GetFont(const afontdesc: string): TfpgFont;
+    function    GetFont(const afontdesc: TfpgString): TfpgFont;
     procedure   ActivateHint(APos: TPoint; AHint: TfpgString);
     procedure   RecreateHintWindow;
     procedure   Flush;
@@ -373,7 +373,7 @@ function  fpgApplication: TfpgApplication;
 function  fpgClipboard: TfpgClipboard;
 
 // Fonts (easy access function)
-function  fpgGetFont(const afontdesc: string): TfpgFont;
+function  fpgGetFont(const afontdesc: TfpgString): TfpgFont;
 
 // Message Queue  (easy access function)
 procedure fpgWaitWindowMessage;
@@ -1218,7 +1218,7 @@ begin
   fpgApplication.WaitWindowMessage(500);
 end;
 
-function fpgGetFont(const afontdesc: string): TfpgFont;
+function fpgGetFont(const afontdesc: TfpgString): TfpgFont;
 begin
   Result := fpgApplication.GetFont(afontdesc);
 end;
@@ -1305,11 +1305,11 @@ begin
   inherited Destroy;
 end;
 
-function TfpgApplication.GetFont(const afontdesc: string): TfpgFont;
+function TfpgApplication.GetFont(const afontdesc: TfpgString): TfpgFont;
 var
   fr: TfpgFontResource;
   n: integer;
-  fdesc: string;
+  fdesc: TfpgString;
 begin
   fdesc := afontdesc;
 
diff --git a/src/gui/fpg_iniutils.pas b/src/gui/fpg_iniutils.pas
index 13ee30d0..dec642d3 100644
--- a/src/gui/fpg_iniutils.pas
+++ b/src/gui/fpg_iniutils.pas
@@ -26,6 +26,7 @@ uses
   Classes,
   SysUtils,
   IniFiles,
+  fpg_base,
   fpg_form;
 
 type
@@ -34,7 +35,7 @@ type
   private
     FReadOnly: Boolean;
   public
-    constructor CreateExt(const AFileName: string = ''; AReadOnly: Boolean = False);
+    constructor CreateExt(const AFileName: TfpgString = ''; AReadOnly: Boolean = False);
     function    ReadString(const ASection, AIdent, ADefault: string): string; override;
     function    ReadInteger(const ASection, AIdent: string; ADefault: longint): longint; override;
     function    ReadBool(const ASection, AIdent: string; ADefault: Boolean): Boolean; override;
@@ -47,12 +48,11 @@ type
   end;
 
 // singleton
-function gINI(const AFileName: string = ''): TfpgINIFile;
+function gINI(const AFileName: TfpgString = ''): TfpgINIFile;
 
 implementation
 
 uses
-  fpg_base,
   fpg_main,
   fpg_constants,
   fpg_utils;
@@ -61,7 +61,7 @@ var
   uINI: TfpgINIFile;
 
 
-function gINI(const AFileName: string): TfpgINIFile;
+function gINI(const AFileName: TfpgString): TfpgINIFile;
 begin
   if uINI = nil then
     uINI := TfpgINIFile.CreateExt(AFileName);
@@ -70,7 +70,7 @@ end;
 
 { TfpgINIFile }
 
-constructor TfpgINIFile.CreateExt(const AFileName: string; AReadOnly: Boolean);
+constructor TfpgINIFile.CreateExt(const AFileName: TfpgString; AReadOnly: Boolean);
 var
   lDir: TfpgString;
   lFileName: TfpgString;
-- 
cgit v1.2.3-70-g09d2