* Rename files to avoid too generic names

git-svn-id: trunk@55935 -

.gitattributes

@@ -1509,49 +1509,49 @@ components/fpreport/design/bitmaps/tfpreportobjectlistdata.png -text svneol=unse
 components/fpreport/design/bitmaps/tfpreportpreviewexport.png -text svneol=unset#image/png
 components/fpreport/design/bitmaps/tfpreportprinterexport.png -text svneol=unset#image/png
 components/fpreport/design/bitmaps/tfpreportuserdata.png -text svneol=unset#image/png
-components/fpreport/design/designreportdata.pp svneol=native#text/plain
-components/fpreport/design/drawruler.pp svneol=native#text/plain
 components/fpreport/design/fpreportdesignctrl.pp svneol=native#text/plain
 components/fpreport/design/fpreportdesigner.pp svneol=native#text/plain
 components/fpreport/design/fpreportdesigner_icon.lrs svneol=native#text/plain
 components/fpreport/design/fpreportdesignobjectlist.pp svneol=native#text/plain
+components/fpreport/design/fpreportdesignreportdata.pp svneol=native#text/plain
+components/fpreport/design/fpreportdrawruler.pp svneol=native#text/plain
 components/fpreport/design/fpreporticons.lrs svneol=native#text/plain
-components/fpreport/design/fracsvdata.lfm svneol=native#text/plain
+components/fpreport/design/frafpreportcsvdata.lfm svneol=native#text/plain
-components/fpreport/design/fracsvdata.pp svneol=native#text/plain
+components/fpreport/design/frafpreportcsvdata.pp svneol=native#text/plain
-components/fpreport/design/fradbfdata.lfm svneol=native#text/plain
+components/fpreport/design/frafpreportdata.lfm svneol=native#text/plain
-components/fpreport/design/fradbfdata.pp svneol=native#text/plain
+components/fpreport/design/frafpreportdata.pp svneol=native#text/plain
-components/fpreport/design/frajsondata.lfm svneol=native#text/plain
+components/fpreport/design/frafpreportdbfdata.lfm svneol=native#text/plain
-components/fpreport/design/frajsondata.pp svneol=native#text/plain
+components/fpreport/design/frafpreportdbfdata.pp svneol=native#text/plain
-components/fpreport/design/frareportdata.lfm svneol=native#text/plain
+components/fpreport/design/frafpreportjsondata.lfm svneol=native#text/plain
-components/fpreport/design/frareportdata.pp svneol=native#text/plain
+components/fpreport/design/frafpreportjsondata.pp svneol=native#text/plain
+components/fpreport/design/frafpreportsqldbdata.lfm svneol=native#text/plain
+components/fpreport/design/frafpreportsqldbdata.pp svneol=native#text/plain
 components/fpreport/design/frareportobjectinspector.lfm svneol=native#text/plain
 components/fpreport/design/frareportobjectinspector.pp svneol=native#text/plain
-components/fpreport/design/frasqldbdata.lfm svneol=native#text/plain
-components/fpreport/design/frasqldbdata.pp svneol=native#text/plain
-components/fpreport/design/frmalignelements.lfm svneol=native#text/plain
-components/fpreport/design/frmalignelements.pp svneol=native#text/plain
 components/fpreport/design/frmconfigreportdata.lfm svneol=native#text/plain
 components/fpreport/design/frmconfigreportdata.pp svneol=native#text/plain
+components/fpreport/design/frmfprdresizeelements.lfm svneol=native#text/plain
+components/fpreport/design/frmfprdresizeelements.pp svneol=native#text/plain
+components/fpreport/design/frmfpreportalignelements.lfm svneol=native#text/plain
+components/fpreport/design/frmfpreportalignelements.pp svneol=native#text/plain
+components/fpreport/design/frmfpreportdataconnectioneditor.lfm svneol=native#text/plain
+components/fpreport/design/frmfpreportdataconnectioneditor.pp svneol=native#text/plain
+components/fpreport/design/frmfpreportdesignermain.lfm svneol=native#text/plain
+components/fpreport/design/frmfpreportdesignermain.pp svneol=native#text/plain
+components/fpreport/design/frmfpreportimageedit.lfm svneol=native#text/plain
+components/fpreport/design/frmfpreportimageedit.pp svneol=native#text/plain
+components/fpreport/design/frmfpreportmemoedit.lfm svneol=native#text/plain
+components/fpreport/design/frmfpreportmemoedit.pp svneol=native#text/plain
+components/fpreport/design/frmfpreportpreviewdata.lfm svneol=native#text/plain
+components/fpreport/design/frmfpreportpreviewdata.pp svneol=native#text/plain
+components/fpreport/design/frmfpreportproperties.lfm svneol=native#text/plain
+components/fpreport/design/frmfpreportproperties.pp svneol=native#text/plain
+components/fpreport/design/frmfpreportshapeedit.lfm svneol=native#text/plain
+components/fpreport/design/frmfpreportshapeedit.pp svneol=native#text/plain
+components/fpreport/design/frmfpreportvariables.lfm svneol=native#text/plain
+components/fpreport/design/frmfpreportvariables.pp svneol=native#text/plain
 components/fpreport/design/frmideselectreportdata.lfm svneol=native#text/plain
 components/fpreport/design/frmideselectreportdata.pp svneol=native#text/plain
