* Dotted filenames for package fcl-report

packages/fcl-report/namespaced/FpReport.BarCode.pp

@@ -0,0 +1,3 @@
+unit FpReport.BarCode;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportbarcode.pp}

packages/fcl-report/namespaced/FpReport.CanvasHelper.pp

@@ -0,0 +1,3 @@
+unit FpReport.CanvasHelper;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportcanvashelper.pp}

packages/fcl-report/namespaced/FpReport.Contnr.pp

@@ -0,0 +1,3 @@
+unit FpReport.Contnr;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportcontnr.pp}

packages/fcl-report/namespaced/FpReport.Data.Csv.pp

@@ -0,0 +1,3 @@
+unit FpReport.Data.Csv;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportdatacsv.pp}

packages/fcl-report/namespaced/FpReport.Data.Db.pp

@@ -0,0 +1,3 @@
+unit FpReport.Data.Db;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportdb.pp}

packages/fcl-report/namespaced/FpReport.Data.Dbf.pp

@@ -0,0 +1,3 @@
+unit FpReport.Data.Dbf;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportdatadbf.pp}

packages/fcl-report/namespaced/FpReport.Data.Json.pp

@@ -0,0 +1,3 @@
+unit FpReport.Data.Json;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportjson.pp}

packages/fcl-report/namespaced/FpReport.Data.Rest.pp

@@ -0,0 +1,3 @@
+unit FpReport.Data.Rest;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportdatajson.pp}

packages/fcl-report/namespaced/FpReport.Data.SqlDb.pp

@@ -0,0 +1,3 @@
+unit FpReport.Data.SqlDb;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportdatasqldb.pp}

packages/fcl-report/namespaced/FpReport.Data.pp

@@ -0,0 +1,3 @@
+unit FpReport.Data;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportdata.pp}

packages/fcl-report/namespaced/FpReport.Dom.pp

@@ -0,0 +1,3 @@
+unit FpReport.Dom;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportdom.pp}

packages/fcl-report/namespaced/FpReport.Export.FpImage.pp

@@ -0,0 +1,3 @@
+unit FpReport.Export.FpImage;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportfpimageexport.pp}

packages/fcl-report/namespaced/FpReport.Export.Html.pp

@@ -0,0 +1,3 @@
+unit FpReport.Export.Html;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreporthtmlexport.pp}

packages/fcl-report/namespaced/FpReport.Export.Pdf.pp

@@ -0,0 +1,3 @@
+unit FpReport.Export.Pdf;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportpdfexport.pp}

packages/fcl-report/namespaced/FpReport.Expressions.pp

@@ -0,0 +1,3 @@
+unit FpReport.Expressions;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fprepexprpars.pp}

packages/fcl-report/namespaced/FpReport.ExtFuncs.pp

@@ -0,0 +1,3 @@
+unit FpReport.ExtFuncs;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpextfuncs.pp}

packages/fcl-report/namespaced/FpReport.Html.Parser.pp

@@ -0,0 +1,3 @@
+unit FpReport.Html.Parser;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreporthtmlparser.pp}

packages/fcl-report/namespaced/FpReport.Html.Utils.pp

@@ -0,0 +1,3 @@
+unit FpReport.Html.Utils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreporthtmlutil.pp}

packages/fcl-report/namespaced/FpReport.Json.pp

@@ -0,0 +1,3 @@
+unit FpReport.Json;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpjsonreport.pp}

packages/fcl-report/namespaced/FpReport.Lazarus.pp

@@ -0,0 +1,3 @@
+unit FpReport.Lazarus;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fplazreport.pp}

packages/fcl-report/namespaced/FpReport.QrCode.pp

@@ -0,0 +1,3 @@
+unit FpReport.QrCode;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportqrcode.pp}

packages/fcl-report/namespaced/FpReport.Report.pp

@@ -0,0 +1,3 @@
+unit FpReport.Report;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreport.pp}

