opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of some rarely used class aliases, to avoid confusion when reading the code

Browse Source
This commit is contained in:
Ansgar Becker
2025-04-20 12:59:21 +02:00
parent 1af77ff8ce
commit 7052236c17
8 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/apphelpers.pas
View File

@ -15,11 +15,8 @@ type
// Sync with main branch and Delphi structures // Sync with main branch and Delphi structures
TSynMemo = TSynEdit; TSynMemo = TSynEdit;
TVirtualStringTree = TLazVirtualStringTree; TVirtualStringTree = TLazVirtualStringTree;
TImageIndex = Integer;
PInt = ^Integer; PInt = ^Integer;
TProgressBarState = (pbsNormal, pbsError, pbsPaused); TProgressBarState = (pbsNormal, pbsError, pbsPaused);
TTabSet = TTabControl;
TSynCompletionProposal = TSynCompletion;
TSortItemOrder = (sioAscending, sioDescending); TSortItemOrder = (sioAscending, sioDescending);
TSortItem = class(TPersistent) TSortItem = class(TPersistent)
@ -1369,7 +1366,8 @@ function DetectEncoding(Stream: TStream): TEncoding;
WithBOM: Boolean;} WithBOM: Boolean;}
begin begin
Result := TEncoding.UTF8 Result := TEncoding.UTF8
{SynEnc := SynUnicode.GetEncoding(Stream, WithBOM); { LConvEncoding.GuessEncoding returns string identifiers, not the TEncoding objects
SynEnc := SynUnicode.GetEncoding(Stream, WithBOM);
case SynEnc of case SynEnc of
seUTF8: begin seUTF8: begin
if WithBOM then if WithBOM then

2
source/copytable.pas
View File

@ -212,7 +212,7 @@ end;
procedure TCopyTableForm.TreeElementsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure TCopyTableForm.TreeElementsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
begin begin
// Get node index // Get node index
if not (Kind in [ikNormal, ikSelected]) then Exit; if not (Kind in [ikNormal, ikSelected]) then Exit;

18
source/main.pas
View File

@ -103,7 +103,7 @@ type
LastSaveTime: Cardinal; LastSaveTime: Cardinal;
spltHelpers: TSplitter; spltHelpers: TSplitter;
spltQuery: TSplitter; spltQuery: TSplitter;
tabsetQuery: TTabSet; tabsetQuery: TTabControl;
TabSheet: TTabSheet; TabSheet: TTabSheet;
ResultTabs: TResultTabs; ResultTabs: TResultTabs;
DoProfile: Boolean; DoProfile: Boolean;
@ -385,7 +385,7 @@ type
InsertfilesintoBLOBfields3: TMenuItem; InsertfilesintoBLOBfields3: TMenuItem;
setNULL1: TMenuItem; setNULL1: TMenuItem;
menuExporttables: TMenuItem; menuExporttables: TMenuItem;
SynCompletionProposal: TSynCompletionProposal; SynCompletionProposal: TSynCompletion;
tabCommandStats: TTabSheet; tabCommandStats: TTabSheet;
ListCommandStats: TVirtualStringTree; ListCommandStats: TVirtualStringTree;
N21: TMenuItem; N21: TMenuItem;
@ -545,7 +545,7 @@ type
Runroutines1: TMenuItem; Runroutines1: TMenuItem;
actCreateEvent: TAction; actCreateEvent: TAction;
Event1: TMenuItem; Event1: TMenuItem;
tabsetQuery: TTabSet; tabsetQuery: TTabControl;
actDataSetNull: TAction; actDataSetNull: TAction;
pnlPreview: TPanel; pnlPreview: TPanel;
spltPreview: TSplitter; spltPreview: TSplitter;
@ -915,7 +915,7 @@ type
Column: TColumnIndex); Column: TColumnIndex);
procedure DBtreeGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure DBtreeGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var
ImageIndex: TImageIndex); ImageIndex: Integer);
procedure DBtreeGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: procedure DBtreeGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize:
Integer); Integer);
procedure DBtreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: procedure DBtreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column:
@ -964,7 +964,7 @@ type
var ContentRect: TRect); var ContentRect: TRect);
procedure ListTablesBeforePaint(Sender: TBaseVirtualTree; TargetCanvas: TCanvas); procedure ListTablesBeforePaint(Sender: TBaseVirtualTree; TargetCanvas: TCanvas);
procedure ListTablesGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind; procedure ListTablesGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind;
Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
procedure ListTablesGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer); procedure ListTablesGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer);
procedure ListTablesGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure ListTablesGetText(Sender: TBaseVirtualTree; Node: PVirtualNode;
Column: TColumnIndex; TextType: TVSTTextType; var CellText: string); Column: TColumnIndex; TextType: TVSTTextType; var CellText: string);
@ -6439,7 +6439,7 @@ end;
procedure TMainForm.ListTablesGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure TMainForm.ListTablesGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
var var
Obj: PDBObject; Obj: PDBObject;
begin begin
@ -8573,7 +8573,7 @@ end;
procedure TMainForm.tabsetQueryMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); procedure TMainForm.tabsetQueryMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
var var
idx, i: Integer; idx, i: Integer;
Tabs: TTabSet; Tabs: TTabControl;
Rect: TRect; Rect: TRect;
Org: TPoint; Org: TPoint;
QueryTab: TQueryTab; QueryTab: TQueryTab;
@ -8584,7 +8584,7 @@ begin
if (FLastHintMousepos.X = x) and (FLastHintMousepos.Y = Y) then if (FLastHintMousepos.X = x) and (FLastHintMousepos.Y = Y) then
Exit; Exit;
FLastHintMousepos := Point(X, Y); FLastHintMousepos := Point(X, Y);
Tabs := Sender as TTabSet; Tabs := Sender as TTabControl;
idx := Tabs.IndexOfTabAt(X, Y); idx := Tabs.IndexOfTabAt(X, Y);
if (idx = -1) or (idx = FLastHintControlIndex) then if (idx = -1) or (idx = FLastHintControlIndex) then
Exit; Exit;
@ -9603,7 +9603,7 @@ end;
} }
procedure TMainForm.DBtreeGetImageIndex(Sender: TBaseVirtualTree; Node: procedure TMainForm.DBtreeGetImageIndex(Sender: TBaseVirtualTree; Node:
PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; var Ghosted:
Boolean; var ImageIndex: TImageIndex); Boolean; var ImageIndex: Integer);
var var
DBObj: PDBObject; DBObj: PDBObject;
begin begin

