From 980591b46bc0385c23b6ad26a5b03d23487ccac3 Mon Sep 17 00:00:00 2001
From: ask <ask@lazarus-ide.org>
Date: Sun, 26 Jun 2011 07:14:37 +0000
Subject: [PATCH] TAChart: Merge duplicate definitions of TChartColor

git-svn-id: trunk@31392 -
---
 components/tachart/tachartutils.pas        | 3 +++
 components/tachart/tacustomsource.pas      | 3 ---
 components/tachart/tadraweraggpas.pas      | 4 ++--
 components/tachart/tadrawerbgra.pas        | 4 ++--
 components/tachart/tadrawercanvas.pas      | 4 ++--
 components/tachart/tadrawerfpvectorial.pas | 4 ++--
 components/tachart/tadrawersvg.pas         | 4 ++--
 components/tachart/tadrawerwmf.pas         | 1 -
 components/tachart/tadrawutils.pas         | 5 ++---
 9 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/components/tachart/tachartutils.pas b/components/tachart/tachartutils.pas
index bafc58ad4b..340b0fb264 100644
--- a/components/tachart/tachartutils.pas
+++ b/components/tachart/tachartutils.pas
@@ -42,6 +42,9 @@ type
   EListenerError = class(EChartError);
   EDrawDataError = class(EChartError);
 
+  // Like TColor, but avoiding dependency on Graphics.
+  TChartColor = -$7FFFFFFF-1..$7FFFFFFF;
+
   TDoublePoint = record
     X, Y: Double;
   end;
diff --git a/components/tachart/tacustomsource.pas b/components/tachart/tacustomsource.pas
index 5e23ac9685..7050876220 100644
--- a/components/tachart/tacustomsource.pas
+++ b/components/tachart/tacustomsource.pas
@@ -29,9 +29,6 @@ type
   EEditableSourceRequired = class(EChartError);
   EYCountError = class(EChartError);
 
-  // Like TColor, but avoiding dependency on Graphics.
-  TChartColor = -$7FFFFFFF-1..$7FFFFFFF;
-
   { TChartDataItem }
 
   TChartDataItem = object
diff --git a/components/tachart/tadraweraggpas.pas b/components/tachart/tadraweraggpas.pas
index 121c3184f4..28381987f5 100644
--- a/components/tachart/tadraweraggpas.pas
+++ b/components/tachart/tadraweraggpas.pas
@@ -20,7 +20,7 @@ unit TADrawerAggPas;
 interface
 
 uses
-  Classes, FPCanvas, Agg_LCL, TADrawUtils;
+  Classes, FPCanvas, Agg_LCL, TAChartUtils, TADrawUtils;
 
 type
 
@@ -68,7 +68,7 @@ type
 implementation
 
 uses
-  Math, TAChartUtils, TAGeometry;
+  Math, TAGeometry;
 
 { TAggPasDrawer }
 
diff --git a/components/tachart/tadrawerbgra.pas b/components/tachart/tadrawerbgra.pas
index f274a13080..1ba46a109e 100644
--- a/components/tachart/tadrawerbgra.pas
+++ b/components/tachart/tadrawerbgra.pas
@@ -20,7 +20,7 @@ unit TADrawerBGRA;
 interface
 
 uses
-  BGRABitmap, BGRABitmapTypes, Classes, FPCanvas, TADrawUtils;
+  BGRABitmap, BGRABitmapTypes, Classes, FPCanvas, TAChartUtils, TADrawUtils;
 
 type
 
@@ -78,7 +78,7 @@ type
 implementation
 
 uses
-  TAChartUtils, TAGeometry;
+  TAGeometry;
 
 function PointsToPointsF(
   APoints: array of TPoint; AStartIndex, ANumPts: Integer): ArrayOfTPointF;
diff --git a/components/tachart/tadrawercanvas.pas b/components/tachart/tadrawercanvas.pas
index 456aec439a..9b50c2cc62 100644
--- a/components/tachart/tadrawercanvas.pas
+++ b/components/tachart/tadrawercanvas.pas
@@ -21,7 +21,7 @@ unit TADrawerCanvas;
 interface
 
 uses
-  Classes, FPCanvas, FPImage, Graphics, SysUtils, TADrawUtils;
+  Classes, FPCanvas, FPImage, Graphics, SysUtils, TAChartUtils, TADrawUtils;
 
 type
   IChartTCanvasDrawer = interface
@@ -81,7 +81,7 @@ type
 implementation
 
 uses
-  TAChartUtils, TAGeometry;
+  TAGeometry;
 
 function CanvasGetFontOrientationFunc(AFont: TFPCustomFont): Integer;
 begin
diff --git a/components/tachart/tadrawerfpvectorial.pas b/components/tachart/tadrawerfpvectorial.pas
index e107fe50ac..52f8bdbfca 100644
--- a/components/tachart/tadrawerfpvectorial.pas
+++ b/components/tachart/tadrawerfpvectorial.pas
@@ -20,7 +20,7 @@ unit TADrawerFPVectorial;
 interface
 
 uses
-  Classes, FPCanvas, FPImage, FPVectorial, TADrawUtils;
+  Classes, FPCanvas, FPImage, FPVectorial, TAChartUtils, TADrawUtils;
 
 type
 
@@ -77,7 +77,7 @@ type
 implementation
 
 uses
-  Math, TAChartUtils, TAGeometry;
+  Math, TAGeometry;
 
 { TFPVectorialDrawer }
 
diff --git a/components/tachart/tadrawersvg.pas b/components/tachart/tadrawersvg.pas
index a0c2ba9307..4d77116b71 100644
--- a/components/tachart/tadrawersvg.pas
+++ b/components/tachart/tadrawersvg.pas
@@ -20,7 +20,7 @@ unit TADrawerSVG;
 interface
 
 uses
-  Classes, FPImage, FPCanvas, TADrawUtils;
+  Classes, FPImage, FPCanvas, TAChartUtils, TADrawUtils;
 
 type
 
@@ -90,7 +90,7 @@ type
 implementation
 
 uses
-  Math, SysUtils, TAChartUtils, TAGeometry;
+  Math, SysUtils, TAGeometry;
 
 const
   RECT_FMT =
diff --git a/components/tachart/tadrawerwmf.pas b/components/tachart/tadrawerwmf.pas
index 75445bf766..6fca6106e9 100644
--- a/components/tachart/tadrawerwmf.pas
+++ b/components/tachart/tadrawerwmf.pas
@@ -73,7 +73,6 @@ type
     property MMWidth: Integer read FMMWidth write SetMMWidth;
   end;
 
-
   { TMetafileCanvas }
 
   TMetafileCanvas = class(TCanvas)
diff --git a/components/tachart/tadrawutils.pas b/components/tachart/tadrawutils.pas
index 93b25c1f71..3a53999dcf 100644
--- a/components/tachart/tadrawutils.pas
+++ b/components/tachart/tadrawutils.pas
@@ -21,11 +21,10 @@ unit TADrawUtils;
 interface
 
 uses
-  Classes, FPCanvas, FPImage, Types;
+  Classes, FPCanvas, FPImage, Types, TAChartUtils;
 
 type
   // Same types as in Graphics unit, but without dependency.
-  TChartColor = -$7FFFFFFF-1..$7FFFFFFF;
   TChartAntialiasingMode = (amDontCare, amOn, amOff);
 
 type
@@ -155,7 +154,7 @@ type
 implementation
 
 uses
-  Math, TAChartUtils, TAGeometry;
+  Math, TAGeometry;
 
 const
   LINE_INTERVAL = 2;