* duplicate names fixed

git-svn-id: trunk@2435 -

fcl/db/dbase/dbf.pas

@@ -299,7 +299,7 @@ type
 {$endif}
 
     function CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer; override;
-    procedure CheckDbfFieldDefs(DbfFieldDefs: TDbfFieldDefs);
+    procedure CheckDbfFieldDefs(ADbfFieldDefs: TDbfFieldDefs);
 
 {$ifdef VER1_0}
     procedure DataEvent(Event: TDataEvent; Info: Longint); override;
@@ -356,9 +356,9 @@ type
     procedure Undelete;
 
     procedure CreateTable;
-    procedure CreateTableEx(DbfFieldDefs: TDbfFieldDefs);
+    procedure CreateTableEx(ADbfFieldDefs: TDbfFieldDefs);
     procedure CopyFrom(DataSet: TDataSet; FileName: string; DateTimeAsString: Boolean; Level: Integer);
-    procedure RestructureTable(DbfFieldDefs: TDbfFieldDefs; Pack: Boolean);
+    procedure RestructureTable(ADbfFieldDefs: TDbfFieldDefs; Pack: Boolean);
     procedure PackTable;
     procedure EmptyTable;
     procedure Zap;
@@ -1366,7 +1366,7 @@ begin
   CreateTableEx(nil);
 end;
 
-procedure TDbf.CheckDbfFieldDefs(DbfFieldDefs: TDbfFieldDefs);
+procedure TDbf.CheckDbfFieldDefs(ADbfFieldDefs: TDbfFieldDefs);
 var
   I: Integer;
   TempDef: TDbfFieldDef;
@@ -1383,12 +1383,12 @@ var
     end;
 
 begin
-  if DbfFieldDefs = nil then exit;
+  if ADbfFieldDefs = nil then exit;
 
-  for I := 0 to DbfFieldDefs.Count - 1 do
+  for I := 0 to ADbfFieldDefs.Count - 1 do
   begin
     // check dbffielddefs for errors
