Skip to content

Commit 242e737

Browse files
berobero
committed
Remove C++ Builder (BCB) conditional compilation support #31
C++ Builder support has been removed as it was never fully implemented and is no longer maintained. Changes include: - Bold.inc: Remove BCB detection, always define BOLD_DELPHI - BoldDefsDT.pas: Remove BCB syntax symbols - BoldWinINet.pas: Remove BCB stub functions - BoldBase.pas: Remove IFNDEF BCB around NewInstance/AfterConstruction - BoldDefs.pas: Simplify BOLD_HOST_IDE to always 'Delphi' - ControlPacks: Remove BCB procedure vs function type variants - BoldGrid/BoldGridCom: Remove IFNDEF BCB around Ctl3d property - BoldUMLModelValidator.pas: Remove outdated BCB FrameworkMethods
1 parent 724b84b commit 242e737

18 files changed

Lines changed: 30 additions & 267 deletions

File tree

‎Source/BoldAwareGUI/BoldControls/BoldGrid.pas‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,7 @@ TBoldGrid = class(TBoldCustomGrid)
435435
property Color;
436436
property Constraints;
437437
property Columns;
438-
{$IFNDEF BCB}
439438
property Ctl3d;
440-
{$ENDIF}
441439
property DefaultColWidth;
442440
property DefaultRowHeight;
443441
property DragCursor;

‎Source/BoldAwareGUI/ControlPacks/BoldGenericListControlPack.pas‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,8 @@ TBoldGenericListPart = class;
2323
TBoldGenericListParts = class;
2424
TBoldFollowerListWithOwnedList = class;
2525

26-
{$IFDEF BOLD_BCB}
27-
TGetFollowerControllerByNameEvent = procedure (const Name: string; var FollowerController: TBoldFollowerController) of object;
28-
TGetFollowerControllerEvent = procedure (Element: TBoldElement; Subscriber: TBoldSubscriber; GetFollowerControllerByName: TGetFollowerControllerByNameEvent; var FollowerController: TBoldFollowerController) of object;
29-
{$ENDIF}
30-
31-
{$IFDEF BOLD_DELPHI}
3226
TGetFollowerControllerByNameEvent = function (const Name: string): TBoldFollowerController of object;
3327
TGetFollowerControllerEvent = function (Element: TBoldElement; Subscriber: TBoldSubscriber; GetFollowerControllerByName: TGetFollowerControllerByNameEvent): TBoldFollowerController of object;
34-
{$ENDIF}
3528

3629
{$IFNDEF BOLDCOMCLIENT}
3730
TGetElementEvent = procedure (Sender: TBoldGenericListPart; Element: TBoldElement; Subscriber: TBoldSubscriber; ResultElement: TBoldIndirectElement; Resubscribe: Boolean) of object;
@@ -286,12 +279,7 @@ function LoopList(List: TBoldList): TBoldFollowerController;
286279
result := nil;
287280
for i := 0 to List.Count - 1 do
288281
begin
289-
{$IFDEF BOLD_BCB}
290-
GetFollowerControllerByname(List.Elements[i].AsString, Result);
291-
{$ENDIF}
292-
{$IFDEF BOLD_DELPHI}
293282
Result := GetFollowerControllerByname(List.Elements[i].AsString);
294-
{$ENDIF}
295283
if Assigned(Result) then
296284
break;
297285
end;
@@ -323,25 +311,15 @@ function LoopList(List: TBoldList): TBoldFollowerController;
323311
end;
324312
{$ENDIF}
325313
if not Assigned(Result) then
326-
{$IFDEF BOLD_BCB}
327-
GetFollowerControllerByName(DefaultName, Result);
328-
{$ENDIF}
329-
{$IFDEF BOLD_DELPHI}
330314
Result := GetFollowerControllerByName(DefaultName);
331-
{$ENDIF}
332315
end;
333316

334317
function TBoldGenericListPart.GetFollowerController(Element: TBoldElement; Subscriber: TBoldSubscriber; GetFollowerControllerByName: TGetFollowerControllerByNameEvent): TBoldFollowerController;
335318
begin
336319
try
337320
Result := nil;
338321
if Assigned(FOnGetFollowerController) then
339-
{$IFDEF BOLD_BCB}
340-
FOnGetFollowerController(Element, Subscriber, GetFollowerControllerByName, Result);
341-
{$ENDIF}
342-
{$IFDEF BOLD_DELPHI}
343322
Result := FOnGetFollowerController(Element, Subscriber, GetFollowerControllerByName);
344-
{$ENDIF}
345323
if not Assigned(Result) then
346324
Result := DefaultGetFollowerController(Element, Subscriber, GetFollowerControllerByName);
347325
except