-components/fpreport/design/frmreportdataconnectioneditor.lfm svneol=native#text/plain
-components/fpreport/design/frmreportdataconnectioneditor.pp svneol=native#text/plain
-components/fpreport/design/frmreportdesignermain.lfm svneol=native#text/plain
-components/fpreport/design/frmreportdesignermain.pp svneol=native#text/plain
-components/fpreport/design/frmreportimageedit.lfm svneol=native#text/plain
-components/fpreport/design/frmreportimageedit.pp svneol=native#text/plain
-components/fpreport/design/frmreportmemoedit.lfm svneol=native#text/plain
-components/fpreport/design/frmreportmemoedit.pp svneol=native#text/plain
-components/fpreport/design/frmreportpreviewdata.lfm svneol=native#text/plain
-components/fpreport/design/frmreportpreviewdata.pp svneol=native#text/plain
-components/fpreport/design/frmreportproperties.lfm svneol=native#text/plain
-components/fpreport/design/frmreportproperties.pp svneol=native#text/plain
-components/fpreport/design/frmreportshapeedit.lfm svneol=native#text/plain
-components/fpreport/design/frmreportshapeedit.pp svneol=native#text/plain
-components/fpreport/design/frmreportvariables.lfm svneol=native#text/plain
-components/fpreport/design/frmreportvariables.pp svneol=native#text/plain
-components/fpreport/design/frmresizeelements.lfm svneol=native#text/plain
-components/fpreport/design/frmresizeelements.pp svneol=native#text/plain
 components/fpreport/design/lazfpreportdesign.lpk svneol=native#text/plain
 components/fpreport/design/lazfpreportdesign.pas svneol=native#text/plain
 components/fpreport/design/lazidefpreport.lpk svneol=native#text/plain

components/fpreport/design/fpreportdesignctrl.pp

@@ -21,7 +21,7 @@ interface
 
 uses
   Classes, SysUtils, controls, fpreport, graphics, lmessages, fpreportlclexport, lcltype, menus,
-  fpreportdesignobjectlist, drawruler, graphutil, types;
+  fpreportdesignobjectlist, fpreportdrawruler, graphutil, types;
 
 Const
   clGrid  = TColor($E0E0E0);      // Default color for guide grid

components/fpreport/design/fpreportdesigner.pp

@@ -19,11 +19,11 @@ unit FPReportDesigner;
 interface
 
 uses
-  Classes, SysUtils, forms, fpreport, frmreportdesignermain;
+  Classes, SysUtils, forms, fpreport, frmfpreportdesignermain;
 
 type
-  TFPReportDesignOption = frmreportdesignermain.TFPReportDesignOption;
+  TFPReportDesignOption = frmfpreportdesignermain.TFPReportDesignOption;
-  TFPReportDesignOptions = frmreportdesignermain.TFPReportDesignOptions;
+  TFPReportDesignOptions = frmfpreportdesignermain.TFPReportDesignOptions;
 
   { TFPReportDesigner }
 

components/fpreport/design/fpreportdesignreportdata.pp

@@ -13,7 +13,7 @@
 
  **********************************************************************}
 
-unit designreportdata;
+unit fpreportdesignreportdata;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/fpreportdrawruler.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit drawruler;
+unit fpreportdrawruler;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/frafpreportcsvdata.pp

@@ -12,14 +12,14 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fracsvdata;
+unit frafpreportcsvdata;
 
 {$mode objfpc}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, EditBtn, StdCtrls, fpjson, db, designreportdata;
