Skip to content

Commit 04430e8

Browse files
lmbelolmbelo
committed
Files normalization
1 parent 250a99d commit 04430e8

File tree

2 files changed

+86
-101
lines changed

2 files changed

+86
-101
lines changed

‎Modules/DelphiVCL/DelphiVCL.dpr

+22-25
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
library DelphiVCL;
2-
3-
uses
4-
SysUtils,
5-
Classes,
6-
uMain in 'uMain.pas';
7-
8-
{$I ..\..\Source\Definition.Inc}
9-
10-
exports
11-
// This must match the pattern "PyInit_[ProjectName]"
12-
// So if the project is named DelphiVCL then
13-
// the export must be PyInit_DelphiVCL
14-
PyInit_DelphiVCL;
15-
{$IFDEF MSWINDOWS}
16-
{$E pyd}
17-
{$ENDIF}
18-
{$IFDEF LINUX}
19-
{$SONAME 'DelphiVCL'}
20-
21-
{$ENDIF}
22-
23-
begin
24-
end.
25-
1+
library DelphiVCL;
2+
3+
uses
4+
SysUtils,
5+
Classes,
6+
uMain in 'uMain.pas';
7+
8+
{$I ..\..\Source\Definition.Inc}
9+
10+
exports
11+
// This must match the pattern "PyInit_[ProjectName]"
12+
// So if the project is named DelphiVCL then
13+
// the export must be PyInit_DelphiVCL
14+
PyInit_DelphiVCL;
15+
16+
{$IFDEF MSWINDOWS}
17+
{$E pyd}
18+
{$ENDIF}
19+
20+
begin
21+
end.
22+

‎Source/vcl/WrapVclActnList.pas

+64-76
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ interface
1717
the types and allows the use of the constructors e.g. ActionList()
1818
}
1919
TPyDelphiCustomActionList = class(TPyDelphiContainedActionList)
20-
private
21-
function GetDelphiObject: TCustomActionList;
22-
procedure SetDelphiObject(const Value: TCustomActionList);
23-
public
24-
class function DelphiObjectClass: TClass; override;
25-
property DelphiObject: TCustomActionList read GetDelphiObject
26-
write SetDelphiObject;
27-
end;
28-
20+
private
21+
function GetDelphiObject: TCustomActionList;
22+
procedure SetDelphiObject(const Value: TCustomActionList);
23+
public
24+
class function DelphiObjectClass: TClass; override;
25+
property DelphiObject: TCustomActionList read GetDelphiObject
26+
write SetDelphiObject;
27+
end;
2928
TPyDelphiActionList = class (TPyDelphiCustomActionList)
3029
private
3130
function GetDelphiObject: TActionList;
@@ -38,23 +37,22 @@ TPyDelphiActionList = class (TPyDelphiCustomActionList)
3837
end;
3938

4039
TPyDelphiCustomAction = class(TPyDelphiContainedAction)
41-
private
42-
function GetDelphiObject: TCustomAction;
43-
procedure SetDelphiObject(const Value: TCustomAction);
44-
public
45-
class function DelphiObjectClass: TClass; override;
46-
property DelphiObject: TCustomAction read GetDelphiObject
47-
write SetDelphiObject;
48-
end;
49-
50-
TPyDelphiAction = class(TPyDelphiContainedAction)
51-
private
52-
function GetDelphiObject: TAction;
53-
procedure SetDelphiObject(const Value: TAction);
54-
public
55-
class function DelphiObjectClass: TClass; override;
56-
property DelphiObject: TAction read GetDelphiObject write SetDelphiObject;
57-
end;
40+
private
41+
function GetDelphiObject: TCustomAction;
42+
procedure SetDelphiObject(const Value: TCustomAction);
43+
public
44+
class function DelphiObjectClass: TClass; override;
45+
property DelphiObject: TCustomAction read GetDelphiObject
46+
write SetDelphiObject;
47+
end;
48+
TPyDelphiAction = class(TPyDelphiContainedAction)
49+
private
50+
function GetDelphiObject: TAction;
51+
procedure SetDelphiObject(const Value: TAction);
52+
public
53+
class function DelphiObjectClass: TClass; override;
54+
property DelphiObject: TAction read GetDelphiObject write SetDelphiObject;
55+
end;
5856