packages/fcl-report/namespaced/FpReport.Streamer.pp

@@ -0,0 +1,3 @@
+unit FpReport.Streamer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreportstreamer.pp}

packages/fcl-report/namespaces.lst

@@ -0,0 +1,25 @@
+src/fpreportdata.pp=namespaced/FpReport.Data.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/fpreportpdfexport.pp=namespaced/FpReport.Export.Pdf.pp
+src/fpreportdatajson.pp=namespaced/FpReport.Data.Rest.pp
+src/fpreporthtmlexport.pp=namespaced/FpReport.Export.Html.pp
+src/fpreportfpimageexport.pp=namespaced/FpReport.Export.FpImage.pp
+src/fpreportdb.pp=namespaced/FpReport.Data.Db.pp
+src/fpreportcanvashelper.pp=namespaced/FpReport.CanvasHelper.pp
+src/fpreportdatadbf.pp=namespaced/FpReport.Data.Dbf.pp
+src/fpreportqrcode.pp=namespaced/FpReport.QrCode.pp
+src/fpreportbarcode.pp=namespaced/FpReport.BarCode.pp
+src/fpreporthtmlutil.pp=namespaced/FpReport.Html.Utils.pp
+src/fpjsonreport.pp=namespaced/FpReport.Json.pp
+src/fpreportdatacsv.pp=namespaced/FpReport.Data.Csv.pp
+src/fpextfuncs.pp=namespaced/FpReport.ExtFuncs.pp
+src/fpreport.pp=namespaced/FpReport.Report.pp
+src/fplazreport.pp=namespaced/FpReport.Lazarus.pp
+src/fpreportstreamer.pp=namespaced/FpReport.Streamer.pp
+src/fpreportcontnr.pp=namespaced/FpReport.Contnr.pp
+src/fpreportdom.pp=namespaced/FpReport.Dom.pp
+src/fpreportdatasqldb.pp=namespaced/FpReport.Data.SqlDb.pp
+src/fpreporthtmlparser.pp=namespaced/FpReport.Html.Parser.pp
+src/fprepexprpars.pp=namespaced/FpReport.Expressions.pp
+src/fpreportjson.pp=namespaced/FpReport.Data.Json.pp

packages/fcl-report/src/fpextfuncs.pp

@@ -13,18 +13,29 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpExtFuncs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils,
+  System.StrUtils,
+  System.DateUtils,
+  Fcl.Expressions;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils,
   StrUtils,
   DateUtils,
   fpexprpars;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 procedure RegisterExtraFunctions;

packages/fcl-report/src/fpjsonreport.pp

@@ -13,14 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpjsonreport;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpReport.Report, FpJson.Data, FpReport.Streamer, FPReport.Data;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fpreport, fpjson, fpreportstreamer, fpreportdata;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 

packages/fcl-report/src/fplazreport.pp

@@ -13,14 +13,22 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fplazreport;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpReport.Report, Xml.Dom, FpImage.Canvas, FpPdf.Ttf, 
+  FpReport.Data.Db, FpReport.BarCode;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fpreport, DOM, FPCanvas, fpTTF, fpreportdb, fpreportbarcode;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TCustomPropEvent = procedure(Sender: TObject;Data : TDOMNode) of object;
@@ -84,7 +92,11 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.DateUtils, Xml.Read,FpImage.Reader.PNG,FpImage,FpImage.Reader.GIF,FpImage.Reader.JPEG,FpImage.BarCode;
+{$ELSE FPC_DOTTEDUNITS}
 uses dateutils, XMLRead,FPReadPNG,FPimage,FPReadGif,FPReadJPEG,fpbarcode;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Resourcestring
   SLogUnknownClass = 'Ignoring unknown lazreport class type for object "%s": "%s".';

packages/fcl-report/src/fprepexprpars.pp