+  Classes, SysUtils, FileUtil, Forms, Controls, EditBtn, StdCtrls, fpjson, db, fpreportdesignreportdata;
 
 type
   TFrame = TReportDataConfigFrame;

components/fpreport/design/frafpreportdata.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frareportdata;
+unit frafpreportdata;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/frafpreportdbfdata.pp

@@ -12,14 +12,14 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fradbfdata;
+unit frafpreportdbfdata;
 
 {$mode objfpc}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, dbf, FileUtil, Forms, Controls, EditBtn, StdCtrls, fpjson, designreportdata, db;
+  Classes, SysUtils, dbf, FileUtil, Forms, Controls, EditBtn, StdCtrls, fpjson, fpreportdesignreportdata, db;
 
 type
   TFrame = TReportDataConfigFrame;

components/fpreport/design/frafpreportjsondata.pp

@@ -12,14 +12,14 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frajsondata;
+unit frafpreportjsondata;
 
 {$mode objfpc}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, StdCtrls, EditBtn, Buttons, ActnList, ValEdit, fpjson, designreportdata, db,
+  Classes, SysUtils, FileUtil, Forms, Controls, StdCtrls, EditBtn, Buttons, ActnList, ValEdit, fpjson, fpreportdesignreportdata, db,
   dialogs, fpjsondataset, Grids;
 
 type

components/fpreport/design/frafpreportsqldbdata.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frasqldbdata;
+unit frafpreportsqldbdata;
 
 {$mode objfpc}{$H+}
 
@@ -20,7 +20,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, EditBtn, StdCtrls, Buttons, ActnList, SynEdit, SynHighlighterSQL,
-  designreportdata, fpjson,  db, sqldb, reportdesigndatasql, dialogs;
+  fpreportdesignreportdata, fpjson,  db, sqldb, reportdesigndatasql, dialogs;
 
 type
   TFrame = TReportDataConfigFrame;
@@ -64,7 +64,7 @@ type
 
 implementation
 
-uses frmreportdataconnectioneditor, ibconnection, pqconnection, sqlite3conn, odbcconn;
+uses frmfpreportdataconnectioneditor, ibconnection, pqconnection, sqlite3conn, odbcconn;
 
 resourcestring
   SErrNoConnectionData = 'No connection data available';

components/fpreport/design/frmconfigreportdata.pp

@@ -20,7 +20,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, Buttons, ButtonPanel, ActnList, ComCtrls, ExtCtrls,
-  EditBtn, designreportdata, fpjson, db, reportdesignbaseforms;
+  EditBtn, fpreportdesignreportdata, fpjson, db, reportdesignbaseforms;
 
 type
   TForm = TBaseReportDataForm;

components/fpreport/design/frmfprdresizeelements.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frmresizeelements;
+unit frmfprdresizeelements;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/frmfpreportalignelements.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frmalignelements;
+unit frmfpreportalignelements;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/frmfpreportdataconnectioneditor.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frmreportdataconnectioneditor;
+unit frmfpreportdataconnectioneditor;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/frmfpreportdesignermain.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frmreportdesignermain;
+unit frmfpreportdesignermain;
 
 {$mode objfpc}{$H+}
 
@@ -21,7 +21,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   Menus, ActnList, ComCtrls, ExtCtrls, IniPropStorage, Types, fpreport, fpreportdesignctrl,
-  fraReportObjectInspector, designreportdata, frareportdata, fpreportdb;
+  fraReportObjectInspector, fpreportdesignreportdata, frafpreportdata, fpreportdb;
 
 type
   // If you add something here, do not forget to add to AllReportDesignOptions.

components/fpreport/design/frmfpreportimageedit.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frmreportimageedit;
+unit frmfpreportimageedit;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/frmfpreportmemoedit.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frmreportmemoedit;
+unit frmfpreportmemoedit;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/frmfpreportpreviewdata.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frmreportpreviewdata;
+unit frmfpreportpreviewdata;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/frmfpreportproperties.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frmreportproperties;
+unit frmfpreportproperties;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/frmfpreportshapeedit.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frmreportshapeedit;
+unit frmfpreportshapeedit;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/frmfpreportvariables.pp

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit frmreportvariables;
+unit frmfpreportvariables;
 
 {$mode objfpc}{$H+}
 

components/fpreport/design/lazfpreportdesign.lpk

@@ -13,12 +13,12 @@
     </CompilerOptions>
     <Files Count="40">
       <Item1>
