Merged revisions 26 via svnmerge from

/trunk

git-svn-id: branches/fixes_2_0@222 -

fcl/db/dataset.inc

@@ -72,7 +72,7 @@ end;
 
 Procedure TDataset.BindFields(Binding: Boolean);
 
-var i, j, FieldIndex: Integer;
+var i, FieldIndex: Integer;
     FieldDef: TFieldDef;
 begin
   {
@@ -1531,13 +1531,11 @@ Var
   end;
 
 Var
-  PrevRecordCount : Integer;
   Scrolled : Integer;
 
 begin
   CheckBrowseMode;
   Result:=0; TheResult:=0;
-  PrevRecordCount:=FRecordCount;
   If ((Distance>0) and FEOF) or
      ((Distance<0) and FBOF) then
     exit;

fcl/db/datasource.inc

@@ -190,8 +190,6 @@ end;
 
 Function TDataLink.GetRecordCount: Integer;
 
-Var D: TDataSet;
-
 begin
   Result:=Dataset.FRecordCount;
   If Result>BufferCount then

fcl/db/db.pp

@@ -199,7 +199,6 @@ type
   Private
     FAlignMent : TAlignment;
     FAttributeSet : String;
-    FBuffers : ppchar;
     FCalculated : Boolean;
     FCanModify : Boolean;
     FConstraintErrorMessage : String;
@@ -910,7 +909,6 @@ type
     FBufferCount: Longint;
     FCalcBuffer: PChar;
     FCalcFieldsSize: Longint;
-    FCanModify: Boolean;
     FConstraints: TCheckConstraints;
     FDisableControlsCount : Integer;
     FDisableControlsState : TDatasetState;
@@ -920,7 +918,6 @@ type
     FEOF: Boolean;
     FEnableControlsEvent : TDataEvent;
     FFieldList : TFields;
-    FFieldCount : Longint;
     FFieldDefs: TFieldDefs;
     FFilterOptions: TFilterOptions;
     FFilterText: string;
@@ -1925,16 +1922,12 @@ function TIndexDefs.GetIndexForFields(const Fields: string;
 var
   i, FieldsLen: integer;
   Last: TIndexDef;
-  Name: string;
-  Flds: string;
 begin
   Last := nil;
   FieldsLen := Length(Fields);
   for i := 0 to Count - 1 do
   begin
     Result := Items[I];
-    Name := Result.Name;
-    Flds := Result.Fields;
     if (Result.Options * [ixDescending, ixExpression] = []) and
        (not CaseInsensitive or (ixCaseInsensitive in Result.Options)) and
        AnsiSameText(Fields, Result.Fields) then

fcl/db/fields.inc

@@ -55,8 +55,6 @@ end;
 
 Destructor TFieldDef.Destroy;
 
-Var I : longint;
-
 begin
   Inherited destroy;
 end;
@@ -2385,9 +2383,6 @@ end;
 
 Procedure TFields.CheckFieldName (Const Value : String);
 
-Var I : longint;
-    S : String;
-
 begin
   If FindField(Value)<>Nil then
     DataBaseErrorFmt(SDuplicateFieldName,[Value],FDataset);