* Dotted filenames for package fcl-css

packages/fcl-css/fpmake.pp

@@ -37,6 +37,7 @@ begin
 
     T:=P.Targets.AddUnit('fpcsstree.pp');
     T:=P.Targets.AddUnit('fpcssscanner.pp');
+    T.Dependencies.AddUnit('fpcsstree');
     T.ResourceStrings:=True;
     T:=P.Targets.AddUnit('fpcssparser.pp');
     T.ResourceStrings:=True;

packages/fcl-css/namespaced/FpCss.Parser.pp

@@ -0,0 +1,3 @@
+unit FpCss.Parser;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcssparser.pp}

packages/fcl-css/namespaced/FpCss.Resolver.pas

@@ -0,0 +1,3 @@
+unit FpCss.Resolver;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcssresolver.pas}

packages/fcl-css/namespaced/FpCss.Scanner.pp

@@ -0,0 +1,3 @@
+unit FpCss.Scanner;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcssscanner.pp}

packages/fcl-css/namespaced/FpCss.Tree.pp

@@ -0,0 +1,3 @@
+unit FpCss.Tree;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcsstree.pp}

packages/fcl-css/namespaced/FpCss.Utils.pp

@@ -0,0 +1,3 @@
+unit FpCss.Utils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcssutils.pp}

packages/fcl-css/namespaces.lst

@@ -0,0 +1,7 @@
+{s*:src/}=namespaced/
+{i+:src/}
+src/fpcssscanner.pp=namespaced/FpCss.Scanner.pp
+src/fpcssresolver.pas=namespaced/FpCss.Resolver.pas
+src/fpcssutils.pp=namespaced/FpCss.Utils.pp
+src/fpcssparser.pp=namespaced/FpCss.Parser.pp
+src/fpcsstree.pp=namespaced/FpCss.Tree.pp

packages/fcl-css/src/fpcssparser.pp

@@ -12,15 +12,22 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpCSSParser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 {$WARN 6060 off} // Case statement does not handle all possible cases
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.TypInfo, System.Classes, System.SysUtils, FPCSS.Tree, FPCSS.Scanner;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   TypInfo, Classes, SysUtils, fpcsstree, fpcssscanner;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   ECSSParser = Class(ECSSException);

packages/fcl-css/src/fpcssresolver.pas

@@ -89,7 +89,9 @@ ToDo:
 
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpCSSResolver;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 {$Interfaces CORBA}
@@ -97,8 +99,13 @@ unit fpCSSResolver;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Types, System.Contnrs, System.StrUtils, FPCSS.Tree;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, types, Contnrs, StrUtils, fpCSSTree;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   CSSSpecifityInvalid = -2;

packages/fcl-css/src/fpcssscanner.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpCSSScanner;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpCss.Tree;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fpCSSTree;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TCSSToken =  (

packages/fcl-css/src/fpcsstree.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpCSSTree;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 {$codepage utf8}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Contnrs, System.RtlConsts, System.SysUtils, System.Classes, System.Math;
+{$ELSE FPC_DOTTEDUNITS}
 uses Contnrs, RtlConsts, SysUtils, Classes, Math;
+{$ENDIF FPC_DOTTEDUNITS}
+
 
 Type
   ECSSException = class(Exception);
@@ -424,6 +431,15 @@ Const
 
 implementation
 
+<<<<<<< HEAD
+=======
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.RtlConsts;
+{$ELSE FPC_DOTTEDUNITS}
+uses SysUtils, rtlConsts;
+{$ENDIF FPC_DOTTEDUNITS}
+
+>>>>>>> c4d306351d (* Dotted filenames for package fcl-css)
 Const
   sIndent = '  ';
 

packages/fcl-css/src/fpcssutils.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpcssutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.TypInfo, System.Classes, System.SysUtils, System.Types, FPCSS.Tree, FPCSS.Parser, FPCSS.Scanner;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   TypInfo, Classes, SysUtils, types, fpcsstree, fpcssparser, fpcssscanner;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type