diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp index 22e3907cf8..4c772df857 100644 --- a/ide/editoroptions.pp +++ b/ide/editoroptions.pp @@ -404,8 +404,8 @@ const TEditorOptionsDividerRecord = ( (Count: 0; Info: nil), // none (Count: 0; Info: nil), // text - (Count: 9; Info: {$IFDEF FPC}@{$ENDIF}EditorOptionsDividerInfoPas[0]), // Freepas - (Count: 9; Info: {$IFDEF FPC}@{$ENDIF}EditorOptionsDividerInfoPas[0]), // pas + (Count: 9; Info: @EditorOptionsDividerInfoPas[0]), // Freepas + (Count: 9; Info: @EditorOptionsDividerInfoPas[0]), // pas (Count: 0; Info: nil), // lfm (Count: 0; Info: nil), // xml (Count: 0; Info: nil), // html @@ -601,11 +601,11 @@ const TEditorOptionsFoldRecord = ( (Count: 0; Info: nil), // none (Count: 0; Info: nil), // text - (Count: 23; Info: {$IFDEF FPC}@{$ENDIF}EditorOptionsFoldInfoPas[0]), // Freepas - (Count: 23; Info: {$IFDEF FPC}@{$ENDIF}EditorOptionsFoldInfoPas[0]), // pas - (Count: 3; Info: {$IFDEF FPC}@{$ENDIF}EditorOptionsFoldInfoLFM[0]), // lfm - (Count: 5; Info: {$IFDEF FPC}@{$ENDIF}EditorOptionsFoldInfoXML[0]), // xml - (Count: 3; Info: {$IFDEF FPC}@{$ENDIF}EditorOptionsFoldInfoHTML[0]), // html + (Count: 23; Info: @EditorOptionsFoldInfoPas[0]), // Freepas + (Count: 23; Info: @EditorOptionsFoldInfoPas[0]), // pas + (Count: 3; Info: @EditorOptionsFoldInfoLFM[0]), // lfm + (Count: 5; Info: @EditorOptionsFoldInfoXML[0]), // xml + (Count: 3; Info: @EditorOptionsFoldInfoHTML[0]), // html (Count: 0; Info: nil), // cpp (Count: 0; Info: nil), // perl (Count: 0; Info: nil), // java @@ -614,7 +614,7 @@ const (Count: 0; Info: nil), // php (Count: 0; Info: nil), // sql (Count: 0; Info: nil), // jscript - (Count: 3; Info: {$IFDEF FPC}@{$ENDIF}EditorOptionsFoldInfoDiff[0]), // Diff + (Count: 3; Info: @EditorOptionsFoldInfoDiff[0]), // Diff (Count: 0; Info: nil), // Bat (Count: 0; Info: nil), // Ini (Count: 0; Info: nil) // PO diff --git a/ide/keymapping.pp b/ide/keymapping.pp index e524e46ef2..f9ac778a35 100644 --- a/ide/keymapping.pp +++ b/ide/keymapping.pp @@ -3848,8 +3848,8 @@ begin end; initialization - RegisterKeyCmdIdentProcs({$IFDEF FPC}@{$ENDIF}IdentToIDECommand, - {$IFDEF FPC}@{$ENDIF}IDECommandToIdent); + RegisterKeyCmdIdentProcs(@IdentToIDECommand, + @IDECommandToIdent); end. diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp index 340d97ec72..b954f872ab 100644 --- a/ide/sourceeditor.pp +++ b/ide/sourceeditor.pp @@ -8588,12 +8588,12 @@ constructor TSynEditPlugin1.Create(AOwner: TComponent); Begin inherited Create(AOwner); FEnabled := True; - ViewedTextBuffer.AddChangeHandler(senrLineCount, {$IFDEF FPC}@{$ENDIF}LineCountChanged); + ViewedTextBuffer.AddChangeHandler(senrLineCount, @LineCountChanged); end; destructor TSynEditPlugin1.Destroy; begin - ViewedTextBuffer.RemoveChangeHandler(senrLineCount, {$IFDEF FPC}@{$ENDIF}LineCountChanged); + ViewedTextBuffer.RemoveChangeHandler(senrLineCount, @LineCountChanged); inherited Destroy; end; diff --git a/ide/sourcesyneditor.pas b/ide/sourcesyneditor.pas index 6f956087d7..782818d73d 100644 --- a/ide/sourcesyneditor.pas +++ b/ide/sourcesyneditor.pas @@ -1584,7 +1584,7 @@ begin TSynEditMarkupManager(MarkupMgr).AddMarkUp(FMarkupIfDef); FPaintArea := TSourceLazSynSurfaceManager.Create(Self, FPaintArea); - GetCaretObj.AddChangeHandler({$IFDEF FPC}@{$ENDIF}SrcSynCaretChanged); + GetCaretObj.AddChangeHandler(@SrcSynCaretChanged); FTopInfoDisplay := TSourceLazSynTopInfoView.Create; FTopInfoDisplay.NextView := ViewedTextBuffer.DisplayView; @@ -1752,9 +1752,9 @@ procedure TIDESynGutterLOvProviderPascal.BufferChanged(Sender: TObject); begin TSynEditStringList(Sender).RemoveHanlders(self); TSynEditStringList(TextBuffer).AddGenericHandler(senrHighlightChanged, - TMethod({$IFDEF FPC}@{$ENDIF}HighlightChanged)); + TMethod(@HighlightChanged)); TSynEditStringList(TextBuffer).AddGenericHandler(senrTextBufferChanged, - TMethod({$IFDEF FPC}@{$ENDIF}BufferChanged)); + TMethod(@BufferChanged)); //LineCountChanged(nil, 0, 0); HighlightChanged(nil,-1,-1); end; @@ -1932,9 +1932,9 @@ begin Color := $D4D4D4; Color2 := $E8E8E8; TSynEditStringList(TextBuffer).AddGenericHandler(senrHighlightChanged, - TMethod({$IFDEF FPC}@{$ENDIF}HighlightChanged)); + TMethod(@HighlightChanged)); TSynEditStringList(TextBuffer).AddGenericHandler(senrTextBufferChanged, - TMethod({$IFDEF FPC}@{$ENDIF}BufferChanged)); + TMethod(@BufferChanged)); end; destructor TIDESynGutterLOvProviderPascal.Destroy; @@ -2434,13 +2434,13 @@ begin AddPopUpItem(cLineCaption); If HasFolds then - AddPopUpItem(synfUnfoldAllInSelection).OnClick := {$IFDEF FPC}@{$ENDIF}PopClickedUnfoldAll; + AddPopUpItem(synfUnfoldAllInSelection).OnClick := @PopClickedUnfoldAll; If HasCollapsedComments then - AddPopUpItem(synfUnfoldCommentsInSelection).OnClick := {$IFDEF FPC}@{$ENDIF}PopClickedUnfoldComment; + AddPopUpItem(synfUnfoldCommentsInSelection).OnClick := @PopClickedUnfoldComment; If HasFoldableComments then - AddPopUpItem(synfFoldCommentsInSelection).OnClick := {$IFDEF FPC}@{$ENDIF}PopClickedFoldComment; + AddPopUpItem(synfFoldCommentsInSelection).OnClick := @PopClickedFoldComment; If HasHideableComments then - AddPopUpItem(synfHideCommentsInSelection).OnClick := {$IFDEF FPC}@{$ENDIF}PopClickedHideComment; + AddPopUpItem(synfHideCommentsInSelection).OnClick := @PopClickedHideComment; end; end.