From ef7d9b0948eac8070506886cac523894b81ba267 Mon Sep 17 00:00:00 2001 From: ask Date: Mon, 12 Apr 2010 06:59:17 +0000 Subject: [PATCH] TAChart: Use FreeAndNil instead of Free for object fields git-svn-id: trunk@24592 - --- components/tachart/tachartaxis.pas | 16 ++++++------ components/tachart/tachartutils.pas | 2 +- components/tachart/tacustomseries.pas | 9 +++---- components/tachart/tadbsource.pas | 7 ++++-- components/tachart/tagraph.pas | 30 +++++++++++----------- components/tachart/talegend.pas | 6 ++--- components/tachart/taseries.pas | 32 ++++++++++++------------ components/tachart/tasources.pas | 12 ++++----- components/tachart/tatools.pas | 8 +++--- components/tachart/tatransformations.pas | 6 ++--- components/tachart/tatypes.pas | 24 +++++++++--------- 11 files changed, 77 insertions(+), 75 deletions(-) diff --git a/components/tachart/tachartaxis.pas b/components/tachart/tachartaxis.pas index 494788f4f7..23445456cb 100644 --- a/components/tachart/tachartaxis.pas +++ b/components/tachart/tachartaxis.pas @@ -252,7 +252,7 @@ end; destructor TChartAxisTitle.Destroy; begin - FFont.Free; + FreeAndNil(FFont); inherited; end; @@ -291,8 +291,8 @@ end; destructor TChartAxisMarks.Destroy; begin - FListener.Free; - FDefaultSource.Free; + FreeAndNil(FListener); + FreeAndNil(FDefaultSource); inherited; end; @@ -349,10 +349,10 @@ end; destructor TChartAxis.Destroy; begin - FTitle.Free; - FMarks.Free; - FListener.Free; - FGrid.Free; + FreeAndNil(FTitle); + FreeAndNil(FMarks); + FreeAndNil(FListener); + FreeAndNil(FGrid); inherited; end; @@ -725,7 +725,7 @@ initialization SkipObsoleteAxisProperties; finalization - VIdentityTransform.Free; + FreeAndNil(VIdentityTransform); end. diff --git a/components/tachart/tachartutils.pas b/components/tachart/tachartutils.pas index 2ad8d8e920..41ae8689a3 100644 --- a/components/tachart/tachartutils.pas +++ b/components/tachart/tachartutils.pas @@ -790,7 +790,7 @@ var begin for i := 0 to Count - 1 do TListener(Items[i]).Forget; - inherited Destroy; + inherited; end; procedure TBroadcaster.Subscribe(AListener: TListener); diff --git a/components/tachart/tacustomseries.pas b/components/tachart/tacustomseries.pas index f50677827b..ef2a726e79 100644 --- a/components/tachart/tacustomseries.pas +++ b/components/tachart/tacustomseries.pas @@ -363,11 +363,10 @@ end; destructor TChartSeries.Destroy; begin - FListener.Free; - FBuiltinSource.Free; - FMarks.Free; - - inherited Destroy; + FreeAndNil(FListener); + FreeAndNil(FBuiltinSource); + FreeAndNil(FMarks); + inherited; end; function TChartSeries.Extent: TDoubleRect; diff --git a/components/tachart/tadbsource.pas b/components/tachart/tadbsource.pas index daa9d9cd67..d512fd5a79 100644 --- a/components/tachart/tadbsource.pas +++ b/components/tachart/tadbsource.pas @@ -65,6 +65,9 @@ procedure Register; implementation +uses + SysUtils; + type { TDbChartSourceDataLink } @@ -140,8 +143,8 @@ end; destructor TDbChartSource.Destroy; begin - FDataLink.Free; - inherited Destroy; + FreeAndNil(FDataLink); + inherited; end; function TDbChartSource.GetCount: Integer; diff --git a/components/tachart/tagraph.pas b/components/tachart/tagraph.pas index 6da48793b9..7096745125 100644 --- a/components/tachart/tagraph.pas +++ b/components/tachart/tagraph.pas @@ -406,19 +406,19 @@ end; destructor TChart.Destroy; begin - FSeries.Free; - FGraphBrush.Free; + FreeAndNil(FSeries); + FreeAndNil(FGraphBrush); - FLegend.Free; - FTitle.Free; - FFoot.Free; - FAxisList.Free; - FFrame.Free; - FExtent.Free; - FMargins.Free; - FBuiltinToolset.Free; + FreeAndNil(FLegend); + FreeAndNil(FTitle); + FreeAndNil(FFoot); + FreeAndNil(FAxisList); + FreeAndNil(FFrame); + FreeAndNil(FExtent); + FreeAndNil(FMargins); + FreeAndNil(FBuiltinToolset); - inherited Destroy; + inherited; end; {$IFDEF LCLGtk2} @@ -1095,7 +1095,7 @@ destructor TBasicChartSeries.Destroy; begin if FChart <> nil then FChart.DeleteSeries(Self); - inherited Destroy; + inherited; end; function TBasicChartSeries.GetNearestPoint( @@ -1152,8 +1152,8 @@ end; destructor TChartSeriesList.Destroy; begin Clear; - FList.Free; - inherited Destroy; + FreeAndNil(FList); + inherited; end; function TChartSeriesList.GetItem(AIndex: Integer): TBasicChartSeries; @@ -1201,6 +1201,6 @@ initialization SeriesClassRegistry := TStringList.Create; finalization - SeriesClassRegistry.Free; + FreeAndNil(SeriesClassRegistry); end. diff --git a/components/tachart/talegend.pas b/components/tachart/talegend.pas index 258730feff..30b5dae1a6 100644 --- a/components/tachart/talegend.pas +++ b/components/tachart/talegend.pas @@ -207,9 +207,9 @@ end; destructor TChartLegend.Destroy; begin - FBackgroundBrush.Free; - FFont.Free; - FFrame.Free; + FreeAndNil(FBackgroundBrush); + FreeAndNil(FFont); + FreeAndNil(FFrame); inherited; end; diff --git a/components/tachart/taseries.pas b/components/tachart/taseries.pas index d9f52ba851..b3149aee67 100644 --- a/components/tachart/taseries.pas +++ b/components/tachart/taseries.pas @@ -325,7 +325,7 @@ type implementation uses - GraphMath, Math, PropEdits, Types; + GraphMath, Math, PropEdits, SysUtils, Types; { TLineSeries } @@ -353,9 +353,9 @@ end; destructor TLineSeries.Destroy; begin - FLinePen.Free; - FPointer.Free; - inherited Destroy; + FreeAndNil(FLinePen); + FreeAndNil(FPointer); + inherited; end; procedure TLineSeries.Draw(ACanvas: TCanvas); @@ -480,8 +480,8 @@ end; destructor TLine.Destroy; begin - inherited Destroy; - FPen.Free; + FreeAndNil(FPen); + inherited; end; procedure TLine.Draw(ACanvas: TCanvas); @@ -701,9 +701,9 @@ end; destructor TBarSeries.Destroy; begin - FBarPen.Free; - FBarBrush.Free; - inherited Destroy; + FreeAndNil(FBarPen); + FreeAndNil(FBarBrush); + inherited; end; procedure TBarSeries.Draw(ACanvas: TCanvas); @@ -951,9 +951,9 @@ end; destructor TAreaSeries.Destroy; begin - FAreaLinesPen.Free; - FAreaBrush.Free; - inherited Destroy; + FreeAndNil(FAreaLinesPen); + FreeAndNil(FAreaBrush); + inherited; end; procedure TAreaSeries.Draw(ACanvas: TCanvas); @@ -1079,10 +1079,10 @@ end; destructor TFuncSeries.Destroy; begin - FExtent.Free; - FDomainExclusions.Free; - FPen.Free; - inherited Destroy; + FreeAndNil(FExtent); + FreeAndNil(FDomainExclusions); + FreeAndNil(FPen); + inherited; end; procedure TFuncSeries.Draw(ACanvas: TCanvas); diff --git a/components/tachart/tasources.pas b/components/tachart/tasources.pas index cd41e65001..aacf6114ac 100644 --- a/components/tachart/tasources.pas +++ b/components/tachart/tasources.pas @@ -268,7 +268,7 @@ end; destructor TCustomChartSource.Destroy; begin - FBroadcaster.Free; + FreeAndNil(FBroadcaster); inherited; end; @@ -527,9 +527,9 @@ end; destructor TListChartSource.Destroy; begin Clear; - FDataPoints.Free; - FData.Free; - inherited Destroy; + FreeAndNil(FDataPoints); + FreeAndNil(FData); + inherited; end; function TListChartSource.GetCount: Integer; @@ -677,8 +677,8 @@ end; destructor TRandomChartSource.Destroy; begin - FRNG.Free; - inherited Destroy; + FreeAndNil(FRNG); + inherited; end; function TRandomChartSource.GetCount: Integer; diff --git a/components/tachart/tatools.pas b/components/tachart/tatools.pas index 9462cb146a..0986b55ee2 100644 --- a/components/tachart/tatools.pas +++ b/components/tachart/tatools.pas @@ -168,7 +168,7 @@ resourcestring implementation uses - ComponentEditors, Forms, GraphMath, Math, PropEdits, Types, + ComponentEditors, Forms, GraphMath, Math, PropEdits, SysUtils, Types, TAChartUtils, TASubcomponentsEditor; type @@ -457,8 +457,8 @@ destructor TChartToolset.Destroy; begin while Tools.Count > 0 do Item[Tools.Count - 1].Free; - FTools.Free; - inherited Destroy; + FreeAndNil(FTools); + inherited; end; function TChartToolset.Dispatch( @@ -689,7 +689,7 @@ initialization finalization - ToolsClassRegistry.Free; + FreeAndNil(ToolsClassRegistry); end. diff --git a/components/tachart/tatransformations.pas b/components/tachart/tatransformations.pas index df9306f3d1..d669a0292c 100644 --- a/components/tachart/tatransformations.pas +++ b/components/tachart/tatransformations.pas @@ -378,8 +378,8 @@ destructor TChartAxisTransformations.Destroy; begin while List.Count > 0 do TAxisTransform(List[List.Count - 1]).Free; - FList.Free; - FBroadcaster.Free; + FreeAndNil(FList); + FreeAndNil(FBroadcaster); inherited; end; @@ -513,7 +513,7 @@ initialization finalization - AxisTransformsClassRegistry.Free; + FreeAndNil(AxisTransformsClassRegistry); end. diff --git a/components/tachart/tatypes.pas b/components/tachart/tatypes.pas index e68f0ccefe..26d839ecdf 100644 --- a/components/tachart/tatypes.pas +++ b/components/tachart/tatypes.pas @@ -357,10 +357,10 @@ end; destructor TChartTitle.Destroy; begin - FBrush.Free; - FFont.Free; - FFrame.Free; - FText.Free; + FreeAndNil(FBrush); + FreeAndNil(FFont); + FreeAndNil(FFrame); + FreeAndNil(FText); inherited; end; @@ -427,11 +427,11 @@ end; destructor TGenericChartMarks.Destroy; begin - FFrame.Free; - FLabelBrush.Free; - FLabelFont.Free; - FLinkPen.Free; - inherited Destroy; + FreeAndNil(FFrame); + FreeAndNil(FLabelBrush); + FreeAndNil(FLabelFont); + FreeAndNil(FLinkPen); + inherited; end; procedure TGenericChartMarks.DrawLabel( @@ -580,9 +580,9 @@ end; destructor TSeriesPointer.Destroy; begin - FBrush.Free; - FPen.Free; - inherited Destroy; + FreeAndNil(FBrush); + FreeAndNil(FPen); + inherited; end; procedure TSeriesPointer.Draw(ACanvas: TCanvas; ACenter: TPoint; AColor: TColor);