@@ -15,12 +15,19 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fprepexprpars;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Contnrs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, contnrs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   // tokens
@@ -826,7 +833,11 @@ function ArgToFloat(Arg: TFPExpressionResult): TExprFloat;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.TypInfo;
+{$ELSE FPC_DOTTEDUNITS}
 uses typinfo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TFPExpressionParser }
 

packages/fcl-report/src/fpreport.pp

@@ -14,7 +14,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreport;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 {$inline on}
@@ -26,6 +28,23 @@ unit fpreport;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils,
+  System.Variants,
+  System.Contnrs,
+  FpImage.Canvas,
+  FpImage,
+  FpPdf.Ttf,
+  FpReport.Streamer,
+{$IF FPC_FULLVERSION>=30101}
+  Fcl.Expressions,
+{$ELSE}
+  FpReport.Expressions,
+{$ENDIF}
+  FpReport.Html.Parser;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils,
@@ -41,6 +60,7 @@ uses
   fprepexprpars,
 {$ENDIF}
   fpReportHTMLParser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -2368,12 +2388,21 @@ Var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.StrUtils,
+  System.TypInfo,
+  FpImage.Reader.PNG,
+  FpImage.Writer.PNG,
+  System.Hash.Base64;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   strutils,
   typinfo,
   FPReadPNG,
   FPWritePNG,
   base64;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   cPageCountMarker = '~PC~';

packages/fcl-report/src/fpreportbarcode.pp

@@ -12,15 +12,22 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportbarcode;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, FpImage, Fcl.Expressions, FpImage.ImgBarCode, FpImage.BarCode, FpReport.Report, FpReport.Streamer;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, fpimage, fpexprpars, fpimgbarcode, fpbarcode, fpreport, fpreportstreamer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -61,7 +68,11 @@ Procedure UnRegisterReportBarcode;
   
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.TypInfo, System.StrUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses typinfo, strutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 { TFPReportBarcode }

packages/fcl-report/src/fpreportcanvashelper.pp

@@ -2,7 +2,7 @@
     This file is part of the Free Component Library.
     Copyright (c) 2017 Michael Van Canneyt, member of the Free Pascal development team
 
-    Canvas helper class for fpReport. Used by HTML and FPImage exporters.[B
+    Canvas helper class for fpReport. Used by HTML and FpImage exporters.[B
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportcanvashelper;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpImage, FpReport.Report, FpImage.Canvas;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fpimage, fpreport, fpcanvas;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -53,7 +60,11 @@ const
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Math;
+{$ELSE FPC_DOTTEDUNITS}
 uses math;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TReportImageFriend = class(TFPReportCustomImage);

packages/fcl-report/src/fpreportcontnr.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportcontnr;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpReport.Report, System.Contnrs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fpreport, contnrs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   { TFPReportObjectData }
@@ -79,7 +86,11 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.TypInfo, System.Variants;
+{$ELSE FPC_DOTTEDUNITS}
 uses typinfo, variants;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TFPReportObjectListData }
 

packages/fcl-report/src/fpreportdata.pp

@@ -14,13 +14,20 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportdata;
+{$ENDIF FPC_DOTTEDUNITS}
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Data.Db, FpJson.Data, FpReport.Report, FpReport.Data.Db;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, DB, fpjson, fpreport, fpreportdb;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   EReportDataError = class(EReportError);

packages/fcl-report/src/fpreportdatacsv.pp

@@ -13,14 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportdatacsv;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Data.Db, Data.BufDataset, Data.CsvDataset, FpJson.Data, FpReport.Data;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, db, bufdataset, csvdataset, fpjson, fpreportdata;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   keyFileName = 'filename';

packages/fcl-report/src/fpreportdatadbf.pp

@@ -13,14 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportdatadbf;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Data.Db, Data.Dbf.Dbf, FpJson.Data, FpReport.Data;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, db, dbf, fpjson, fpreportdata;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Const

packages/fcl-report/src/fpreportdatajson.pp

@@ -13,14 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportdatajson;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Data.Db, Data.JsonDataset, FpJson.Data, FpReport.Data;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, db, fpjsondataset, fpjson, fpreportdata;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TDBFReportDataFrame }
 