5957
implementation
6058

@@ -79,26 +77,23 @@ procedure TActnListRegistration.RegisterWrappers(APyDelphiWrapper: TPyDelphiWrap
7977
APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomActionList);
8078
APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiActionList);
8179
APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomAction);
82-
APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiAction);
80+
APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiAction);
8381
end;
8482

8583
{ TPyDelphiCustomActionList }
86-
class function TPyDelphiCustomActionList.DelphiObjectClass: TClass;
87-
begin
88-
Result := TCustomActionList;
89-
end;
90-
91-
function TPyDelphiCustomActionList.GetDelphiObject: TCustomActionList;
92-
begin
93-
Result := TCustomActionList(inherited DelphiObject);
94-
end;
95-
96-
procedure TPyDelphiCustomActionList.SetDelphiObject
97-
(const Value: TCustomActionList);
98-
begin
99-
inherited DelphiObject := Value;
100-
end;
101-
84+
class function TPyDelphiCustomActionList.DelphiObjectClass: TClass;
85+
begin
86+
Result := TCustomActionList;
87+
end;
88+
function TPyDelphiCustomActionList.GetDelphiObject: TCustomActionList;
89+
begin
90+
Result := TCustomActionList(inherited DelphiObject);
91+
end;
92+
procedure TPyDelphiCustomActionList.SetDelphiObject
93+
(const Value: TCustomActionList);
94+
begin
95+
inherited DelphiObject := Value;
96+
end;
10297
{ TPyDelphiActionList }
10398

10499
class function TPyDelphiActionList.DelphiObjectClass: TClass;
@@ -118,39 +113,32 @@ procedure TPyDelphiActionList.SetDelphiObject(
118113
end;
119114

120115
{ TPyDelphiCustomAction }
121-
122-
class function TPyDelphiCustomAction.DelphiObjectClass: TClass;
123-
begin
124-
Result := TCustomAction;
125-
end;
126-
127-
function TPyDelphiCustomAction.GetDelphiObject: TCustomAction;
128-
begin
129-
Result := TCustomAction(inherited DelphiObject);
130-
end;
131-
132-
procedure TPyDelphiCustomAction.SetDelphiObject(const Value: TCustomAction);
133-
begin
134-
inherited DelphiObject := Value;
135-
end;
136-
137-
{ TPyDelphiAction }
138-
139-
class function TPyDelphiAction.DelphiObjectClass: TClass;
140-
begin
141-
Result := TAction;
142-
end;
143-
144-
function TPyDelphiAction.GetDelphiObject: TAction;
145-
begin
146-
Result := TAction(inherited DelphiObject);
147-
end;
148-
149-
procedure TPyDelphiAction.SetDelphiObject(const Value: TAction);
150-
begin
151-
inherited DelphiObject := Value;
152-
end;
153-
116+
117+
class function TPyDelphiCustomAction.DelphiObjectClass: TClass;
118+
begin
119+
Result := TCustomAction;
120+
end;
121+
function TPyDelphiCustomAction.GetDelphiObject: TCustomAction;
122+
begin
123+
Result := TCustomAction(inherited DelphiObject);
124+
end;
125+
procedure TPyDelphiCustomAction.SetDelphiObject(const Value: TCustomAction);
126+
begin
127+
inherited DelphiObject := Value;
128+
end;
129+
{ TPyDelphiAction }
130+
class function TPyDelphiAction.DelphiObjectClass: TClass;
131+
begin
132+
Result := TAction;
133+
end;
134+
function TPyDelphiAction.GetDelphiObject: TAction;
135+
begin
136+
Result := TAction(inherited DelphiObject);
137+
end;
138+
procedure TPyDelphiAction.SetDelphiObject(const Value: TAction);
139+
begin
140+
inherited DelphiObject := Value;
141+
end;
154142
initialization
155143
RegisteredUnits.Add(TActnListRegistration.Create);
156144
end.

0 commit comments

Comments
 (0)