-        <Filename Value="designreportdata.pp"/>
+        <Filename Value="fpreportdesignreportdata.pp"/>
-        <UnitName Value="designreportdata"/>
+        <UnitName Value="fpreportdesignreportdata"/>
       </Item1>
       <Item2>
-        <Filename Value="drawruler.pp"/>
+        <Filename Value="fpreportdrawruler.pp"/>
-        <UnitName Value="drawruler"/>
+        <UnitName Value="fpreportdrawruler"/>
       </Item2>
       <Item3>
         <Filename Value="fpreportdesignctrl.pp"/>
@@ -29,148 +29,148 @@
         <UnitName Value="fpreportdesignobjectlist"/>
       </Item4>
       <Item5>
-        <Filename Value="fracsvdata.lfm"/>
+        <Filename Value="frafpreportcsvdata.pp"/>
-        <Type Value="LFM"/>
+        <UnitName Value="frafpreportcsvdata"/>
       </Item5>
       <Item6>
-        <Filename Value="fracsvdata.pp"/>
+        <Filename Value="frafpreportdbfdata.pp"/>
-        <UnitName Value="fracsvdata"/>
+        <UnitName Value="frafpreportdbfdata"/>
       </Item6>
       <Item7>
-        <Filename Value="fradbfdata.lfm"/>
+        <Filename Value="frafpreportjsondata.pp"/>
-        <Type Value="LFM"/>
+        <UnitName Value="frafpreportjsondata"/>
       </Item7>
       <Item8>
-        <Filename Value="fradbfdata.pp"/>
+        <Filename Value="frafpreportdata.pp"/>
-        <UnitName Value="fradbfdata"/>
+        <UnitName Value="frafpreportdata"/>
       </Item8>
       <Item9>
-        <Filename Value="frajsondata.lfm"/>
+        <Filename Value="frareportobjectinspector.lfm"/>
         <Type Value="LFM"/>
       </Item9>
       <Item10>
-        <Filename Value="frajsondata.pp"/>
+        <Filename Value="frareportobjectinspector.pp"/>
-        <UnitName Value="frajsondata"/>
+        <UnitName Value="fraReportObjectInspector"/>
       </Item10>
       <Item11>
-        <Filename Value="frareportdata.lfm"/>
+        <Filename Value="frafpreportsqldbdata.pp"/>
-        <Type Value="LFM"/>
+        <UnitName Value="frafpreportsqldbdata"/>
       </Item11>
       <Item12>
-        <Filename Value="frareportdata.pp"/>
+        <Filename Value="frmfpreportalignelements.pp"/>
-        <UnitName Value="frareportdata"/>
+        <UnitName Value="frmfpreportalignelements"/>
       </Item12>
       <Item13>
-        <Filename Value="frareportobjectinspector.lfm"/>
+        <Filename Value="frmconfigreportdata.lfm"/>
         <Type Value="LFM"/>
       </Item13>
       <Item14>
-        <Filename Value="frareportobjectinspector.pp"/>
-        <UnitName Value="fraReportObjectInspector"/>
-      </Item14>
-      <Item15>
-        <Filename Value="frasqldbdata.lfm"/>
-        <Type Value="LFM"/>
-      </Item15>
-      <Item16>
-        <Filename Value="frasqldbdata.pp"/>
-        <UnitName Value="frasqldbdata"/>
-      </Item16>
-      <Item17>
-        <Filename Value="frmalignelements.lfm"/>
-        <Type Value="LFM"/>
-      </Item17>
-      <Item18>
-        <Filename Value="frmalignelements.pp"/>
-        <UnitName Value="frmalignelements"/>
-      </Item18>
-      <Item19>
-        <Filename Value="frmconfigreportdata.lfm"/>
-        <Type Value="LFM"/>
-      </Item19>
-      <Item20>
         <Filename Value="frmconfigreportdata.pp"/>
         <UnitName Value="frmconfigreportdata"/>