-    TempDef := DbfFieldDefs.Items[I];
+    TempDef := ADbfFieldDefs.Items[I];
     if FTableLevel < 7 then
       if not (TempDef.NativeFieldType in ['C', 'F', 'N', 'D', 'L', 'M']) then
         raise EDbfError.CreateFmt(STRING_INVALID_FIELD_TYPE,
@@ -1396,7 +1396,7 @@ begin
   end;
 end;
 
-procedure TDbf.CreateTableEx(DbfFieldDefs: TDbfFieldDefs);
+procedure TDbf.CreateTableEx(ADbfFieldDefs: TDbfFieldDefs);
 var
   I: Integer;
   lIndex: TDbfIndexDef;
@@ -1404,14 +1404,14 @@ var
   tempFieldDefs: Boolean;
 begin
   CheckInactive;
-  tempFieldDefs := DbfFieldDefs = nil;
+  tempFieldDefs := ADbfFieldDefs = nil;
   try
     try
       if tempFieldDefs then
       begin
-        DbfFieldDefs := TDbfFieldDefs.Create(Self);
-        DbfFieldDefs.DbfVersion := TableLevelToDbfVersion(FTableLevel);
-        DbfFieldDefs.UseFloatFields := FUseFloatFields;
+        ADbfFieldDefs := TDbfFieldDefs.Create(Self);
+        ADbfFieldDefs.DbfVersion := TableLevelToDbfVersion(FTableLevel);
+        ADbfFieldDefs.UseFloatFields := FUseFloatFields;
 
         // get fields -> fielddefs if no fielddefs
 {$ifndef FPC_VERSION}
@@ -1422,7 +1422,7 @@ begin
         // fielddefs -> dbffielddefs
         for I := 0 to FieldDefs.Count - 1 do
         begin
-          with DbfFieldDefs.AddFieldDef do
+          with ADbfFieldDefs.AddFieldDef do
           begin
             FieldName := FieldDefs.Items[I].Name;
             FieldType := FieldDefs.Items[I].DataType;
@@ -1466,8 +1466,8 @@ begin
     end;
   finally
     // free temporary fielddefs
-    if tempFieldDefs and Assigned(DbfFieldDefs) then
-      DbfFieldDefs.Free;
+    if tempFieldDefs and Assigned(ADbfFieldDefs) then
+      ADbfFieldDefs.Free;
     FreeAndNil(FDbfFile);
   end;
 end;
@@ -1484,12 +1484,12 @@ begin
   FDbfFile.Zap;
 end;
 
-procedure TDbf.RestructureTable(DbfFieldDefs: TDbfFieldDefs; Pack: Boolean);
+procedure TDbf.RestructureTable(ADbfFieldDefs: TDbfFieldDefs; Pack: Boolean);
 begin
   CheckInactive;
 
   // check field defs for errors
-  CheckDbfFieldDefs(DbfFieldDefs);
+  CheckDbfFieldDefs(ADbfFieldDefs);
 
   // open dbf file
   InitDbfFile(pfExclusiveOpen);
@@ -1497,7 +1497,7 @@ begin
 
   // do restructure
   try
-    FDbfFile.RestructureTable(DbfFieldDefs, Pack);
+    FDbfFile.RestructureTable(ADbfFieldDefs, Pack);
   finally
     // close file
     FreeAndNil(FDbfFile);

fcl/db/dbase/dbf_dbffile.pas

@@ -91,7 +91,7 @@ type
     procedure Close;
     procedure Zap;
 
-    procedure FinishCreate(FieldDefs: TDbfFieldDefs; MemoSize: Integer);
+    procedure FinishCreate(AFieldDefs: TDbfFieldDefs; MemoSize: Integer);
     function GetIndexByName(AIndexName: string): TIndexFile;
     procedure SetRecordSize(NewSize: Integer); override;
 
@@ -576,7 +576,7 @@ begin
   end;
 end;
 
-procedure TDbfFile.FinishCreate(FieldDefs: TDbfFieldDefs; MemoSize: Integer);
+procedure TDbfFile.FinishCreate(AFieldDefs: TDbfFieldDefs; MemoSize: Integer);
 var
   lFieldDescIII: rFieldDescIII;
   lFieldDescVII: rFieldDescVII;
@@ -634,9 +634,9 @@ begin
     FFieldDefs.Clear;
     // deleted mark 1 byte
     lFieldOffset := 1;
-    for I := 1 to FieldDefs.Count do
+    for I := 1 to AFieldDefs.Count do
     begin
-      lFieldDef := FieldDefs.Items[I-1];
+      lFieldDef := AFieldDefs.Items[I-1];
 
       // check if datetime conversion
       if FCopyDateTimeAsString then

fcl/db/dbase/dbf_idxfile.pas

@@ -117,7 +117,7 @@ type
     procedure RecurFirst;
     procedure RecurLast;
 
-    procedure SetEntry(RecNo: Integer; key: PChar; LowerPageNo: Integer);
+    procedure SetEntry(RecNo: Integer; AKey: PChar; LowerPageNo: Integer);
     procedure SetEntryNo(value: Integer);
     procedure SetPageNo(NewPageNo: Integer);
     procedure SetLowPage(NewPage: Integer);
@@ -271,7 +271,7 @@ type
     procedure ClearRoots;
     function  CalcTagOffset(AIndex: Integer): Pointer;
 
-    function  FindKey(Insert: boolean): Integer;
+    function  FindKey(AInsert: boolean): Integer;
     procedure InsertKey(Buffer: PChar);
     procedure DeleteKey(Buffer: PChar);
     procedure InsertCurrent;
@@ -924,7 +924,7 @@ begin
     FEntry := GetEntry(FEntryNo);
 end;
 
-procedure TIndexPage.SetEntry(RecNo: Integer; Key: PChar; LowerPageNo: Integer);
+procedure TIndexPage.SetEntry(RecNo: Integer; AKey: PChar; LowerPageNo: Integer);
 var
   keyData: PChar;
 {$ifdef TDBF_INDEX_CHECK}
@@ -936,10 +936,10 @@ begin
   // check valid entryno: we should be able to insert entries!
   assert((EntryNo >= 0) and (EntryNo <= FHighIndex));
   if (UpperPage <> nil) and (FEntryNo = FHighIndex) then
-    UpperPage.SetEntry(0, Key, FPageNo);
+    UpperPage.SetEntry(0, AKey, FPageNo);
 {  if PIndexHdr(FIndexFile.IndexHeader).KeyType = 'C' then  }
-    if Key <> nil then
-      Move(Key^, keyData^, PIndexHdr(FIndexFile.IndexHeader)^.KeyLen)
+    if AKey <> nil then
+      Move(AKey^, keyData^, PIndexHdr(FIndexFile.IndexHeader)^.KeyLen)
     else
       PChar(keyData)^ := #0;
 {
@@ -3199,7 +3199,7 @@ begin
   Result := FindKey(false);
 end;
 
-function TIndexFile.FindKey(Insert: boolean): Integer;
+function TIndexFile.FindKey(AInsert: boolean): Integer;
 //
 // if you set Insert = true, you need to re-enable range after insert!!
 //
@@ -3216,7 +3216,7 @@ begin
   if (FUniqueMode = iuNormal) then
   begin
     // if inserting, search last entry matching key
-    if Insert then
+    if AInsert then
       searchRecNo := -3
     else
       searchRecNo := FUserRecNo
@@ -3267,7 +3267,7 @@ begin
 
     // check if we need to split page
     // done = 1 -> not found entry on insert path yet
-    if Insert and (done <> 1) then
+    if AInsert and (done <> 1) then
     begin
       // now we are on our path to destination where entry is to be inserted
       // check if this page is full, then split it

fcl/db/dbase/dbf_parser.pas

@@ -51,7 +51,7 @@ type
 
     procedure ClearExpressions; override;
 
-    procedure ParseExpression(Expression: string); virtual;
+    procedure ParseExpression(AExpression: string); virtual;
     function ExtractFromBuffer(Buffer: PChar): PChar; virtual;
 
     property DbfFile: Pointer read FDbfFile write FDbfFile;
@@ -1507,7 +1507,7 @@ begin
   FCurrentExpression := EmptyStr;
 end;
 
-procedure TDbfParser.ParseExpression(Expression: string);
+procedure TDbfParser.ParseExpression(AExpression: string);
 var
   TempBuffer: array[0..4000] of Char;
 begin
@@ -1515,11 +1515,11 @@ begin
   ClearExpressions;
 
   // is this a simple field or complex expression?
-  FIsExpression := GetVariableInfo(Expression) = nil;
+  FIsExpression := GetVariableInfo(AExpression) = nil;
   if FIsExpression then
   begin
     // parse requested
-    CompileExpression(Expression);
+    CompileExpression(AExpression);
 
     // determine length of string length expressions
     if ResultType = etString then
@@ -1530,7 +1530,7 @@ begin
     end;
   end else begin
     // simple field, create field variable for it
-    HandleUnknownVariable(Expression);
+    HandleUnknownVariable(AExpression);
     FFieldType := TFieldVar(FFieldVarList.Objects[0]).FieldType;
     // set result len of variable length fields
     if FFieldType = etString then
@@ -1547,10 +1547,10 @@ begin
 
   // check if expression not too long
   if FResultLen > 100 then
-    raise EDbfError.CreateFmt(STRING_INDEX_EXPRESSION_TOO_LONG, [Expression, FResultLen]);
+    raise EDbfError.CreateFmt(STRING_INDEX_EXPRESSION_TOO_LONG, [AExpression, FResultLen]);
 
   // if no errors, assign current expression
-  FCurrentExpression := Expression;
+  FCurrentExpression := AExpression;
 end;
 
 function TDbfParser.ExtractFromBuffer(Buffer: PChar): PChar;

fcl/db/dbase/dbf_prsdef.pas

@@ -38,7 +38,7 @@ type
     FMemoryPos: PPChar;
     FSize: PInteger;
   public
-    constructor Create(DestMem, DestPos: PPChar; Size: PInteger);
+    constructor Create(DestMem, DestPos: PPChar; ASize: PInteger);
 
     procedure AssureSpace(ASize: Integer);
     procedure Resize(NewSize: Integer; Exact: Boolean);
@@ -974,13 +974,13 @@ end;
 
 { TDynamicType }
 
-constructor TDynamicType.Create(DestMem, DestPos: PPChar; Size: PInteger);
+constructor TDynamicType.Create(DestMem, DestPos: PPChar; ASize: PInteger);
 begin
   inherited Create;
 
   FMemory := DestMem;
   FMemoryPos := DestPos;
-  FSize := Size;
+  FSize := ASize;
 end;
 
 procedure TDynamicType.Rewind;