@@ -104,7 +111,11 @@ Resourcestring
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.TypInfo, FpJson.Parser,Fcl.UriParser, FpWeb.Http.Client;
+{$ELSE FPC_DOTTEDUNITS}
 uses typinfo,jsonparser,uriparser, fphttpclient;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Function FieldTypeToString(Ft : TFieldType; Strict : Boolean) : String;
 

packages/fcl-report/src/fpreportdatasqldb.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportdatasqldb;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.StrUtils, Data.Sqldb, Data.Db, FpJson.Data, FpReport.Data;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, strutils, sqldb, db, fpjson, fpreportdata;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   keyConnection   = 'connection';

packages/fcl-report/src/fpreportdb.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportdb;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpReport.Report, Data.Db;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fpreport, db;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 

packages/fcl-report/src/fpreportdom.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportdom;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Xml.Dom;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, DOM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   { TFPReportDOM }

packages/fcl-report/src/fpreportfpimageexport.pp

@@ -3,7 +3,7 @@
     Copyright (c) 2016 Michael Van Canneyt,
     member of the Free Pascal development team
 
-    FPReport FPImage export filter.
+    FPReport FpImage export filter.
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -14,19 +14,37 @@
 
  **********************************************************************}
 {
-  FPImage Export filter.
+  FpImage Export filter.
 
-  FPImage is included as standard with FPC. This exporter uses those classes
+  FpImage is included as standard with FPC. This exporter uses those classes
   to generate image output. One image per report page, and by default as a
   PNG image.
 
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportfpimageexport;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils,
+  FpReport.Report,
+  FpImage,
+  FpImage.Canvas,
+  FpReport.CanvasHelper,
+  System.Contnrs,
+  Xml.Dom,
+  Html.Dom,
+  Xml.HtmWrite,
+  FpImage.Common,
+  FpImage.ImageCanvas,
+  FpReport.Html.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils,
@@ -41,6 +59,7 @@ uses
   FPImgCmn,
   fpimgcanv,
   fpreporthtmlutil;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -149,11 +168,19 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  FpImage.Ftfont,
+  FpPdf.Ttf,
+  FpPdf.Ttf.Parser,
+  FpImage.Writer.PNG;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   ftFont,
   fpTTF,
   fpparsettf,
   fpwritepng;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 //  RGBA_Width = 4;
@@ -413,7 +440,7 @@ begin
       );
     end;
     Canvas.Font.FPColor := ColorToRGBTriple(txtblk.FGColor);