2
source/preferences.pas
View File

@ -1212,7 +1212,7 @@ end;
procedure TfrmPreferences.TreeShortcutItemsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure TfrmPreferences.TreeShortcutItemsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
var var
Data: PShortcutItemData; Data: PShortcutItemData;
begin begin

4
source/routine_editor.pas
View File

@ -56,7 +56,7 @@ type
var CellText: String); var CellText: String);
procedure listParametersGetImageIndex(Sender: TBaseVirtualTree; procedure listParametersGetImageIndex(Sender: TBaseVirtualTree;
Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex;
var Ghosted: Boolean; var ImageIndex: TImageIndex); var Ghosted: Boolean; var ImageIndex: Integer);
procedure btnClearParamsClick(Sender: TObject); procedure btnClearParamsClick(Sender: TObject);
procedure btnRemoveParamClick(Sender: TObject); procedure btnRemoveParamClick(Sender: TObject);
procedure listParametersBeforePaint(Sender: TBaseVirtualTree; procedure listParametersBeforePaint(Sender: TBaseVirtualTree;
@ -294,7 +294,7 @@ end;
procedure TfrmRoutineEditor.listParametersGetImageIndex(Sender: TBaseVirtualTree; procedure TfrmRoutineEditor.listParametersGetImageIndex(Sender: TBaseVirtualTree;
Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex;
var Ghosted: Boolean; var ImageIndex: TImageIndex); var Ghosted: Boolean; var ImageIndex: Integer);
var var
List: TLazVirtualStringTree; List: TLazVirtualStringTree;
Context: String; Context: String;

2
source/sqlhelp.pas
View File

@ -178,7 +178,7 @@ end;
procedure TfrmSQLhelp.treeTopicsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure TfrmSQLhelp.treeTopicsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
begin begin
// Return open or closed book icon for folders, or document icon for topics // Return open or closed book icon for folders, or document icon for topics
if not (Kind in [ikNormal, ikSelected]) then if not (Kind in [ikNormal, ikSelected]) then

4
source/tabletools.pas
View File

@ -108,7 +108,7 @@ type
procedure TreeObjectsInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; procedure TreeObjectsInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode;
var InitialStates: TVirtualNodeInitStates); var InitialStates: TVirtualNodeInitStates);
procedure TreeObjectsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind; procedure TreeObjectsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind;
Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
procedure TreeObjectsInitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal); procedure TreeObjectsInitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal);
procedure Execute(Sender: TObject); procedure Execute(Sender: TObject);
procedure ResultGridInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; procedure ResultGridInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode;
@ -701,7 +701,7 @@ begin
end; end;
procedure TfrmTableTools.TreeObjectsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure TfrmTableTools.TreeObjectsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
begin begin
Mainform.DBtreeGetImageIndex(Sender, Node, Kind, Column, Ghosted, ImageIndex); Mainform.DBtreeGetImageIndex(Sender, Node, Kind, Column, Ghosted, ImageIndex);
end; end;

8
source/usermanager.pas
View File

@ -128,13 +128,13 @@ type
procedure listUsersGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; procedure listUsersGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex;
TextType: TVSTTextType; var CellText: string); TextType: TVSTTextType; var CellText: string);
procedure listUsersGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure listUsersGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
procedure listUsersFocusChanging(Sender: TBaseVirtualTree; OldNode, NewNode: PVirtualNode; procedure listUsersFocusChanging(Sender: TBaseVirtualTree; OldNode, NewNode: PVirtualNode;
OldColumn, NewColumn: TColumnIndex; var Allowed: Boolean); OldColumn, NewColumn: TColumnIndex; var Allowed: Boolean);
procedure btnSaveClick(Sender: TObject); procedure btnSaveClick(Sender: TObject);
procedure Modification(Sender: TObject); procedure Modification(Sender: TObject);
procedure treePrivsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure treePrivsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
procedure treePrivsInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; procedure treePrivsInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode;
var InitialStates: TVirtualNodeInitStates); var InitialStates: TVirtualNodeInitStates);
procedure treePrivsGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; procedure treePrivsGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex;
@ -828,7 +828,7 @@ end;
procedure TUserManagerForm.listUsersGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure TUserManagerForm.listUsersGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
var var
User: PUser; User: PUser;
begin begin
@ -983,7 +983,7 @@ end;
procedure TUserManagerForm.treePrivsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; procedure TUserManagerForm.treePrivsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex); Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
begin begin
// Icon for privilege // Icon for privilege
if Sender.GetNodeLevel(Node) <> 0 then if Sender.GetNodeLevel(Node) <> 0 then