‎Source/BoldAwareGUI/ControlPacks/BoldNodeControlPack.pas‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,7 @@ TBoldTreeFollowerController = class(TBoldGenericListController)
4848
class function PrecreateFollowers: boolean; override;
4949
procedure DoIconChanged(Follower: TBoldFollower);
5050
procedure DoTextChanged(Follower: TBoldFollower);
51-
{$IFDEF BOLD_BCB}
52-
procedure DoGetFollowerController(const Name: string; var FollowerController: TBoldFollowerController);
53-
{$ENDIF}
54-
{$IFDEF BOLD_DELPHI}
5551
function DoGetFollowerController(const Name: string): TBoldFollowerController;
56-
{$ENDIF}
5752
procedure DoAssign(Source: TPersistent); override;
5853
function GetBoldNodeDescriptionsClass: TBoldNodeDescriptionsClass; virtual;
5954
public
@@ -232,29 +227,12 @@ procedure TBoldTreeFollowerController.DoTextChanged(Follower: TBoldFollower);
232227
FOnTextChanged(Follower);
233228
end;
234229

235-
{$IFDEF BOLD_BCB}
236-
procedure TBoldTreeFollowerController.DoGetFollowerController(const Name: string; var FollowerController: TBoldFollowerController);
237-
{$ENDIF}
238-
{$IFDEF BOLD_DELPHI}
239230
function TBoldTreeFollowerController.DoGetFollowerController(const Name: string): TBoldFollowerController;
240-
{$ENDIF}
241231
begin
242-
{$IFDEF BOLD_BCB}
243-
if Assigned(FOnGetFollowerController) then
244-
begin
245-
FollowerController := nil;
246-
fOnGetFollowerController(Name, FollowerController);
247-
end
248-
else
249-
FollowerController := DefaultGetNodeFollowerControllerByName(Name);
250-
{$ENDIF}
251-
252-
{$IFDEF BOLD_DELPHI}
253232
if Assigned(FOnGetFollowerController) then
254233
Result := FOnGetFollowerController(Name)
255234
else
256235
Result := DefaultGetNodeFollowerControllerByName(Name);
257-
{$ENDIF}
258236
end;
259237

260238
{-- TBoldNodeDescriptions --}

‎Source/BoldAwareGUI/ControlPacks/BoldViewerControlPack.pas‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@ TBoldViewerRendererData = class;
3030
TBoldAbstractViewAdapter = class;
3131

3232
{ TBoldAsViewerRenderer }
33-
{$IFDEF BOLD_BCB}
34-
TBoldGetAsViewer = procedure (Element: TBoldElement; Representation: TBoldRepresentation; Expression: TBoldExpression; var AbstractViewAdapter: TBoldAbstractViewAdapter) of object;
35-
{$ENDIF}
36-
{$IFDEF BOLD_DELPHI}
3733
TBoldGetAsViewer = function (aFollower: TBoldFollower): TBoldAbstractViewAdapter of object;
38-
{$ENDIF}
3934
TBoldSetAsViewer = procedure (aFollower: TBoldFollower; Value: TBoldAbstractViewAdapter) of object;
4035
TBoldViewerIsChanged = function (aFollower: TBoldFollower; NewValue: TBoldAbstractViewAdapter): Boolean of object;
4136