-    { FPImage text origin coordinate is Bottom-Left, and Report Layout is Top-Left }
+    { FpImage text origin coordinate is Bottom-Left, and Report Layout is Top-Left }
     lYPos := lYPos + txtblk.Height;
     Canvas.TextOut(
         mmToPixels(lXPos),
@@ -563,12 +590,12 @@ end;
 
 class function TFPReportExportfpImage.Name: String;
 begin
-  Result:='FPImage';
+  Result:='FpImage';
 end;
 
 class function TFPReportExportfpImage.Description: String;
 begin
-  Result:='Image file export (using FPImage)';
+  Result:='Image file export (using FpImage)';
 end;
 
 class function TFPReportExportfpImage.DefaultExtension: String;

packages/fcl-report/src/fpreporthtmlexport.pp

@@ -3,7 +3,7 @@
     Copyright (c) 2016 Michael Van Canneyt,
     member of the Free Pascal development team
 
-    FPReport FPImage export filter.
+    FPReport FpImage export filter.
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -16,16 +16,34 @@
 {
   HTML Export filter.
 
-  FPImage is included as standard with FPC. This exporter uses those classes
+  FpImage is included as standard with FPC. This exporter uses those classes
   to generate image output. 
 
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreporthtmlexport;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils,
+  FpReport.Report,
+  FpImage,
+  FpImage.Canvas,
+  System.Contnrs,
+  FpImage.Common,
+  Xml.Dom,
+  Html.Dom,
+  Xml.HtmWrite,
+  FpReport.CanvasHelper,
+  FpReport.Html.Utils,
+  FpImage.ImageCanvas;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils,
@@ -40,6 +58,7 @@ uses
   fpreportcanvashelper,
   fpreporthtmlutil,
   fpimgcanv;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TStyleElement = (sePosition,seSize, seFrame, seBackGroundColor);
@@ -226,12 +245,21 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  // ftFont,
+  FpPdf.Ttf,
+  FpPdf.Ttf.Parser,
+  System.Hash.Base64,
+  FpImage.Writer.PNG;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   // ftFont,
   fpTTF,
   fpparsettf,
   base64,
   fpwritepng;
+{$ENDIF FPC_DOTTEDUNITS}
 
 //  RGBA_Width = 4;
 

packages/fcl-report/src/fpreporthtmlparser.pp

@@ -115,13 +115,20 @@
 
 // {$DEFINE DEBUGLN_ON}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpReportHTMLParser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$IFDEF DEBUGLN_ON}

packages/fcl-report/src/fpreporthtmlutil.pp

@@ -13,14 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreporthtmlutil;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpImage, FpReport.Report, Xml.Dom, Html.Dom;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fpimage, fpreport, dom, dom_html;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -234,7 +241,11 @@ resourcestring
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Xml.HtmWrite;
+{$ELSE FPC_DOTTEDUNITS}
 uses htmwrite;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { Auxiliary functions }
 

packages/fcl-report/src/fpreportjson.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportjson;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpReport.Report, FpJson.Data;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fpreport, fpjson;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -126,7 +133,7 @@ begin
     JSON:=Nil
   else
     begin
-    aJSON:=fpjson.GetJSON(aValue);
+    aJSON:=fpjson.{$IFDEF FPC_DOTTEDUNITS}Data.{$ENDIF}GetJSON(aValue);
     try
       JSON:=aJSON;
       OwnsJSON:=True;
@@ -274,7 +281,7 @@ Var
 
 begin
   try
-    aJSON:=fpjson.GetJSON(S);
+    aJSON:=fpjson.{$IFDEF FPC_DOTTEDUNITS}Data.{$ENDIF}GetJSON(S);
     JSON:=aJSON;
     OwnsJSON:=True;
   except

packages/fcl-report/src/fpreportpdfexport.pp

@@ -12,18 +12,29 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportpdfexport;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils,
+  FpImage,
+  FpReport.Report,
+  FpPdf.Pdf;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils,
   fpImage,
   fpreport,
   fpPDF;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IF FPC_FULLVERSION>=30101}
 {$DEFINE PDF_HASISSTANDARDPDFFONT}
@@ -77,10 +88,17 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  FpImage.Canvas,
+  FpPdf.Ttf,
+  FpPdf.Ttf.Parser;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   FPCanvas,
   fpTTF,
   fpparsettf;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 { TFPReportExportPDF }

packages/fcl-report/src/fpreportqrcode.pp

@@ -12,15 +12,22 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpreportqrcode;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, FpImage, Fcl.Expressions, FpImage.QRCode, FpImage.QRCodeGen, FpReport.Report, FPReport.Streamer;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, fpimage, fpexprpars, fpimgqrcode, fpqrcodegen, fpreport, fpreportstreamer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -62,7 +69,11 @@ Procedure UnRegisterReportQRCode;
   
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.TypInfo, System.StrUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses typinfo, strutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 { TFPReportQRCode }

packages/fcl-report/src/fpreportstreamer.pp

@@ -14,16 +14,25 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpReportStreamer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils,
+  FpJson.Data;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils,
   fpjson;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type