Browse Source

fcl-css: clean up

mattias 2 years ago
parent
commit
87044c004f

+ 1 - 1
packages/fcl-css/src/fpcssparser.pp

@@ -15,7 +15,7 @@
 unit fpCSSParser;
 unit fpCSSParser;
 
 
 {$mode ObjFPC}{$H+}
 {$mode ObjFPC}{$H+}
-
+{$WARN 6060 off : }
 interface
 interface
 
 
 uses
 uses

+ 5 - 4
packages/fcl-css/src/fpcssresolver.pas

@@ -93,7 +93,7 @@ unit fpCSSResolver;
 
 
 {$mode ObjFPC}{$H+}
 {$mode ObjFPC}{$H+}
 {$Interfaces CORBA}
 {$Interfaces CORBA}
-
+{$WARN 6060 off : }
 interface
 interface
 
 
 uses
 uses
@@ -341,7 +341,7 @@ type
 
 
   { TCSSResolver }
   { TCSSResolver }
 
 
-  TCSSResolver = class
+  TCSSResolver = class(TComponent)
   private
   private
     FNumericalIDs: array[TCSSNumericalIDKind] of TCSSNumericalIDs;
     FNumericalIDs: array[TCSSNumericalIDKind] of TCSSNumericalIDs;
     FOnLog: TCSSResolverLogEvent;
     FOnLog: TCSSResolverLogEvent;
@@ -406,7 +406,7 @@ type
     function GetElPos(El: TCSSElement): string; virtual;
     function GetElPos(El: TCSSElement): string; virtual;
     function GetElPath(El: TCSSElement): string; virtual;
     function GetElPath(El: TCSSElement): string; virtual;
   public
   public
-    constructor Create;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     destructor Destroy; override;
     procedure Clear; virtual;
     procedure Clear; virtual;
     procedure ClearStyleCustomData; virtual;
     procedure ClearStyleCustomData; virtual;
@@ -1927,8 +1927,9 @@ begin
   Result:=GetCSSPath(El);
   Result:=GetCSSPath(El);
 end;
 end;
 
 
-constructor TCSSResolver.Create;
+constructor TCSSResolver.Create(AOwner: TComponent);
 begin
 begin
+  inherited;
   FLogEntries:=TFPObjectList.Create(true);
   FLogEntries:=TFPObjectList.Create(true);
 end;
 end;
 
 

+ 3 - 3
packages/fcl-css/tests/tccssresolver.pp

@@ -104,8 +104,8 @@ type
     function GetCSSAttributeClass: TCSSString; virtual;
     function GetCSSAttributeClass: TCSSString; virtual;
     function HasCSSAttribute(const AttrID: TCSSNumericalID): boolean; virtual;
     function HasCSSAttribute(const AttrID: TCSSNumericalID): boolean; virtual;
     function GetCSSAttribute(const AttrID: TCSSNumericalID): TCSSString; virtual;
     function GetCSSAttribute(const AttrID: TCSSNumericalID): TCSSString; virtual;
-    function HasCSSPseudo(const AttrID: TCSSNumericalID): boolean; virtual;
-    function GetCSSPseudo(const AttrID: TCSSNumericalID): TCSSString; virtual;
+    function HasCSSPseudo(const {%H-}AttrID: TCSSNumericalID): boolean; virtual;
+    function GetCSSPseudo(const {%H-}AttrID: TCSSNumericalID): TCSSString; virtual;
     function GetCSSEmpty: boolean; virtual;
     function GetCSSEmpty: boolean; virtual;
     function GetCSSDepth: integer; virtual;
     function GetCSSDepth: integer; virtual;
     property Parent: TDemoNode read FParent write SetParent;
     property Parent: TDemoNode read FParent write SetParent;
@@ -1385,7 +1385,7 @@ begin
   AttributeIDs['caption']:=AttrID;
   AttributeIDs['caption']:=AttrID;
   inc(AttrID);
   inc(AttrID);
 
 
-  FCSSResolver:=TCSSResolver.Create;
+  FCSSResolver:=TCSSResolver.Create(nil);
   for NumKind in TCSSNumericalIDKind do
   for NumKind in TCSSNumericalIDKind do
     CSSResolver.NumericalIDs[NumKind]:=FNumericalIDs[NumKind];
     CSSResolver.NumericalIDs[NumKind]:=FNumericalIDs[NumKind];