@@ -317,15 +312,7 @@ function TBoldAsViewerRenderer.GetAsViewerAndSubscribe(aFollower: TBoldFollower;
317312
Subscriber := nil;
318313
end;
319314
if Assigned(OnGetAsViewer) then
320-
begin
321-
{$IFDEF BOLD_BCB}
322-
Result := nil;
323-
OnGetAsViewer(Element, Representation, Expression, Result);
324-
{$ENDIF}
325-
{$IFDEF BOLD_DELPHI}
326-
Result := OnGetAsViewer(aFollower);
327-
{$ENDIF}
328-
end
315+
Result := OnGetAsViewer(aFollower)
329316
else
330317
Result := DefaultGetAsViewerAndSubscribe(aFollower, Subscriber);
331318
end;

‎Source/BoldAwareGUI/IDE/BoldBootIDE.pas‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ procedure DrawOnD6StartupScreen;
8282
{$ENDIF}
8383

8484
initialization
85-
{$IFDEF BOLD_DELPHI}
8685
{$IFDEF BOLD_DELPHI6}
8786
DrawOnD6StartupScreen;
8887
{$ENDIF}
89-
{$ENDIF}
90-
{$IFDEF BCB}
91-
{$ENDIF}
9288
end.

‎Source/BoldAwareGUI/IDE/BoldInstallation.pas‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,7 @@ implementation
4242

4343
function GetLibraryPath: String;
4444
const
45-
{$IFDEF BOLD_DELPHI}
4645
ROOT_MACRO = '';
47-
{$ENDIF}
48-
{$IFDEF BOLD_BCB}
49-
ROOT_MACRO = '';
50-
{$ENDIF}
5146
var
5247
Registry: TRegistry;
5348
Guard: IBoldGuard;

‎Source/ClientGuiCom/BoldControls/BoldGridCom.pas‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,7 @@ TBoldGridCom = class(TBoldCustomGridCom)
436436
property Color;
437437
property Constraints;
438438
property Columns;
439-
{$IFNDEF BCB}
440439
property Ctl3d;
441-
{$ENDIF}
442440
property DefaultColWidth;
443441
property DefaultRowHeight;
444442
property DragCursor;

‎Source/ClientGuiCom/ControlPacks/BoldGenericListControlPackCom.pas‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,8 @@ TBoldGenericListPartCom = class;
2727
TBoldGenericListPartsCom = class;
2828
TBoldFollowerListWithOwnedListCom = class;
2929

30-
{$IFDEF BOLD_BCB}
31-
TGetFollowerControllerByNameEventCom = procedure (Name: string; var FollowerController: TBoldFollowerControllerCom) of object;
32-
TGetFollowerControllerEventCom = procedure (Element: IBoldElement; Subscriber: TBoldComClientSubscriber; GetFollowerControllerByName: TGetFollowerControllerByNameEventCom; var FollowerController: TBoldFollowerControllerCom) of object;
33-
{$ENDIF}
34-
35-
{$IFDEF BOLD_DELPHI}
3630
TGetFollowerControllerByNameEventCom = function (Name: string): TBoldFollowerControllerCom of object;
3731
TGetFollowerControllerEventCom = function (Element: IBoldElement; Subscriber: TBoldComClientSubscriber; GetFollowerControllerByName: TGetFollowerControllerByNameEventCom): TBoldFollowerControllerCom of object;
38-
{$ENDIF}
3932

4033
{$IFNDEF BOLDCOMCLIENT}
4134
TGetElementEvent = procedure (Sender: TBoldGenericListPartCom; Element: IBoldElement; Subscriber: TBoldComClientSubscriber; ResultElement: TBoldIndirectElement; Resubscribe: Boolean) of object;
@@ -287,12 +280,7 @@ function LoopList(List: IBoldList): TBoldFollowerControllerCom;
287280
result := nil;
288281
for i := 0 to List.Count - 1 do
289282
begin
290-
{$IFDEF BOLD_BCB}
291-
GetFollowerControllerByname(List.Elements[i].AsString, Result);
292-
{$ENDIF}
293-
{$IFDEF BOLD_DELPHI}
294283
Result := GetFollowerControllerByname(List.Elements[i].AsString);
295-
{$ENDIF}
296284
if Assigned(Result) then
297285
break;
298286
end;
@@ -324,25 +312,15 @@ function LoopList(List: IBoldList): TBoldFollowerControllerCom;
324312
end;
325313
{$ENDIF}
326314
if not Assigned(Result) then
327-
{$IFDEF BOLD_BCB}
328-
GetFollowerControllerByName(DefaultName, Result);
329-
{$ENDIF}
330-
{$IFDEF BOLD_DELPHI}
331315
Result := GetFollowerControllerByName(DefaultName);
332-
{$ENDIF}
333316
end;
334317

335318
function TBoldGenericListPartCom.GetFollowerController(Element: IBoldElement; Subscriber: TBoldComClientSubscriber; GetFollowerControllerByName: TGetFollowerControllerByNameEventCom): TBoldFollowerControllerCom;
336319
begin
337320
try
338321
Result := nil;
339322
if Assigned(FOnGetFollowerController) then
340-
{$IFDEF BOLD_BCB}
341-
FOnGetFollowerController(Element, Subscriber, GetFollowerControllerByName, Result);
342-
{$ENDIF}
343-
{$IFDEF BOLD_DELPHI}
344323
Result := FOnGetFollowerController(Element, Subscriber, GetFollowerControllerByName);
345-
{$ENDIF}
346324
if not Assigned(Result) then
347325
Result := DefaultGetFollowerController(Element, Subscriber, GetFollowerControllerByName);
348326
except

‎Source/ClientGuiCom/ControlPacks/BoldNodeControlPackCom.pas‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,7 @@ TBoldTreeFollowerControllerCom = class(TBoldGenericListControllerCom)
4444
protected
4545
procedure DoIconChanged(Follower: TBoldFollowerCom);
4646
procedure DoTextChanged(Follower: TBoldFollowerCom);
47-
{$IFDEF BOLD_BCB}
48-
procedure DoGetFollowerController(Name: string; var FollowerController: TBoldFollowerControllerCom);
49-
{$ENDIF}
50-
{$IFDEF BOLD_DELPHI}
5147
function DoGetFollowerController(Name: string): TBoldFollowerControllerCom;
52-
{$ENDIF}
5348
procedure DoAssign(Source: TPersistent); override;
5449
function GetBoldNodeDescriptionsClass: TBoldNodeDescriptionsClassCom; virtual;
5550
public
@@ -224,29 +219,12 @@ procedure TBoldTreeFollowerControllerCom.DoTextChanged(Follower: TBoldFollowerCo
224219
FOnTextChanged(Follower);
225220
end;
226221

227-
{$IFDEF BOLD_BCB}
228-
procedure TBoldTreeFollowerControllerCom.DoGetFollowerController(Name: string; var FollowerController: TBoldFollowerControllerCom);
229-
{$ENDIF}
230-
{$IFDEF BOLD_DELPHI}
231222
function TBoldTreeFollowerControllerCom.DoGetFollowerController(Name: string): TBoldFollowerControllerCom;
232-
{$ENDIF}
233223
begin
234-
{$IFDEF BOLD_BCB}
235-
if Assigned(FOnGetFollowerController) then
236-
begin
237-
FollowerController := nil;
238-
fOnGetFollowerController(Name, FollowerController);
239-
end
240-
else
241-
FollowerController := DefaultGetNodeFollowerControllerByName(Name);
242-
{$ENDIF}
243-
244-
{$IFDEF BOLD_DELPHI}
245224
if Assigned(FOnGetFollowerController) then
246225
Result := FOnGetFollowerController(Name)
247226
else
248227
Result := DefaultGetNodeFollowerControllerByName(Name);
249-
{$ENDIF}
250228
end;
251229

252230
{-- TBoldNodeDescriptionsCom --}

‎Source/ClientGuiCom/ControlPacks/BoldViewerControlPackCom.pas‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ TBoldViewerRendererDataCom = class;
3131
TBoldAbstractViewAdapterCom = class;
3232

3333
{ TBoldAsViewerRendererCom }
34-
{$IFDEF BOLD_BCB}
35-
TBoldGetAsViewerCom = procedure (Element: IBoldElement; Representation: TBoldRepresentation; Expression: TBoldExpression; var AbstractViewAdapter: TBoldAbstractViewAdapterCom) of object;
36-
{$ENDIF}
37-
{$IFDEF BOLD_DELPHI}
3834
TBoldGetAsViewerCom = function (Element: IBoldElement; Representation: TBoldRepresentation; Expression: TBoldExpression): TBoldAbstractViewAdapterCom of object;
39-
{$ENDIF}
4035
TBoldSetAsViewerCom = procedure (Element: IBoldElement; Value: TBoldAbstractViewAdapterCom; Representation: TBoldRepresentation; Expression: TBoldExpression) of object;
4136
TBoldViewerIsChangedCom = function (RendererData: TBoldViewerRendererDataCom; NewValue: TBoldAbstractViewAdapterCom; Representation: TBoldRepresentation; Expression: TBoldExpression): Boolean of object;
4237

@@ -318,15 +313,7 @@ function TBoldAsViewerRendererCom.GetAsViewerAndSubscribe(Element: IBoldElement;
318313
Subscriber := nil;
319314
end;
320315
if Assigned(OnGetAsViewer) then
321-
begin
322-
{$IFDEF BOLD_BCB}
323-
Result := nil;
324-
OnGetAsViewer(Element, Representation, Expression, Result);
325-
{$ENDIF}
326-
{$IFDEF BOLD_DELPHI}
327-
Result := OnGetAsViewer(Element, Representation, Expression);
328-
{$ENDIF}
329-
end
316+
Result := OnGetAsViewer(Element, Representation, Expression)
330317
else
331318
Result := DefaultGetAsViewerAndSubscribe(Element, Representation, Expression, VariableList, Subscriber);
332319
end;

0 commit comments

Comments
 (0)