+      </Item14>
+      <Item15>
+        <Filename Value="frmfpreportdataconnectioneditor.pp"/>
+        <UnitName Value="frmfpreportdataconnectioneditor"/>
+      </Item15>
+      <Item16>
+        <Filename Value="frmfpreportdesignermain.pp"/>
+        <UnitName Value="frmfpreportdesignermain"/>
+      </Item16>
+      <Item17>
+        <Filename Value="frmfpreportimageedit.pp"/>
+        <UnitName Value="frmfpreportimageedit"/>
+      </Item17>
+      <Item18>
+        <Filename Value="frmfpreportmemoedit.pp"/>
+        <UnitName Value="frmfpreportmemoedit"/>
+      </Item18>
+      <Item19>
+        <Filename Value="frmfpreportpreviewdata.pp"/>
+        <UnitName Value="frmfpreportpreviewdata"/>
+      </Item19>
+      <Item20>
+        <Filename Value="frmfpreportproperties.pp"/>
+        <UnitName Value="frmfpreportproperties"/>
       </Item20>
       <Item21>
-        <Filename Value="frmreportdataconnectioneditor.lfm"/>
+        <Filename Value="frmfpreportshapeedit.pp"/>
-        <Type Value="LFM"/>
+        <UnitName Value="frmfpreportshapeedit"/>
       </Item21>
       <Item22>
-        <Filename Value="frmreportdataconnectioneditor.pp"/>
+        <Filename Value="frmfpreportvariables.pp"/>
-        <UnitName Value="frmreportdataconnectioneditor"/>
+        <UnitName Value="frmfpreportvariables"/>
       </Item22>
       <Item23>
-        <Filename Value="frmreportdesignermain.lfm"/>
+        <Filename Value="frmfprdresizeelements.pp"/>
-        <Type Value="LFM"/>
+        <UnitName Value="frmfprdresizeelements"/>
       </Item23>
       <Item24>
-        <Filename Value="frmreportdesignermain.pp"/>
+        <Filename Value="regfpdesigner.pp"/>
-        <UnitName Value="frmreportdesignermain"/>
+        <UnitName Value="regfpdesigner"/>
       </Item24>
       <Item25>
-        <Filename Value="frmreportimageedit.lfm"/>
+        <Filename Value="fpreportdesigner.pp"/>
-        <Type Value="LFM"/>
+        <UnitName Value="FPReportDesigner"/>
       </Item25>
       <Item26>
-        <Filename Value="frmreportimageedit.pp"/>
+        <Filename Value="frmfprdresizeelements.lfm"/>
-        <UnitName Value="frmreportimageedit"/>
+        <Type Value="LFM"/>
       </Item26>
       <Item27>
-        <Filename Value="frmreportmemoedit.lfm"/>
+        <Filename Value="frafpreportcsvdata.lfm"/>
         <Type Value="LFM"/>
       </Item27>
       <Item28>
-        <Filename Value="frmreportmemoedit.pp"/>
+        <Filename Value="frafpreportdbfdata.lfm"/>
-        <UnitName Value="frmreportmemoedit"/>
+        <Type Value="LFM"/>
       </Item28>
       <Item29>
-        <Filename Value="frmreportpreviewdata.lfm"/>
+        <Filename Value="frafpreportjsondata.lfm"/>
         <Type Value="LFM"/>
       </Item29>
       <Item30>
-        <Filename Value="frmreportpreviewdata.pp"/>
+        <Filename Value="frafpreportdata.lfm"/>
-        <UnitName Value="frmreportpreviewdata"/>
+        <Type Value="LFM"/>
       </Item30>
       <Item31>
-        <Filename Value="frmreportproperties.lfm"/>
+        <Filename Value="frafpreportsqldbdata.lfm"/>
         <Type Value="LFM"/>
       </Item31>
       <Item32>
-        <Filename Value="frmreportproperties.pp"/>
+        <Filename Value="frmfpreportalignelements.lfm"/>
-        <UnitName Value="frmreportproperties"/>
+        <Type Value="LFM"/>
       </Item32>
       <Item33>
-        <Filename Value="frmreportshapeedit.lfm"/>
+        <Filename Value="frmfpreportdataconnectioneditor.lfm"/>
         <Type Value="LFM"/>
       </Item33>
       <Item34>
-        <Filename Value="frmreportshapeedit.pp"/>
+        <Filename Value="frmfpreportdesignermain.lfm"/>
-        <UnitName Value="frmreportshapeedit"/>
+        <Type Value="LFM"/>
       </Item34>
       <Item35>
-        <Filename Value="frmreportvariables.lfm"/>
+        <Filename Value="frmfpreportimageedit.lfm"/>
         <Type Value="LFM"/>
       </Item35>
       <Item36>
-        <Filename Value="frmreportvariables.pp"/>
+        <Filename Value="frmfpreportmemoedit.lfm"/>
-        <UnitName Value="frmreportvariables"/>
+        <Type Value="LFM"/>
       </Item36>
       <Item37>
