From 0d9de512cda77ce0ddbdb11c84c8811e8d3c5698 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Mon, 26 Dec 2022 17:59:19 +0100 Subject: [PATCH] Remove unit scopes from project settings, prefer fully qualified unit names in uses clauses. Enhance readability and compiler performance. --- packages/Delphi11.2/heidisql.dpr | 8 ++++---- packages/Delphi11.2/heidisql.dproj | 3 --- source/about.pas | 4 ++-- source/apphelpers.pas | 24 ++++++++++++------------ source/bineditor.pas | 4 ++-- source/change_password.pas | 2 +- source/column_selection.pas | 2 +- source/connections.pas | 6 +++--- source/copytable.pas | 4 ++-- source/createdatabase.pas | 2 +- source/data_sorting.pas | 2 +- source/dbconnection.pas | 16 ++++++++-------- source/dbstructures.pas | 12 ++++++------ source/editvar.pas | 4 ++-- source/event_editor.pas | 4 ++-- source/exportgrid.pas | 4 ++-- source/extra_controls.pas | 4 ++-- source/gnugettext.pas | 18 +++++++++--------- source/grideditlinks.pas | 6 +++--- source/insertfiles.pas | 4 ++-- source/loaddata.pas | 4 ++-- source/loginform.pas | 4 ++-- source/main.pas | 22 +++++++++++----------- source/preferences.pas | 6 +++--- source/printlist.pas | 2 +- source/routine_editor.pas | 4 ++-- source/searchreplace.pas | 4 ++-- source/selectdbobject.pas | 2 +- source/sqlhelp.pas | 6 +++--- source/syncdb.pas | 4 ++-- source/table_editor.pas | 8 ++++---- source/tabletools.pas | 8 ++++---- source/texteditor.pas | 8 ++++---- source/trigger_editor.pas | 4 ++-- source/updatecheck.pas | 4 ++-- source/usermanager.pas | 6 +++--- source/view.pas | 4 ++-- 37 files changed, 115 insertions(+), 118 deletions(-) diff --git a/packages/Delphi11.2/heidisql.dpr b/packages/Delphi11.2/heidisql.dpr index a37910c4..9f9d5c07 100644 --- a/packages/Delphi11.2/heidisql.dpr +++ b/packages/Delphi11.2/heidisql.dpr @@ -2,10 +2,10 @@ program heidisql; uses madExcept, - Forms, - SysUtils, - Dialogs, - Windows, + Vcl.Forms, + System.SysUtils, + Vcl.Dialogs, + Winapi.Windows, main in '..\..\source\main.pas' {MainForm}, about in '..\..\source\about.pas' {AboutBox}, connections in '..\..\source\connections.pas' {connform}, diff --git a/packages/Delphi11.2/heidisql.dproj b/packages/Delphi11.2/heidisql.dproj index 20f13685..83a736c7 100644 --- a/packages/Delphi11.2/heidisql.dproj +++ b/packages/Delphi11.2/heidisql.dproj @@ -66,7 +66,6 @@ $(BDS)\bin\default_app.manifest false false - Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;FMX.Canvas.GPU;System.Win;Data.Win;$(DCC_Namespace) false 00400000 CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=;CFBundleDisplayName=;UIDeviceFamily=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;UISupportedInterfaceOrientations=;CFBundleExecutable=;CFBundleResourceSpecification=;LSRequiresIPhoneOS=;CFBundleInfoDictionaryVersion=;CFBundleDevelopmentRegion=;package=;label=;versionCode=;versionName=;persistent=;restoreAnyVersion=;installLocation=;largeHeap=;theme= @@ -77,14 +76,12 @@ heidisql - Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) true CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png - Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) true $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png diff --git a/source/about.pas b/source/about.pas index 70601826..72c12e21 100644 --- a/source/about.pas +++ b/source/about.pas @@ -7,8 +7,8 @@ unit About; interface uses - Windows, Classes, Graphics, Forms, Controls, StdCtrls, ExtCtrls, SysUtils, ComCtrls, pngimage, gnugettext, - Dialogs, SynRegExpr, Vcl.Menus, ClipBrd, extra_controls, generic_types; + Winapi.Windows, System.Classes, Vcl.Graphics, Vcl.Forms, Vcl.Controls, Vcl.StdCtrls, Vcl.ExtCtrls, System.SysUtils, Vcl.ComCtrls, Vcl.Imaging.pngimage, gnugettext, + Vcl.Dialogs, SynRegExpr, Vcl.Menus, Vcl.ClipBrd, extra_controls, generic_types; type TAboutBox = class(TExtForm) diff --git a/source/apphelpers.pas b/source/apphelpers.pas index e1762dec..656dfb87 100644 --- a/source/apphelpers.pas +++ b/source/apphelpers.pas @@ -9,12 +9,12 @@ unit apphelpers; interface uses - Classes, SysUtils, Graphics, GraphUtil, ClipBrd, Dialogs, Forms, Controls, ShellApi, - Windows, ShlObj, ActiveX, VirtualTrees, VirtualTrees.Types, SynRegExpr, Messages, Math, - Registry, DateUtils, Generics.Collections, System.Contnrs, StrUtils, AnsiStrings, TlHelp32, Types, - dbconnection, dbstructures, dbstructures.mysql, SynMemo, Menus, WinInet, gnugettext, Themes, - Character, ImgList, System.UITypes, ActnList, WinSock, IOUtils, StdCtrls, ComCtrls, - CommCtrl, Winapi.KnownFolders, SynUnicode; + System.Classes, System.SysUtils, Vcl.Graphics, Vcl.GraphUtil, Vcl.ClipBrd, Vcl.Dialogs, Vcl.Forms, Vcl.Controls, Winapi.ShellApi, + Winapi.Windows, Winapi.ShlObj, Winapi.ActiveX, VirtualTrees, VirtualTrees.Types, SynRegExpr, Winapi.Messages, System.Math, + System.Win.Registry, System.DateUtils, Generics.Collections, System.Contnrs, System.StrUtils, System.AnsiStrings, Winapi.TlHelp32, System.Types, + dbconnection, dbstructures, dbstructures.mysql, SynMemo, Vcl.Menus, Winapi.WinInet, gnugettext, Vcl.Themes, + System.Character, Vcl.ImgList, System.UITypes, Vcl.ActnList, Winapi.WinSock, System.IOUtils, Vcl.StdCtrls, Vcl.ComCtrls, + Winapi.CommCtrl, Winapi.KnownFolders, SynUnicode; type @@ -1335,9 +1335,9 @@ begin 'StartFragment:000089' + CRLF + 'EndFragment:같같같' + CRLF + HTMLContent + CRLF; - HTMLContent := AnsiStrings.StringReplace( + HTMLContent := System.AnsiStrings.StringReplace( HTMLContent, '같같같', - AnsiStrings.Format('%.6d', [Length(HTMLContent)]), + System.AnsiStrings.Format('%.6d', [Length(HTMLContent)]), [rfReplaceAll]); end; ClpLen := Length(HTMLContent) + 1; @@ -1951,7 +1951,7 @@ function ParamStrToBlob(out cbData: DWORD): Pointer; var cmd: String; begin - cmd := Windows.GetCommandLine; + cmd := GetCommandLine; cbData := Length(cmd)*2 + 3; Result := PChar(cmd); end; @@ -2353,7 +2353,7 @@ var cap := _(BtnCaption); for i:=1 to Length(cap) do begin // Auto apply hotkey - if (Pos(LowerCase(cap[i]), Hotkeys) = 0) and Character.TCharacter.IsLetter(cap[i]) then begin + if (Pos(LowerCase(cap[i]), Hotkeys) = 0) and TCharacter.IsLetter(cap[i]) then begin Hotkeys := Hotkeys + LowerCase(cap[i]); Insert('&', cap, i); break; @@ -3425,12 +3425,12 @@ begin UrlHandle := InternetOpenURL(NetHandle, PChar(FURL), nil, 0, INTERNET_FLAG_RELOAD, 0); if (not Assigned(UrlHandle)) and FURL.StartsWith('https:', true) then begin // Try again without SSL. See issue #65 and #1209 - MainForm.LogSQL(f_('Could not open %s (%s) - trying again without SSL...', [FURL, SysErrorMessage(Windows.GetLastError)]), lcError); + MainForm.LogSQL(f_('Could not open %s (%s) - trying again without SSL...', [FURL, SysErrorMessage(GetLastError)]), lcError); FURL := ReplaceRegExpr('^https:', FURL, 'http:'); UrlHandle := InternetOpenURL(NetHandle, PChar(FURL), nil, 0, INTERNET_FLAG_RELOAD, 0); end; if not Assigned(UrlHandle) then begin - raise Exception.CreateFmt(_('Could not open %s (%s)'), [FURL, SysErrorMessage(Windows.GetLastError)]); + raise Exception.CreateFmt(_('Could not open %s (%s)'), [FURL, SysErrorMessage(GetLastError)]); end; // Detect content length diff --git a/source/bineditor.pas b/source/bineditor.pas index ff6dfac5..74872ff0 100644 --- a/source/bineditor.pas +++ b/source/bineditor.pas @@ -3,8 +3,8 @@ unit bineditor; interface uses - Windows, Classes, Graphics, Forms, Controls, StdCtrls, VirtualTrees, - ComCtrls, ToolWin, Dialogs, SysUtils, gnugettext, extra_controls; + Winapi.Windows, System.Classes, Vcl.Graphics, Vcl.Forms, Vcl.Controls, Vcl.StdCtrls, VirtualTrees, + Vcl.ComCtrls, Vcl.ToolWin, Vcl.Dialogs, System.SysUtils, gnugettext, extra_controls; {$I const.inc} diff --git a/source/change_password.pas b/source/change_password.pas index 49b79750..9ae8e411 100644 --- a/source/change_password.pas +++ b/source/change_password.pas @@ -5,7 +5,7 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, extra_controls, gnugettext, - Vcl.Menus, Clipbrd, Vcl.ComCtrls, System.Math; + Vcl.Menus, Vcl.Clipbrd, Vcl.ComCtrls, System.Math; type TfrmPasswordChange = class(TExtForm) diff --git a/source/column_selection.pas b/source/column_selection.pas index e2d47fa6..a287936a 100644 --- a/source/column_selection.pas +++ b/source/column_selection.pas @@ -3,7 +3,7 @@ unit column_selection; interface uses - Windows, Classes, Controls, Forms, StdCtrls, CheckLst, ExtCtrls, SysUtils, + Winapi.Windows, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.StdCtrls, Vcl.CheckLst, Vcl.ExtCtrls, System.SysUtils, apphelpers, gnugettext, extra_controls; type diff --git a/source/connections.pas b/source/connections.pas index 9530bcf7..a79fbfb7 100644 --- a/source/connections.pas +++ b/source/connections.pas @@ -9,9 +9,9 @@ unit connections; interface uses - Windows, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls, - VirtualTrees, Menus, Graphics, Generics.Collections, ActiveX, extra_controls, Messages, - dbconnection, gnugettext, SynRegExpr, System.Types, Vcl.GraphUtil, ADODB, StrUtils, + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls, + VirtualTrees, Vcl.Menus, Vcl.Graphics, Generics.Collections, Winapi.ActiveX, extra_controls, Winapi.Messages, + dbconnection, gnugettext, SynRegExpr, System.Types, Vcl.GraphUtil, Data.Win.ADODB, System.StrUtils, System.Math, System.Actions, System.IOUtils, Vcl.ActnList, Vcl.StdActns; type diff --git a/source/copytable.pas b/source/copytable.pas index c2ddf1ed..ccf4e3b8 100644 --- a/source/copytable.pas +++ b/source/copytable.pas @@ -4,8 +4,8 @@ unit copytable; interface uses - Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, extra_controls, - dbconnection, dbstructures, dbstructures.mysql, VirtualTrees, SynEdit, SynMemo, Menus, gnugettext; + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, extra_controls, + dbconnection, dbstructures, dbstructures.mysql, VirtualTrees, SynEdit, SynMemo, Vcl.Menus, gnugettext; type TCopyTableForm = class(TExtForm) diff --git a/source/createdatabase.pas b/source/createdatabase.pas index bd0cd22e..14107bd0 100644 --- a/source/createdatabase.pas +++ b/source/createdatabase.pas @@ -3,7 +3,7 @@ unit createdatabase; interface uses - Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, SynEdit, SynMemo, + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, SynEdit, SynMemo, dbconnection, dbstructures, gnugettext, SynRegExpr, extra_controls; type diff --git a/source/data_sorting.pas b/source/data_sorting.pas index 7cc14898..f6e340cb 100644 --- a/source/data_sorting.pas +++ b/source/data_sorting.pas @@ -3,7 +3,7 @@ unit data_sorting; interface uses - Windows, SysUtils, Classes, Controls, Forms, StdCtrls, ExtCtrls, ComCtrls, Buttons, + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls, Vcl.Buttons, Vcl.Graphics, apphelpers, gnugettext, extra_controls; diff --git a/source/dbconnection.pas b/source/dbconnection.pas index 565150ed..444fc486 100644 --- a/source/dbconnection.pas +++ b/source/dbconnection.pas @@ -3,9 +3,9 @@ unit dbconnection; interface uses - Classes, SysUtils, Windows, Generics.Collections, Generics.Defaults, - DateUtils, Types, Math, Dialogs, ADODB, DB, DBCommon, ComObj, Graphics, ExtCtrls, StrUtils, - AnsiStrings, Controls, Forms, System.IOUtils, System.IniFiles, + System.Classes, System.SysUtils, Winapi.Windows, Generics.Collections, Generics.Defaults, + System.DateUtils, System.Types, System.Math, Vcl.Dialogs, Data.Win.ADODB, Data.DB, Data.DBCommon, System.Win.ComObj, Vcl.Graphics, Vcl.ExtCtrls, System.StrUtils, + System.AnsiStrings, Vcl.Controls, Vcl.Forms, System.IOUtils, System.IniFiles, System.Variants, SynRegExpr, gnugettext, generic_types, dbstructures, dbstructures.mysql, dbstructures.mssql, dbstructures.postgresql, dbstructures.sqlite, dbstructures.interbase, FireDAC.Stan.Intf, FireDAC.Stan.Option, @@ -1284,14 +1284,14 @@ var PText: PAnsiChar; begin Result := ''; - PText := AnsiStrings.AnsiStrAlloc(cMaxLength); + PText := AnsiStrAlloc(cMaxLength); while Text <> '' do begin - AnsiStrings.StrPCopy(PText, copy(Text, 1, cMaxLength-1)); + System.AnsiStrings.StrPCopy(PText, copy(Text, 1, cMaxLength-1)); OemToAnsi(PText, PText); - Result := Result + AnsiStrings.StrPas(PText); + Result := Result + System.AnsiStrings.StrPas(PText); Delete(Text, 1, cMaxLength-1); end; - AnsiStrings.StrDispose(PText); + System.AnsiStrings.StrDispose(PText); end; @@ -4323,7 +4323,7 @@ begin if FThreadId = 0 then begin Ping(False); if FActive then // We return the application process id, as there is no connection pid in SQLite - FThreadID := Windows.GetCurrentProcessId; + FThreadID := GetCurrentProcessId; end; Result := FThreadID; end; diff --git a/source/dbstructures.pas b/source/dbstructures.pas index 92c0eeb4..fb031e32 100644 --- a/source/dbstructures.pas +++ b/source/dbstructures.pas @@ -6,7 +6,7 @@ interface uses - gnugettext, Graphics, Windows, SysUtils; + gnugettext, Vcl.Graphics, Winapi.Windows, System.SysUtils; type @@ -168,8 +168,8 @@ begin msg := f_('Library %s could not be loaded. Please select a different one.', [ExtractFileName(FDllFile)] ); - if Windows.GetLastError <> 0 then begin - msg := msg + sLineBreak + sLineBreak + f_('Internal error %d: %s', [Windows.GetLastError, SysErrorMessage(Windows.GetLastError)]); + if GetLastError <> 0 then begin + msg := msg + sLineBreak + sLineBreak + f_('Internal error %d: %s', [GetLastError, SysErrorMessage(GetLastError)]); end; if (DefaultDll <> '') and (ExtractFileName(FDllFile) <> DefaultDll) then begin ErrorHint := f_('You could try the default library %s in your session settings. (Current: %s)', @@ -178,7 +178,7 @@ begin end else begin ErrorHint := ''; end; - Raise EDbError.Create(msg, Windows.GetLastError, ErrorHint); + Raise EDbError.Create(msg, GetLastError, ErrorHint); end; // Dll was loaded, now initialize required procedures @@ -207,8 +207,8 @@ begin msg := f_('Library error in %s: Could not find procedure address for "%s"', [ExtractFileName(FDllFile), Name] ); - if Windows.GetLastError <> 0 then - msg := msg + sLineBreak + sLineBreak + f_('Internal error %d: %s', [Windows.GetLastError, SysErrorMessage(Windows.GetLastError)]); + if GetLastError <> 0 then + msg := msg + sLineBreak + sLineBreak + f_('Internal error %d: %s', [GetLastError, SysErrorMessage(GetLastError)]); Raise EDbError.Create(msg, LIB_PROC_ERROR); end; end; diff --git a/source/editvar.pas b/source/editvar.pas index 519d5e1c..d4c6b930 100644 --- a/source/editvar.pas +++ b/source/editvar.pas @@ -3,8 +3,8 @@ unit editvar; interface uses - Windows, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, - dbconnection, dbstructures, dbstructures.mysql, ComCtrls, gnugettext, SynRegExpr, extra_controls; + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, + dbconnection, dbstructures, dbstructures.mysql, Vcl.ComCtrls, gnugettext, SynRegExpr, extra_controls; type TVarType = (vtString, vtNumeric, vtBoolean, vtEnum); diff --git a/source/event_editor.pas b/source/event_editor.pas index 7087a60a..1c669324 100644 --- a/source/event_editor.pas +++ b/source/event_editor.pas @@ -3,8 +3,8 @@ unit event_editor; interface uses - Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, - Dialogs, StdCtrls, SynEdit, SynMemo, SynRegExpr, ComCtrls, ExtCtrls, WideStrUtils, + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, + Vcl.Dialogs, Vcl.StdCtrls, SynEdit, SynMemo, SynRegExpr, Vcl.ComCtrls, Vcl.ExtCtrls, System.WideStrUtils, apphelpers, dbconnection, dbstructures, gnugettext; type diff --git a/source/exportgrid.pas b/source/exportgrid.pas index e31b0081..78ab9158 100644 --- a/source/exportgrid.pas +++ b/source/exportgrid.pas @@ -3,8 +3,8 @@ unit exportgrid; interface uses - Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, StdCtrls, ExtCtrls, Menus, ComCtrls, VirtualTrees, SynExportHTML, gnugettext, ActnList, + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, + Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.Menus, Vcl.ComCtrls, VirtualTrees, SynExportHTML, gnugettext, Vcl.ActnList, extra_controls, dbstructures, SynRegExpr, System.StrUtils, System.IOUtils; type diff --git a/source/extra_controls.pas b/source/extra_controls.pas index 45e2f64e..c3cd7b44 100644 --- a/source/extra_controls.pas +++ b/source/extra_controls.pas @@ -3,9 +3,9 @@ unit extra_controls; interface uses - Classes, SysUtils, Forms, Windows, Messages, System.Types, StdCtrls, Clipbrd, + System.Classes, System.SysUtils, Vcl.Forms, Winapi.Windows, Winapi.Messages, System.Types, Vcl.StdCtrls, Vcl.Clipbrd, SizeGrip, apphelpers, Vcl.Graphics, Vcl.Dialogs, gnugettext, Vcl.ImgList, Vcl.ComCtrls, - ShLwApi, Vcl.ExtCtrls, VirtualTrees, VirtualTrees.Types, SynRegExpr, Vcl.Controls, Winapi.ShlObj; + Winapi.ShLwApi, Vcl.ExtCtrls, VirtualTrees, VirtualTrees.Types, SynRegExpr, Vcl.Controls, Winapi.ShlObj; type // Form with a sizegrip in the lower right corner, without the need for a statusbar diff --git a/source/gnugettext.pas b/source/gnugettext.pas index 85866d31..06d95c10 100644 --- a/source/gnugettext.pas +++ b/source/gnugettext.pas @@ -208,7 +208,7 @@ interface uses {$ifdef MSWINDOWS} - Windows, + Winapi.Windows, {$else} Libc, {$ifdef FPC} @@ -219,9 +219,9 @@ uses System.AnsiStrings, {$ENDIF dx_midstr_in_AnsiStrings} {$IFDEF dx_has_WideStrings} - WideStrings, + System.WideStrings, {$ENDIF dx_has_WideStrings} - Types, Classes, StrUtils, SysUtils, TypInfo; + System.Types, System.Classes, System.StrUtils, System.SysUtils, System.TypInfo; (*****************************************************************************) (* *) @@ -807,10 +807,10 @@ var begin Result := ''; SetLength(W,1); - Len := Windows.GetEnvironmentVariableW(PWideChar(Name), PWideChar(W), 1); + Len := Winapi.Windows.GetEnvironmentVariableW(PWideChar(Name), PWideChar(W), 1); if Len > 0 then begin SetLength(Result, Len - 1); - Windows.GetEnvironmentVariableW(PWideChar(Name), PWideChar(Result), Len); + Winapi.Windows.GetEnvironmentVariableW(PWideChar(Name), PWideChar(Result), Len); end; end; @@ -1370,7 +1370,7 @@ var begin SetLength (Result,2000); errcode:=GetLastError(); - Windows.FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM,nil,errcode,0,PWideChar(Result),2000,nil); + Winapi.Windows.FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM,nil,errcode,0,PWideChar(Result),2000,nil); Result:=PWideChar(Result); end; {$endif} @@ -3399,7 +3399,7 @@ begin SetLength (filename8bit, offset-fs.position); fs.ReadBuffer (filename8bit[1], offset-fs.position); filename:=trim(utf8decode(filename8bit)); - if PreferExternal and sysutils.fileexists(basedirectory+filename) then begin + if PreferExternal and System.sysutils.fileexists(basedirectory+filename) then begin // Disregard the internal version and use the external version instead FreeAndNil (fi); end else @@ -4390,8 +4390,8 @@ initialization {$else} HookLoadResString:=THook.Create (@system.LoadResString, @LoadResStringA); {$endif} - HookLoadStr:=THook.Create (@sysutils.LoadStr, @SysUtilsLoadStr); - HookFmtLoadStr:=THook.Create (@sysutils.FmtLoadStr, @SysUtilsFmtLoadStr); + HookLoadStr:=THook.Create (@System.sysutils.LoadStr, @SysUtilsLoadStr); + HookFmtLoadStr:=THook.Create (@System.sysutils.FmtLoadStr, @SysUtilsFmtLoadStr); {$ifdef dx_German_Delphi_fix} // Create hook for Vcl.Menus.ShortCutToText to translate shortcut strings. {$IFDEF dx_has_dotted_unitnames} diff --git a/source/grideditlinks.pas b/source/grideditlinks.pas index 23597fe8..ba4744b9 100644 --- a/source/grideditlinks.pas +++ b/source/grideditlinks.pas @@ -5,10 +5,10 @@ unit grideditlinks; interface uses - Windows, Forms, Graphics, Messages, VirtualTrees, VirtualTrees.Types, ComCtrls, SysUtils, Classes, - StdCtrls, ExtCtrls, CheckLst, Controls, Types, Dialogs, Menus, Mask, DateUtils, Math, + Winapi.Windows, Vcl.Forms, Vcl.Graphics, Winapi.Messages, VirtualTrees, VirtualTrees.Types, Vcl.ComCtrls, System.SysUtils, System.Classes, + Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.CheckLst, Vcl.Controls, System.Types, Vcl.Dialogs, Vcl.Menus, Vcl.Mask, System.DateUtils, System.Math, dbconnection, dbstructures, apphelpers, texteditor, bineditor, gnugettext, - StrUtils, System.UITypes, SynRegExpr, Vcl.Themes, extra_controls; + System.StrUtils, System.UITypes, SynRegExpr, Vcl.Themes, extra_controls; type // Radio buttons and checkboxes which do not pass key to their parent control diff --git a/source/insertfiles.pas b/source/insertfiles.pas index 2a8aaa96..9571be82 100644 --- a/source/insertfiles.pas +++ b/source/insertfiles.pas @@ -3,8 +3,8 @@ unit insertfiles; interface uses - Windows, Messages, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, - ShellApi, Math, Graphics, ComCtrls, ToolWin, extra_controls, + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, + Winapi.ShellApi, System.Math, Vcl.Graphics, Vcl.ComCtrls, Vcl.ToolWin, extra_controls, dbconnection, dbstructures, VirtualTrees, grideditlinks, SynRegExpr, gnugettext, apphelpers; type diff --git a/source/loaddata.pas b/source/loaddata.pas index 3c700539..846924e6 100644 --- a/source/loaddata.pas +++ b/source/loaddata.pas @@ -9,8 +9,8 @@ unit loaddata; interface uses - Windows, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, ComCtrls, CheckLst, - SynRegExpr, Buttons, ExtCtrls, ToolWin, ExtDlgs, Math, extra_controls, + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ComCtrls, Vcl.CheckLst, + SynRegExpr, Vcl.Buttons, Vcl.ExtCtrls, Vcl.ToolWin, Vcl.ExtDlgs, System.Math, extra_controls, dbconnection, dbstructures, gnugettext; type diff --git a/source/loginform.pas b/source/loginform.pas index 079a22f2..76e79549 100644 --- a/source/loginform.pas +++ b/source/loginform.pas @@ -3,8 +3,8 @@ unit loginform; interface uses - Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, StdCtrls, ExtCtrls, gnugettext, System.UITypes, extra_controls; + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, + Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, gnugettext, System.UITypes, extra_controls; type TfrmLogin = class(TExtForm) diff --git a/source/main.pas b/source/main.pas index 9e33c1b3..58e351ac 100644 --- a/source/main.pas +++ b/source/main.pas @@ -8,17 +8,17 @@ interface uses - Windows, SysUtils, Classes, Graphics, GraphUtil, Forms, Controls, Menus, StdCtrls, Dialogs, Buttons, - Messages, ExtCtrls, ComCtrls, StdActns, ActnList, ImgList, ToolWin, Clipbrd, SynMemo, StrUtils, - SynEdit, SynEditTypes, SynEditKeyCmds, DateUtils, - 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, + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.GraphUtil, Vcl.Forms, Vcl.Controls, Vcl.Menus, Vcl.StdCtrls, Vcl.Dialogs, Vcl.Buttons, + Winapi.Messages, Vcl.ExtCtrls, Vcl.ComCtrls, Vcl.StdActns, Vcl.ActnList, Vcl.ImgList, Vcl.ToolWin, Vcl.Clipbrd, SynMemo, System.StrUtils, + SynEdit, SynEditTypes, SynEditKeyCmds, System.DateUtils, + Winapi.ShlObj, SynEditMiscClasses, SynEditSearch, SynEditRegexSearch, SynCompletionProposal, SynEditHighlighter, + SynHighlighterSQL, Vcl.Tabs, SynUnicode, SynRegExpr, Vcl.ExtActns, System.IOUtils, System.Types, Vcl.Themes, System.Win.ComObj, + Winapi.CommCtrl, System.Contnrs, Generics.Collections, Generics.Defaults, SynEditExport, SynExportHTML, SynExportRTF, System.Math, Vcl.ExtDlgs, System.Win.Registry, Vcl.AppEvnts, routine_editor, trigger_editor, event_editor, preferences, EditVar, apphelpers, createdatabase, table_editor, TableTools, View, Usermanager, SelectDBObject, connections, sqlhelp, dbconnection, insertfiles, searchreplace, loaddata, copytable, csv_detector, Cromis.DirectoryWatch, SyncDB, gnugettext, VirtualTrees, VirtualTrees.Header, VirtualTrees.HeaderPopup, VirtualTrees.Utils, VirtualTrees.Types, - JumpList, System.Actions, System.UITypes, pngimage, + JumpList, System.Actions, System.UITypes, Vcl.Imaging.pngimage, System.ImageList, Vcl.Styles.UxTheme, Vcl.Styles.Utils.Menus, Vcl.Styles.Utils.Forms, Vcl.VirtualImageList, Vcl.BaseImageCollection, Vcl.ImageCollection, System.IniFiles, extra_controls, SynEditCodeFolding, SynEditStrConst, texteditor, System.Character, generic_types; @@ -1392,7 +1392,7 @@ implementation uses About, printlist, dbstructures, dbstructures.mysql, UpdateCheck, - column_selection, data_sorting, grideditlinks, ExportGrid, jpeg, GIFImg; + column_selection, data_sorting, grideditlinks, ExportGrid, Vcl.Imaging.jpeg, Vcl.Imaging.GIFImg; @@ -2248,7 +2248,7 @@ begin ConnectionParams := nil; RunFrom := ''; - ParseCommandLine(Windows.GetCommandLine, ConnectionParams, FileNames, RunFrom); + ParseCommandLine(GetCommandLine, ConnectionParams, FileNames, RunFrom); // Delete scheduled task from previous if RunFrom = 'scheduler' then begin @@ -2424,7 +2424,7 @@ begin ErrorDialog(_('Storing tab setup failed'), 'Tabs won''t be stored in this session.' + CRLF + CRLF + E.Message + CRLF + CRLF + - SysErrorMessage(Windows.GetLastError) + SysErrorMessage(GetLastError) ); end; end; @@ -2553,7 +2553,7 @@ begin ErrorDialog(_('Restoring tab setup failed'), 'Tabs won''t be stored in this session.' + CRLF + CRLF + E.Message + CRLF + CRLF + - SysErrorMessage(Windows.GetLastError) + SysErrorMessage(GetLastError) ); end; end; diff --git a/source/preferences.pas b/source/preferences.pas index 193fd512..e8445286 100644 --- a/source/preferences.pas +++ b/source/preferences.pas @@ -9,9 +9,9 @@ unit preferences; interface uses - Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, - StdCtrls, ComCtrls, ExtCtrls, SynEditHighlighter, SynHighlighterSQL, - SynEdit, SynMemo, VirtualTrees, SynEditKeyCmds, ActnList, StdActns, Menus, + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, + Vcl.StdCtrls, Vcl.ComCtrls, Vcl.ExtCtrls, SynEditHighlighter, SynHighlighterSQL, + SynEdit, SynMemo, VirtualTrees, SynEditKeyCmds, Vcl.ActnList, Vcl.StdActns, Vcl.Menus, dbstructures, gnugettext, Vcl.Themes, Vcl.Styles, SynRegExpr, Generics.Collections, Vcl.ImageCollection, extra_controls, theme_preview, Vcl.Buttons, System.Actions; diff --git a/source/printlist.pas b/source/printlist.pas index 0df1b8cd..6f61dc30 100644 --- a/source/printlist.pas +++ b/source/printlist.pas @@ -9,7 +9,7 @@ unit printlist; interface uses - Windows, Classes, Controls, Forms, Dialogs, StdCtrls, Printers, VirtualTrees, gnugettext; + Winapi.Windows, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.Printers, VirtualTrees, gnugettext; type TprintlistForm = class(TForm) diff --git a/source/routine_editor.pas b/source/routine_editor.pas index 4ccee7dc..ef895538 100644 --- a/source/routine_editor.pas +++ b/source/routine_editor.pas @@ -3,8 +3,8 @@ unit routine_editor; interface uses - Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, SynEdit, SynMemo, StdCtrls, - ComCtrls, ToolWin, VirtualTrees, VirtualTrees.EditLink, SynRegExpr, extra_controls, + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, SynEdit, SynMemo, Vcl.StdCtrls, + Vcl.ComCtrls, Vcl.ToolWin, VirtualTrees, VirtualTrees.EditLink, SynRegExpr, extra_controls, dbconnection, apphelpers, gnugettext, Vcl.Menus, Vcl.ExtCtrls; type diff --git a/source/searchreplace.pas b/source/searchreplace.pas index 23bc2229..2d553047 100644 --- a/source/searchreplace.pas +++ b/source/searchreplace.pas @@ -3,8 +3,8 @@ unit searchreplace; interface uses - Windows, Messages, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, - ExtCtrls, SynMemo, SynEditTypes, gnugettext, VirtualTrees, SynRegExpr, + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, + Vcl.ExtCtrls, SynMemo, SynEditTypes, gnugettext, VirtualTrees, SynRegExpr, SynEditRegexSearch, SynEditMiscClasses, SynEditSearch, extra_controls, Vcl.Menus, texteditor; diff --git a/source/selectdbobject.pas b/source/selectdbobject.pas index c7f81d0d..8ac8f588 100644 --- a/source/selectdbobject.pas +++ b/source/selectdbobject.pas @@ -3,7 +3,7 @@ unit selectdbobject; interface uses - Windows, Classes, Controls, Forms, StdCtrls, VirtualTrees, VirtualTrees.Types, Graphics, extra_controls, + Winapi.Windows, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.StdCtrls, VirtualTrees, VirtualTrees.Types, Vcl.Graphics, extra_controls, dbconnection, gnugettext; type diff --git a/source/sqlhelp.pas b/source/sqlhelp.pas index 04e5d82c..ae805f9b 100644 --- a/source/sqlhelp.pas +++ b/source/sqlhelp.pas @@ -3,9 +3,9 @@ unit sqlhelp; interface uses - Windows, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, ComCtrls, ExtCtrls, - Buttons, SynMemo, SynEditHighlighter, SynHighlighterURI, extra_controls, - SynURIOpener, SynEdit, VirtualTrees, Graphics, + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ComCtrls, Vcl.ExtCtrls, + Vcl.Buttons, SynMemo, SynEditHighlighter, SynHighlighterURI, extra_controls, + SynURIOpener, SynEdit, VirtualTrees, Vcl.Graphics, dbconnection, gnugettext; type diff --git a/source/syncdb.pas b/source/syncdb.pas index 7951f061..9d6dab22 100644 --- a/source/syncdb.pas +++ b/source/syncdb.pas @@ -3,8 +3,8 @@ unit syncdb; interface uses - Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, StdCtrls, Generics.Collections, VirtualTrees, extra_controls, + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, + Vcl.Dialogs, Vcl.StdCtrls, Generics.Collections, VirtualTrees, extra_controls, dbconnection, gnugettext; type diff --git a/source/table_editor.pas b/source/table_editor.pas index 74560870..ef54c383 100644 --- a/source/table_editor.pas +++ b/source/table_editor.pas @@ -3,10 +3,10 @@ unit table_editor; interface uses - Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, - ComCtrls, ToolWin, VirtualTrees, VirtualTrees.Types, SynRegExpr, ActiveX, ExtCtrls, SynEdit, - SynMemo, Menus, Clipbrd, Math, System.UITypes, System.Generics.Collections, - grideditlinks, dbstructures, dbstructures.mysql, dbconnection, apphelpers, gnugettext, StrUtils, extra_controls; + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, + Vcl.ComCtrls, Vcl.ToolWin, VirtualTrees, VirtualTrees.Types, SynRegExpr, Winapi.ActiveX, Vcl.ExtCtrls, SynEdit, + SynMemo, Vcl.Menus, Vcl.Clipbrd, System.Math, System.UITypes, System.Generics.Collections, + grideditlinks, dbstructures, dbstructures.mysql, dbconnection, apphelpers, gnugettext, System.StrUtils, extra_controls; type TFrame = TDBObjectEditor; diff --git a/source/tabletools.pas b/source/tabletools.pas index 8c7d37d5..21cf32bb 100644 --- a/source/tabletools.pas +++ b/source/tabletools.pas @@ -9,10 +9,10 @@ unit tabletools; interface uses - Windows, SysUtils, Classes, Controls, Forms, StdCtrls, ComCtrls, Buttons, Dialogs, StdActns, - VirtualTrees, VirtualTrees.Header, ExtCtrls, Graphics, SynRegExpr, Math, Generics.Collections, extra_controls, - dbconnection, apphelpers, Menus, gnugettext, DateUtils, System.Zip, System.UITypes, StrUtils, Messages, - SynEdit, SynMemo, ClipBrd, generic_types; + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.StdCtrls, Vcl.ComCtrls, Vcl.Buttons, Vcl.Dialogs, Vcl.StdActns, + VirtualTrees, VirtualTrees.Header, Vcl.ExtCtrls, Vcl.Graphics, SynRegExpr, System.Math, Generics.Collections, extra_controls, + dbconnection, apphelpers, Vcl.Menus, gnugettext, System.DateUtils, System.Zip, System.UITypes, System.StrUtils, Winapi.Messages, + SynEdit, SynMemo, Vcl.ClipBrd, generic_types; type TToolMode = (tmMaintenance, tmFind, tmSQLExport, tmBulkTableEdit); diff --git a/source/texteditor.pas b/source/texteditor.pas index 3cfc3e54..b98416f2 100644 --- a/source/texteditor.pas +++ b/source/texteditor.pas @@ -3,11 +3,11 @@ unit texteditor; interface uses - Windows, Classes, Graphics, Forms, Controls, StdCtrls, VirtualTrees, - ComCtrls, ToolWin, Dialogs, SysUtils, Menus, ExtDlgs, - apphelpers, gnugettext, ActnList, StdActns, extra_controls, System.Actions, + Winapi.Windows, System.Classes, Vcl.Graphics, Vcl.Forms, Vcl.Controls, Vcl.StdCtrls, VirtualTrees, + Vcl.ComCtrls, Vcl.ToolWin, Vcl.Dialogs, System.SysUtils, Vcl.Menus, Vcl.ExtDlgs, + apphelpers, gnugettext, Vcl.ActnList, Vcl.StdActns, extra_controls, System.Actions, Vcl.ExtCtrls, dbconnection, SynEdit, SynMemo, SynEditHighlighter, customize_highlighter, - JSON, Rest.Json, Xml.VerySimple, + System.JSON, Rest.Json, Xml.VerySimple, SynHighlighterADSP21xx, SynHighlighterAWK, SynHighlighterAsm, SynHighlighterBaan, SynHighlighterBat, SynHighlighterCAC, SynHighlighterCPM, SynHighlighterCS, diff --git a/source/trigger_editor.pas b/source/trigger_editor.pas index cf5a4b5d..49f58244 100644 --- a/source/trigger_editor.pas +++ b/source/trigger_editor.pas @@ -3,9 +3,9 @@ unit trigger_editor; interface uses - Windows, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, SynEdit, SynMemo, + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, SynEdit, SynMemo, SynCompletionProposal, SynRegExpr, - dbconnection, dbstructures, dbstructures.mysql, apphelpers, gnugettext, ComCtrls, extra_controls; + dbconnection, dbstructures, dbstructures.mysql, apphelpers, gnugettext, Vcl.ComCtrls, extra_controls; type TFrame = TDBObjectEditor; diff --git a/source/updatecheck.pas b/source/updatecheck.pas index 08fd80b5..18b01f45 100644 --- a/source/updatecheck.pas +++ b/source/updatecheck.pas @@ -3,8 +3,8 @@ unit updatecheck; interface uses - Windows, Messages, SysUtils, Classes, Forms, StdCtrls, IniFiles, Controls, Graphics, - apphelpers, gnugettext, ExtCtrls, extra_controls, System.StrUtils, Vcl.Dialogs, + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Forms, Vcl.StdCtrls, System.IniFiles, Vcl.Controls, Vcl.Graphics, + apphelpers, gnugettext, Vcl.ExtCtrls, extra_controls, System.StrUtils, Vcl.Dialogs, Vcl.Menus, Vcl.Clipbrd, generic_types, System.DateUtils, System.IOUtils; type diff --git a/source/usermanager.pas b/source/usermanager.pas index 2b0d962b..870309b2 100644 --- a/source/usermanager.pas +++ b/source/usermanager.pas @@ -4,9 +4,9 @@ unit usermanager; interface uses - Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ComCtrls, StdCtrls, - ExtCtrls, ToolWin, ClipBrd, Generics.Collections, Generics.Defaults, SynRegExpr, extra_controls, - dbconnection, dbstructures, dbstructures.mysql, apphelpers, VirtualTrees, Menus, gnugettext; + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.StdCtrls, + Vcl.ExtCtrls, Vcl.ToolWin, Vcl.ClipBrd, Generics.Collections, Generics.Defaults, SynRegExpr, extra_controls, + dbconnection, dbstructures, dbstructures.mysql, apphelpers, VirtualTrees, Vcl.Menus, gnugettext; {$I const.inc} diff --git a/source/view.pas b/source/view.pas index 0bfac7f1..85335a57 100644 --- a/source/view.pas +++ b/source/view.pas @@ -3,8 +3,8 @@ unit view; interface uses - Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, SynEdit, SynMemo, - ExtCtrls, + Winapi.Windows, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, SynEdit, SynMemo, + Vcl.ExtCtrls, dbconnection, dbstructures, dbstructures.mysql, apphelpers, gnugettext, Vcl.ComCtrls; type