diff --git a/packages/delphiXE5/heidisql.dpr b/packages/delphiXE5/heidisql.dpr
index 82a751d0..41228fa9 100644
--- a/packages/delphiXE5/heidisql.dpr
+++ b/packages/delphiXE5/heidisql.dpr
@@ -16,7 +16,7 @@ uses
printlist in '..\..\source\printlist.pas' {printlistForm},
copytable in '..\..\source\copytable.pas' {CopyTableForm},
insertfiles in '..\..\source\insertfiles.pas' {frmInsertFiles},
- helpers in '..\..\source\helpers.pas',
+ apphelpers in '..\..\source\apphelpers.pas',
sqlhelp in '..\..\source\sqlhelp.pas' {frmSQLhelp},
mysql_structures in '..\..\source\mysql_structures.pas',
column_selection in '..\..\source\column_selection.pas' {ColumnSelectionForm},
diff --git a/packages/delphiXE5/heidisql.dproj b/packages/delphiXE5/heidisql.dproj
index 0268a547..80dfd6fd 100644
--- a/packages/delphiXE5/heidisql.dproj
+++ b/packages/delphiXE5/heidisql.dproj
@@ -155,7 +155,7 @@
-
+
diff --git a/source/about.pas b/source/about.pas
index 100693a2..0062a493 100644
--- a/source/about.pas
+++ b/source/about.pas
@@ -43,7 +43,7 @@ type
implementation
uses
- main, helpers;
+ main, apphelpers;
{$R *.DFM}
diff --git a/source/helpers.pas b/source/apphelpers.pas
similarity index 97%
rename from source/helpers.pas
rename to source/apphelpers.pas
index 3c6da356..7f2c161b 100644
--- a/source/helpers.pas
+++ b/source/apphelpers.pas
@@ -1,4 +1,4 @@
-unit helpers;
+unit apphelpers;
// -------------------------------------
diff --git a/source/bineditor.pas b/source/bineditor.pas
index 7489d01d..bb0ce7ba 100644
--- a/source/bineditor.pas
+++ b/source/bineditor.pas
@@ -43,7 +43,7 @@ type
implementation
-uses helpers, main;
+uses apphelpers, main;
{$R *.dfm}
diff --git a/source/change_password.pas b/source/change_password.pas
index bdf6bb68..194979b4 100644
--- a/source/change_password.pas
+++ b/source/change_password.pas
@@ -50,7 +50,7 @@ var
implementation
-uses main, helpers;
+uses main, apphelpers;
{$R *.dfm}
diff --git a/source/column_selection.pas b/source/column_selection.pas
index 242e661a..87846d32 100644
--- a/source/column_selection.pas
+++ b/source/column_selection.pas
@@ -4,7 +4,7 @@ interface
uses
Windows, Classes, Controls, Forms, StdCtrls, CheckLst, ExtCtrls, SysUtils,
- helpers, gnugettext, extra_controls;
+ apphelpers, gnugettext, extra_controls;
type
TColumnSelectionForm = class(TFormWithSizeGrip)
diff --git a/source/connections.pas b/source/connections.pas
index 6e9b2043..a3977ce6 100644
--- a/source/connections.pas
+++ b/source/connections.pas
@@ -186,7 +186,7 @@ type
implementation
-uses Main, helpers, grideditlinks;
+uses Main, apphelpers, grideditlinks;
{$I const.inc}
diff --git a/source/copytable.pas b/source/copytable.pas
index bf9dfe3e..28e70c39 100644
--- a/source/copytable.pas
+++ b/source/copytable.pas
@@ -52,7 +52,7 @@ type
implementation
-uses helpers, main;
+uses apphelpers, main;
const
nColumns = 0;
diff --git a/source/createdatabase.pas b/source/createdatabase.pas
index 31b87cd5..f786dbed 100644
--- a/source/createdatabase.pas
+++ b/source/createdatabase.pas
@@ -34,7 +34,7 @@ type
implementation
-uses main, helpers;
+uses main, apphelpers;
{$R *.dfm}
diff --git a/source/data_sorting.pas b/source/data_sorting.pas
index ae6e76ef..12e5c190 100644
--- a/source/data_sorting.pas
+++ b/source/data_sorting.pas
@@ -5,7 +5,7 @@ interface
uses
Windows, SysUtils, Classes, Controls, Forms, StdCtrls, ExtCtrls, ComCtrls, Buttons,
- helpers, gnugettext;
+ apphelpers, gnugettext;
type
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index d2e74c01..f94eb5a6 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -761,7 +761,7 @@ var
implementation
-uses helpers, loginform, change_password;
+uses apphelpers, loginform, change_password;
{ TProcessPipe }
diff --git a/source/editvar.pas b/source/editvar.pas
index 2c98f582..4fda5585 100644
--- a/source/editvar.pas
+++ b/source/editvar.pas
@@ -48,7 +48,7 @@ type
implementation
-uses main, helpers;
+uses main, apphelpers;
{$R *.dfm}
diff --git a/source/event_editor.pas b/source/event_editor.pas
index d0011a16..1061f477 100644
--- a/source/event_editor.pas
+++ b/source/event_editor.pas
@@ -5,7 +5,7 @@ interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, SynEdit, SynMemo, SynRegExpr, ComCtrls, ExtCtrls, WideStrUtils,
- helpers, dbconnection, gnugettext;
+ apphelpers, dbconnection, gnugettext;
type
TFrame = TDBObjectEditor;
diff --git a/source/exportgrid.pas b/source/exportgrid.pas
index 409e6350..8f6099f7 100644
--- a/source/exportgrid.pas
+++ b/source/exportgrid.pas
@@ -91,7 +91,7 @@ type
implementation
-uses main, helpers, dbconnection, mysql_structures;
+uses main, apphelpers, dbconnection, mysql_structures;
{$R *.dfm}
diff --git a/source/grideditlinks.pas b/source/grideditlinks.pas
index ff4cca86..0b87ac43 100644
--- a/source/grideditlinks.pas
+++ b/source/grideditlinks.pas
@@ -7,7 +7,7 @@ interface
uses
Windows, Forms, Graphics, Messages, VirtualTrees, ComCtrls, SysUtils, Classes,
StdCtrls, ExtCtrls, CheckLst, Controls, Types, Dialogs, Menus, Mask, DateUtils, Math,
- dbconnection, mysql_structures, helpers, texteditor, bineditor, gnugettext,
+ dbconnection, mysql_structures, apphelpers, texteditor, bineditor, gnugettext,
StrUtils, System.UITypes, SynRegExpr;
type
diff --git a/source/insertfiles.pas b/source/insertfiles.pas
index aad8f388..65e2219b 100644
--- a/source/insertfiles.pas
+++ b/source/insertfiles.pas
@@ -5,7 +5,7 @@ interface
uses
Windows, Messages, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls,
ShellApi, Math, Graphics, ComCtrls, ToolWin, extra_controls,
- dbconnection, mysql_structures, VirtualTrees, grideditlinks, SynRegExpr, gnugettext, helpers;
+ dbconnection, mysql_structures, VirtualTrees, grideditlinks, SynRegExpr, gnugettext, apphelpers;
type
TColInfo = class
diff --git a/source/loaddata.pas b/source/loaddata.pas
index b7ec015f..fc694bc0 100644
--- a/source/loaddata.pas
+++ b/source/loaddata.pas
@@ -84,7 +84,7 @@ type
implementation
-uses Main, helpers;
+uses Main, apphelpers;
{$R *.DFM}
diff --git a/source/loginform.pas b/source/loginform.pas
index 3a50ba01..eb4f2b51 100644
--- a/source/loginform.pas
+++ b/source/loginform.pas
@@ -27,7 +27,7 @@ type
implementation
-uses helpers, main;
+uses apphelpers, main;
{$R *.dfm}
{$I const.inc}
diff --git a/source/main.pas b/source/main.pas
index 3c150cef..cc88fec5 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -14,7 +14,7 @@ uses
ShlObj, SynEditMiscClasses, SynEditSearch, SynEditRegexSearch, SynCompletionProposal, SynEditHighlighter,
SynHighlighterSQL, Tabs, SynUnicode, SynRegExpr, ExtActns, IOUtils, Types, Themes, ComObj,
CommCtrl, Contnrs, Generics.Collections, Generics.Defaults, SynEditExport, SynExportHTML, SynExportRTF, Math, ExtDlgs, Registry, AppEvnts,
- routine_editor, trigger_editor, event_editor, options, EditVar, helpers, createdatabase, table_editor,
+ routine_editor, trigger_editor, event_editor, options, EditVar, apphelpers, createdatabase, table_editor,
TableTools, View, Usermanager, SelectDBObject, connections, sqlhelp, dbconnection,
insertfiles, searchreplace, loaddata, copytable, VTHeaderPopup, Cromis.DirectoryWatch, SyncDB, gnugettext,
JumpList, System.Actions, System.UITypes, pngimage, Vcl.FormsFix;
diff --git a/source/mysql_structures.pas b/source/mysql_structures.pas
index ca61f969..fb62174d 100644
--- a/source/mysql_structures.pas
+++ b/source/mysql_structures.pas
@@ -7456,7 +7456,7 @@ var
implementation
-uses helpers;
+uses apphelpers;
function GetFunctionCategories: TStringList;
var
diff --git a/source/options.pas b/source/options.pas
index d53f3a9d..3be5100d 100644
--- a/source/options.pas
+++ b/source/options.pas
@@ -195,7 +195,7 @@ function EnumFixedProc(lpelf: PEnumLogFont; lpntm: PNewTextMetric; FontType: Int
implementation
-uses main, helpers;
+uses main, apphelpers;
{$R *.DFM}
diff --git a/source/printlist.pas b/source/printlist.pas
index ca05ed78..d032eb08 100644
--- a/source/printlist.pas
+++ b/source/printlist.pas
@@ -34,7 +34,7 @@ type
implementation
-uses main, helpers, table_editor, dbconnection;
+uses main, apphelpers, table_editor, dbconnection;
{$R *.DFM}
diff --git a/source/routine_editor.pas b/source/routine_editor.pas
index ce62b946..61b3e577 100644
--- a/source/routine_editor.pas
+++ b/source/routine_editor.pas
@@ -5,7 +5,7 @@ interface
uses
Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, SynEdit, SynMemo, StdCtrls,
ComCtrls, ToolWin, VirtualTrees, SynRegExpr,
- dbconnection, helpers, gnugettext, Vcl.Menus, Vcl.ExtCtrls;
+ dbconnection, apphelpers, gnugettext, Vcl.Menus, Vcl.ExtCtrls;
type
TFrame = TDBObjectEditor;
diff --git a/source/searchreplace.pas b/source/searchreplace.pas
index e38bae99..954a770d 100644
--- a/source/searchreplace.pas
+++ b/source/searchreplace.pas
@@ -54,7 +54,7 @@ implementation
{$R *.dfm}
-uses helpers, main;
+uses apphelpers, main;
procedure TfrmSearchReplace.FormCreate(Sender: TObject);
diff --git a/source/selectdbobject.pas b/source/selectdbobject.pas
index 44e9f5f3..57479c35 100644
--- a/source/selectdbobject.pas
+++ b/source/selectdbobject.pas
@@ -44,7 +44,7 @@ function SelectDBObjects: TDBObjectList;
implementation
-uses main, helpers;
+uses main, apphelpers;
{$R *.dfm}
diff --git a/source/sqlhelp.pas b/source/sqlhelp.pas
index d842f442..2bf326a3 100644
--- a/source/sqlhelp.pas
+++ b/source/sqlhelp.pas
@@ -71,7 +71,7 @@ type
implementation
-uses helpers, main;
+uses apphelpers, main;
{$I const.inc}
diff --git a/source/syncdb.pas b/source/syncdb.pas
index bee15991..0ce53c0f 100644
--- a/source/syncdb.pas
+++ b/source/syncdb.pas
@@ -75,7 +75,7 @@ type
implementation
-uses main, helpers;
+uses main, apphelpers;
{$R *.dfm}
diff --git a/source/table_editor.pas b/source/table_editor.pas
index f772ecbc..74cade14 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -6,7 +6,7 @@ uses
Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls,
ComCtrls, ToolWin, VirtualTrees, SynRegExpr, ActiveX, ExtCtrls, SynEdit,
SynMemo, Menus, Clipbrd, Math, System.UITypes,
- grideditlinks, mysql_structures, dbconnection, helpers, gnugettext;
+ grideditlinks, mysql_structures, dbconnection, apphelpers, gnugettext;
type
TFrame = TDBObjectEditor;
diff --git a/source/tabletools.pas b/source/tabletools.pas
index ea48cacd..5908a4ea 100644
--- a/source/tabletools.pas
+++ b/source/tabletools.pas
@@ -11,7 +11,7 @@ interface
uses
Windows, SysUtils, Classes, Controls, Forms, StdCtrls, ComCtrls, Buttons, Dialogs, StdActns,
VirtualTrees, ExtCtrls, Graphics, SynRegExpr, Math, Generics.Collections, extra_controls,
- dbconnection, helpers, Menus, gnugettext, DateUtils, System.Zip, System.UITypes, StrUtils;
+ dbconnection, apphelpers, Menus, gnugettext, DateUtils, System.Zip, System.UITypes, StrUtils;
type
TToolMode = (tmMaintenance, tmFind, tmSQLExport, tmBulkTableEdit);
diff --git a/source/texteditor.pas b/source/texteditor.pas
index bb801213..8f7e550a 100644
--- a/source/texteditor.pas
+++ b/source/texteditor.pas
@@ -5,7 +5,7 @@ interface
uses
Windows, Classes, Graphics, Forms, Controls, StdCtrls, VirtualTrees,
ComCtrls, ToolWin, Dialogs, SysUtils, Menus, ExtDlgs,
- helpers, gnugettext, ActnList, StdActns, extra_controls, System.Actions,
+ apphelpers, gnugettext, ActnList, StdActns, extra_controls, System.Actions,
Vcl.ExtCtrls;
{$I const.inc}
diff --git a/source/trigger_editor.pas b/source/trigger_editor.pas
index eb3807e4..59b74c0c 100644
--- a/source/trigger_editor.pas
+++ b/source/trigger_editor.pas
@@ -5,7 +5,7 @@ interface
uses
Windows, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, SynEdit, SynMemo,
SynCompletionProposal, SynRegExpr,
- dbconnection, mysql_structures, helpers, gnugettext, ComCtrls;
+ dbconnection, mysql_structures, apphelpers, gnugettext, ComCtrls;
type
TFrame = TDBObjectEditor;
diff --git a/source/updatecheck.pas b/source/updatecheck.pas
index 632f9a86..e7176c43 100644
--- a/source/updatecheck.pas
+++ b/source/updatecheck.pas
@@ -4,7 +4,7 @@ interface
uses
Windows, Messages, SysUtils, Classes, Forms, StdCtrls, IniFiles, Controls, Graphics,
- helpers, gnugettext, ExtCtrls;
+ apphelpers, gnugettext, ExtCtrls;
type
TfrmUpdateCheck = class(TForm)
diff --git a/source/usermanager.pas b/source/usermanager.pas
index bb3787c0..e3006898 100644
--- a/source/usermanager.pas
+++ b/source/usermanager.pas
@@ -6,7 +6,7 @@ interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ComCtrls, StdCtrls,
ExtCtrls, ToolWin, ClipBrd, Generics.Collections, Generics.Defaults, SynRegExpr, extra_controls,
- dbconnection, helpers, VirtualTrees, Menus, gnugettext;
+ dbconnection, apphelpers, VirtualTrees, Menus, gnugettext;
{$I const.inc}
diff --git a/source/view.pas b/source/view.pas
index 7be7379b..d02dd7f2 100644
--- a/source/view.pas
+++ b/source/view.pas
@@ -5,7 +5,7 @@ interface
uses
Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, SynEdit, SynMemo,
ExtCtrls,
- dbconnection, mysql_structures, helpers, gnugettext;
+ dbconnection, mysql_structures, apphelpers, gnugettext;
type
TFrame = TDBObjectEditor;