-        <Filename Value="frmresizeelements.lfm"/>
+        <Filename Value="frmfpreportpreviewdata.lfm"/>
         <Type Value="LFM"/>
       </Item37>
       <Item38>
-        <Filename Value="frmresizeelements.pp"/>
+        <Filename Value="frmfpreportproperties.lfm"/>
-        <UnitName Value="frmresizeelements"/>
+        <Type Value="LFM"/>
       </Item38>
       <Item39>
-        <Filename Value="regfpdesigner.pp"/>
+        <Filename Value="frmfpreportshapeedit.lfm"/>
-        <UnitName Value="regfpdesigner"/>
+        <Type Value="LFM"/>
       </Item39>
       <Item40>
-        <Filename Value="fpreportdesigner.pp"/>
+        <Filename Value="frmfpreportvariables.lfm"/>
-        <UnitName Value="FPReportDesigner"/>
+        <Type Value="LFM"/>
       </Item40>
     </Files>
     <RequiredPkgs Count="4">

components/fpreport/design/lazfpreportdesign.pas

@@ -8,13 +8,11 @@ unit lazfpreportdesign;
 interface
 
 uses
-  designreportdata, drawruler, fpreportdesignctrl, fpreportdesignobjectlist, 
+  fpreportdesignreportdata, fpreportdrawruler, fpreportdesignctrl, fpreportdesignobjectlist, frafpreportcsvdata, 
-  fracsvdata, fradbfdata, frajsondata, frareportdata, 
+  frafpreportdbfdata, frafpreportjsondata, frafpreportdata, fraReportObjectInspector, frafpreportsqldbdata, 
-  fraReportObjectInspector, frasqldbdata, frmalignelements, 
+  frmfpreportalignelements, frmconfigreportdata, frmfpreportdataconnectioneditor, frmfpreportdesignermain, frmfpreportimageedit, 
-  frmconfigreportdata, frmreportdataconnectioneditor, frmreportdesignermain, 
+  frmfpreportmemoedit, frmfpreportpreviewdata, frmfpreportproperties, frmfpreportshapeedit, frmfpreportvariables, 
-  frmreportimageedit, frmreportmemoedit, frmreportpreviewdata, 
+  frmfprdresizeelements, regfpdesigner, FPReportDesigner, LazarusPackageIntf;
-  frmreportproperties, frmreportshapeedit, frmreportvariables, 
-  frmresizeelements, regfpdesigner, FPReportDesigner, LazarusPackageIntf;
 
 implementation
 

components/fpreport/design/regfpdesigner.pp

@@ -19,7 +19,7 @@ unit regfpdesigner;
 interface
 
 uses
-  Classes, SysUtils, fpreport, ideintf, propedits, ObjInspStrConsts, frmreportmemoedit;
+  Classes, SysUtils, fpreport, ideintf, propedits, ObjInspStrConsts, frmfpreportmemoedit;
 
 Type
 

components/fpreport/design/reportdesign.lpr

@@ -12,19 +12,19 @@ uses
   fpreportdb,
   // These configure various designer factories
   regfpdesigner,
-  frmreportdesignermain,
+  frmfpreportdesignermain,
-  // Various repor data
+  // Various report data
-  fracsvdata,
+  frafpreportcsvdata,
-  fradbfdata,
+  frafpreportdbfdata,
-  frajsondata,
+  frafpreportjsondata,
-  frasqldbdata,
+  frafpreportsqldbdata,
   frmideselectreportdata,
   // Various forms
-  frmreportdataconnectioneditor,
+  frmfpreportdataconnectioneditor,
   frmconfigreportdata,
-  frmreportvariables,
+  frmfpreportvariables,
-  frmreportproperties,
+  frmfpreportproperties,
-  frmreportpreviewdata,
+  frmfpreportpreviewdata,
   cfgfpreportpdfexport,
   cfgfpreportimageexport,
   cfgfpreporthtmlexport,

components/fpreport/design/reportdesignbaseforms.pp

@@ -20,7 +20,7 @@ unit reportdesignbaseforms;
 interface
 
 uses
-  Classes, SysUtils, fpreport, forms, db, fpreportdesignobjectlist, designreportdata;
+  Classes, SysUtils, fpreport, forms, db, fpreportdesignobjectlist, fpreportdesignreportdata;
 
 Type
   { TReportEditorForm }