From 9c3c06ecf8024d54fa511af15022d2e96f88d0a0 Mon Sep 17 00:00:00 2001 From: martin Date: Sat, 4 Apr 2009 21:23:53 +0000 Subject: [PATCH] SynEdit, Cleanup: Removed unused unit dependencies / changed some var-param into out-param git-svn-id: trunk@19222 - --- components/synedit/synbeautifierpas.pas | 2 +- components/synedit/syncompletion.pas | 3 +- components/synedit/synedit.pp | 2 +- components/synedit/syneditfoldedview.pp | 2 +- components/synedit/synedithighlighter.pp | 6 +-- .../synedit/synedithighlighterfoldbase.pas | 6 +-- components/synedit/syneditmarkup.pp | 2 +- components/synedit/synedittextbase.pas | 2 +- components/synedit/synedittextbuffer.pp | 2 +- components/synedit/synedittexttabexpander.pas | 2 +- components/synedit/synedittexttrimmer.pas | 2 +- components/synedit/syngutterchanges.pas | 2 +- components/synedit/synhighlighterany.pas | 6 +-- components/synedit/synhighlightercpp.pp | 6 +-- components/synedit/synhighlightercss.pas | 4 +- components/synedit/synhighlighterhtml.pp | 6 +-- components/synedit/synhighlighterjava.pas | 4 +- components/synedit/synhighlighterjscript.pas | 4 +- components/synedit/synhighlighterlfm.pas | 6 +-- components/synedit/synhighlightermulti.pas | 6 +-- components/synedit/synhighlighterpas.pp | 6 +-- components/synedit/synhighlighterperl.pas | 6 +-- components/synedit/synhighlighterphp.pas | 4 +- components/synedit/synhighlighterposition.pas | 6 +-- components/synedit/synhighlighterpython.pas | 6 +-- components/synedit/synhighlightersql.pas | 4 +- components/synedit/synhighlightertex.pas | 4 +- .../synedit/synhighlighterunixshellscript.pas | 6 +-- components/synedit/synhighlightervb.pas | 6 +-- components/synedit/synhighlighterxml.pas | 6 +-- .../synedit/synpropertyeditobjectlist.lfm | 6 +-- .../synedit/synpropertyeditobjectlist.lrs | 40 +++++++++---------- .../synedit/synpropertyeditobjectlist.pas | 2 +- .../synunihighlighter/synunihighlighter.pas | 6 +-- 34 files changed, 88 insertions(+), 95 deletions(-) diff --git a/components/synedit/synbeautifierpas.pas b/components/synedit/synbeautifierpas.pas index 2e86ed87ed..4b3eb352d1 100644 --- a/components/synedit/synbeautifierpas.pas +++ b/components/synedit/synbeautifierpas.pas @@ -44,7 +44,7 @@ unit SynBeautifierPas; interface uses - Classes, SysUtils, LCLProc, SynEdit, SynBeautifier, SynEditTextBuffer, + Classes, SysUtils, LCLProc, SynEdit, SynBeautifier, SynEditHighlighter, SynHighlighterPas, SynEditTextBase; type diff --git a/components/synedit/syncompletion.pas b/components/synedit/syncompletion.pas index b8d1fd505f..fcf93c7089 100644 --- a/components/synedit/syncompletion.pas +++ b/components/synedit/syncompletion.pas @@ -42,8 +42,7 @@ interface uses {$IFDEF SYN_LAZARUS} - LCLProc, LCLIntf, LCLType, SynEditTextBuffer, Messages, LMessages, - SynEditMiscProcs, + LCLProc, LCLIntf, LCLType, SynEditMiscProcs, {$ELSE} Windows, SynEditTypes, Messages, {$ENDIF} diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp index fc7d8917df..7c21f34aa4 100644 --- a/components/synedit/synedit.pp +++ b/components/synedit/synedit.pp @@ -65,7 +65,7 @@ uses {$IFDEF USE_UTF8BIDI_LCL} FreeBIDI, utf8bidi, {$ENDIF} - Types, FPCAdds, LCLIntf, LCLType, LMessages, LCLProc, + Types, LCLIntf, LCLType, LMessages, LCLProc, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/syneditfoldedview.pp b/components/synedit/syneditfoldedview.pp index e59a67ce29..93534e8ae1 100644 --- a/components/synedit/syneditfoldedview.pp +++ b/components/synedit/syneditfoldedview.pp @@ -31,7 +31,7 @@ interface uses LCLProc, Graphics, - Classes, SysUtils, SynEditTypes, SynEditTextBuffer, SynEditTextBase, + Classes, SysUtils, SynEditTextBase, SynEditMiscClasses, SynEditMiscProcs, SynEditPointClasses, SynEditHighlighter, SynEditHighlighterFoldBase; diff --git a/components/synedit/synedithighlighter.pp b/components/synedit/synedithighlighter.pp index d0ebc0a996..c45289801b 100644 --- a/components/synedit/synedithighlighter.pp +++ b/components/synedit/synedithighlighter.pp @@ -44,9 +44,7 @@ uses {$ENDIF} Registry, IniFiles, {$ENDIF} - SynEditTypes, - SynEditMiscClasses, - SynEditTextBuffer, SynEditTextBase; + SynEditTypes, SynEditMiscClasses, SynEditTextBase; {$DEFINE _Gp_MustEnhanceRegistry} {$IFDEF SYN_COMPILER_4_UP} @@ -258,7 +256,7 @@ type function GetEol: Boolean; virtual; abstract; function GetRange: Pointer; virtual; function GetToken: String; virtual; abstract; - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); virtual; abstract; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); virtual; abstract; function GetTokenAttribute: TSynHighlighterAttributes; virtual; abstract; function GetTokenKind: integer; virtual; abstract; function GetTokenPos: Integer; virtual; abstract; diff --git a/components/synedit/synedithighlighterfoldbase.pas b/components/synedit/synedithighlighterfoldbase.pas index 99b98d4292..1d029e4f67 100644 --- a/components/synedit/synedithighlighterfoldbase.pas +++ b/components/synedit/synedithighlighterfoldbase.pas @@ -38,8 +38,8 @@ uses {$ELSE} FileUtil, LCLProc, LCLIntf, LCLType, {$ENDIF} - SynEditHighlighter, SynEditTypes, SynEditMiscClasses, SynEditTextBuffer, - SynEditTextBase, AvgLvlTree; + SynEditHighlighter, SynEditTextBuffer, + AvgLvlTree; type @@ -160,8 +160,6 @@ type ); override; end; - TSynCustomHighlighterClass = class of TSynCustomFoldHighlighter; - { TSynCustomHighlighterRanges } TSynCustomHighlighterRanges = class diff --git a/components/synedit/syneditmarkup.pp b/components/synedit/syneditmarkup.pp index c9796245c2..1fa9a64375 100644 --- a/components/synedit/syneditmarkup.pp +++ b/components/synedit/syneditmarkup.pp @@ -26,7 +26,7 @@ unit SynEditMarkup; interface uses - Classes, SysUtils, Graphics, SynEditTextBase, SynEditTextBuffer, + Classes, SysUtils, Graphics, SynEditTextBase, SynEditMiscClasses, SynEditMiscProcs, Controls, SynEditHighlighter; type diff --git a/components/synedit/synedittextbase.pas b/components/synedit/synedittextbase.pas index 9502aadaec..21fb5038d4 100644 --- a/components/synedit/synedittextbase.pas +++ b/components/synedit/synedittextbase.pas @@ -26,7 +26,7 @@ unit SynEditTextBase; interface uses - Classes, SysUtils, LCLProc, SynEditTypes, SynEditMiscProcs, SynEditKeyCmds; + Classes, SysUtils, LCLProc, SynEditMiscProcs, SynEditKeyCmds; type TSynEditStrings = class; diff --git a/components/synedit/synedittextbuffer.pp b/components/synedit/synedittextbuffer.pp index 3d80e8a283..18989e2c42 100644 --- a/components/synedit/synedittextbuffer.pp +++ b/components/synedit/synedittextbuffer.pp @@ -43,7 +43,7 @@ interface uses Classes, SysUtils, SynEditTextBase, - FileUtil, LCLProc, FPCAdds, LCLIntf, LCLType, + FileUtil, LCLProc, LCLIntf, LCLType, SynEditTypes, SynEditMiscProcs; const diff --git a/components/synedit/synedittexttabexpander.pas b/components/synedit/synedittexttabexpander.pas index ac81520d97..381ea80dfe 100644 --- a/components/synedit/synedittexttabexpander.pas +++ b/components/synedit/synedittexttabexpander.pas @@ -27,7 +27,7 @@ interface uses LCLProc, - Classes, SysUtils, SynEditTextBase, SynEditTextBuffer, SynEditMiscProcs; + Classes, SysUtils, SynEditTextBase; const // Offset to add to LengthOfLine, if Line has no tabs. diff --git a/components/synedit/synedittexttrimmer.pas b/components/synedit/synedittexttrimmer.pas index a89c37ffad..107388d14e 100644 --- a/components/synedit/synedittexttrimmer.pas +++ b/components/synedit/synedittexttrimmer.pas @@ -28,7 +28,7 @@ interface uses LCLProc, - Classes, SysUtils, SynEditTypes, SynEditTextBase, SynEditTextBuffer, + Classes, SysUtils, SynEditTextBase, SynEditPointClasses, SynEditMiscProcs; type diff --git a/components/synedit/syngutterchanges.pas b/components/synedit/syngutterchanges.pas index bd882dc3b6..97398ad1c7 100644 --- a/components/synedit/syngutterchanges.pas +++ b/components/synedit/syngutterchanges.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, Graphics, LCLType, LCLIntf, SynGutterBase, - SynEditMiscProcs, SynEditMiscClasses, SynTextDrawer, SynEditFoldedView; + SynTextDrawer, SynEditFoldedView; type { TSynGutterChanges } diff --git a/components/synedit/synhighlighterany.pas b/components/synedit/synhighlighterany.pas index da5f2cb5d9..370bbcdd45 100644 --- a/components/synedit/synhighlighterany.pas +++ b/components/synedit/synhighlighterany.pas @@ -175,7 +175,7 @@ type function GetTokenID: TtkTokenKind; function GetToken: String; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -823,8 +823,8 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynAnySyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynAnySyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlightercpp.pp b/components/synedit/synhighlightercpp.pp index 631422cff5..303706b508 100644 --- a/components/synedit/synhighlightercpp.pp +++ b/components/synedit/synhighlightercpp.pp @@ -241,7 +241,7 @@ type procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber:Integer); override; function GetToken: String; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -1474,8 +1474,8 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynCppSyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynCppSyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlightercss.pas b/components/synedit/synhighlightercss.pas index 06f9fa83b9..1e5cdb7ec4 100644 --- a/components/synedit/synhighlightercss.pas +++ b/components/synedit/synhighlightercss.pas @@ -252,7 +252,7 @@ type procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer); override; function GetToken: string; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -1666,7 +1666,7 @@ end; {$IFDEF SYN_LAZARUS} -procedure TSynCssSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); +procedure TSynCssSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer); begin TokenLength:=Run-fTokenPos; diff --git a/components/synedit/synhighlighterhtml.pp b/components/synedit/synhighlighterhtml.pp index 869182998d..04de401214 100644 --- a/components/synedit/synhighlighterhtml.pp +++ b/components/synedit/synhighlighterhtml.pp @@ -420,7 +420,7 @@ type procedure SetLine(const NewValue: string; LineNumber:Integer); override; function GetToken: string; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -2223,8 +2223,8 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynHTMLSyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynHTMLSyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlighterjava.pas b/components/synedit/synhighlighterjava.pas index 9831946077..1207d1b6de 100644 --- a/components/synedit/synhighlighterjava.pas +++ b/components/synedit/synhighlighterjava.pas @@ -211,7 +211,7 @@ type LineNumber:Integer); override; function GetToken: String; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -1317,7 +1317,7 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynJavaSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer +procedure TSynJavaSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer ); begin TokenLength:=Run-fTokenPos; diff --git a/components/synedit/synhighlighterjscript.pas b/components/synedit/synhighlighterjscript.pas index a036ad2200..76fe018276 100644 --- a/components/synedit/synhighlighterjscript.pas +++ b/components/synedit/synhighlighterjscript.pas @@ -273,7 +273,7 @@ type function GetRange: Pointer; override; function GetTokenID: TtkTokenKind; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer); override; function GetToken: String; override; @@ -1788,7 +1788,7 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynJScriptSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); +procedure TSynJScriptSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlighterlfm.pas b/components/synedit/synhighlighterlfm.pas index ad574bf0bb..f5ff6eeec1 100644 --- a/components/synedit/synhighlighterlfm.pas +++ b/components/synedit/synhighlighterlfm.pas @@ -122,7 +122,7 @@ type LineNumber: Integer); override; function GetToken: String; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -515,8 +515,8 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynLFMSyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynLFMSyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlightermulti.pas b/components/synedit/synhighlightermulti.pas index 2de3d4c02e..50df17b495 100644 --- a/components/synedit/synhighlightermulti.pas +++ b/components/synedit/synhighlightermulti.pas @@ -177,7 +177,7 @@ type function GetRange: Pointer; override; function GetToken: string; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -376,8 +376,8 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynMultiSyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynMultiSyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin if DefaultHighlighter = nil then begin if fLine<>'' then begin diff --git a/components/synedit/synhighlighterpas.pp b/components/synedit/synhighlighterpas.pp index f7b8aa27a1..eb366bd101 100644 --- a/components/synedit/synhighlighterpas.pp +++ b/components/synedit/synhighlighterpas.pp @@ -58,7 +58,7 @@ uses Windows, Messages, {$ENDIF} Classes, Registry, Controls, Graphics, SynEditHighlighterFoldBase, SynEditMiscProcs, - SynEditTypes, SynEditHighlighter, SynEditTextBuffer, SynEditTextBase, + SynEditTypes, SynEditHighlighter, SynEditTextBuffer, SynEditStrConst; type @@ -408,7 +408,7 @@ type function GetRange: Pointer; override; function GetToken: string; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenID: TtkTokenKind; @@ -2234,7 +2234,7 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynPasSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); +procedure TSynPasSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer); begin TokenLength:=Run-fTokenPos; if TokenLength>0 then begin diff --git a/components/synedit/synhighlighterperl.pas b/components/synedit/synhighlighterperl.pas index 52f06dcc16..9d7954a3ea 100644 --- a/components/synedit/synhighlighterperl.pas +++ b/components/synedit/synhighlighterperl.pas @@ -375,7 +375,7 @@ type LineNumber:Integer); override; function GetToken: String; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -2547,8 +2547,8 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynPerlSyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynPerlSyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlighterphp.pas b/components/synedit/synhighlighterphp.pas index 1f197df888..70799e6539 100644 --- a/components/synedit/synhighlighterphp.pas +++ b/components/synedit/synhighlighterphp.pas @@ -210,7 +210,7 @@ type procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer); override; function GetToken: String; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; @@ -1427,7 +1427,7 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynPHPSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); +procedure TSynPHPSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlighterposition.pas b/components/synedit/synhighlighterposition.pas index ec0c5e0993..e067d37148 100644 --- a/components/synedit/synhighlighterposition.pas +++ b/components/synedit/synhighlighterposition.pas @@ -77,7 +77,7 @@ type function GetRange: Pointer; override; function GetToken: string; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -194,8 +194,8 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynPositionHighlighter.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynPositionHighlighter.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=fTokenEnd-fTokenPos; if TokenLength>0 then begin diff --git a/components/synedit/synhighlighterpython.pas b/components/synedit/synhighlighterpython.pas index 89d5eb78bc..78ddaa9ed3 100644 --- a/components/synedit/synhighlighterpython.pas +++ b/components/synedit/synhighlighterpython.pas @@ -162,7 +162,7 @@ type procedure SetRange(Value: Pointer); override; procedure ResetRange; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} published property CommentAttri: TSynHighlighterAttributes read fCommentAttri @@ -486,8 +486,8 @@ begin end; { SetLine } {$IFDEF SYN_LAZARUS} -procedure TSynPythonSyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynPythonSyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlightersql.pas b/components/synedit/synhighlightersql.pas index c6212b1abf..b0a75765c3 100644 --- a/components/synedit/synhighlightersql.pas +++ b/components/synedit/synhighlightersql.pas @@ -174,7 +174,7 @@ type function GetRange: Pointer; override; function GetToken: string; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; @@ -1459,7 +1459,7 @@ begin Setstring(Result, (FLine + fTokenPos), Len); end; {$IFDEF SYN_LAZARUS} -procedure TSynSQLSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); +procedure TSynSQLSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlightertex.pas b/components/synedit/synhighlightertex.pas index 03c7ee8d69..fffd2b8737 100644 --- a/components/synedit/synhighlightertex.pas +++ b/components/synedit/synhighlightertex.pas @@ -118,7 +118,7 @@ type LineNumber:Integer); override; function GetToken: String; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; @@ -340,7 +340,7 @@ begin end; { GetToken } {$IFDEF SYN_LAZARUS} -procedure TSynTeXSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); +procedure TSynTeXSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlighterunixshellscript.pas b/components/synedit/synhighlighterunixshellscript.pas index dbc1fad7de..f6c22d5c9e 100644 --- a/components/synedit/synhighlighterunixshellscript.pas +++ b/components/synedit/synhighlighterunixshellscript.pas @@ -137,7 +137,7 @@ type function IsSecondKeyWord(aToken: string): Boolean; function GetToken: string; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; /////TL: Added 2003-06-11 + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; /////TL: Added 2003-06-11 {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -717,8 +717,8 @@ end; ////TL 2003-06-11: Added the following to satisfy abstract method override {$IFDEF SYN_LAZARUS} -procedure TSynUNIXShellScriptSyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynUNIXShellScriptSyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlightervb.pas b/components/synedit/synhighlightervb.pas index 2df2a216eb..7e957a9185 100644 --- a/components/synedit/synhighlightervb.pas +++ b/components/synedit/synhighlightervb.pas @@ -212,7 +212,7 @@ type procedure SetLine({$IFDEF FPC} const {$ENDIF} NewValue: String; LineNumber: Integer); override; function GetToken: String; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -1202,8 +1202,8 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynVBSyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynVBSyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synhighlighterxml.pas b/components/synedit/synhighlighterxml.pas index dbe726bd0c..0dae058f40 100644 --- a/components/synedit/synhighlighterxml.pas +++ b/components/synedit/synhighlighterxml.pas @@ -159,7 +159,7 @@ type procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: string; LineNumber:Integer); override; function GetToken: string; override; {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenKind: integer; override; @@ -809,8 +809,8 @@ begin end; {$IFDEF SYN_LAZARUS} -procedure TSynXMLSyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynXMLSyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos; diff --git a/components/synedit/synpropertyeditobjectlist.lfm b/components/synedit/synpropertyeditobjectlist.lfm index 1b81ee006e..a19226faa9 100644 --- a/components/synedit/synpropertyeditobjectlist.lfm +++ b/components/synedit/synpropertyeditobjectlist.lfm @@ -1,7 +1,7 @@ object SynObjectPartListPropertyEditorForm: TSynObjectPartListPropertyEditorForm - Left = 207 + Left = 1772 Height = 300 - Top = 207 + Top = 92 Width = 190 ActiveControl = SynObjectPartsListBox BorderStyle = bsSizeToolWin @@ -25,7 +25,6 @@ object SynObjectPartListPropertyEditorForm: TSynObjectPartListPropertyEditorForm ButtonHeight = 40 ButtonWidth = 44 Caption = 'ToolBar1' - Ctl3D = False ShowCaptions = True TabOrder = 0 object AddButton: TToolButton @@ -80,7 +79,6 @@ object SynObjectPartListPropertyEditorForm: TSynObjectPartListPropertyEditorForm Align = alTop Anchors = [] AutoComplete = False - Ctl3D = False ItemHeight = 13 ItemWidth = 0 Style = csDropDownList diff --git a/components/synedit/synpropertyeditobjectlist.lrs b/components/synedit/synpropertyeditobjectlist.lrs index 79e4f30a65..8afce30dd4 100644 --- a/components/synedit/synpropertyeditobjectlist.lrs +++ b/components/synedit/synpropertyeditobjectlist.lrs @@ -2,29 +2,29 @@ LazarusResources.Add('TSynObjectPartListPropertyEditorForm','FORMDATA',[ 'TPF0$TSynObjectPartListPropertyEditorForm#SynObjectPartListPropertyEditorFor' - +'m'#4'Left'#3#207#0#6'Height'#3','#1#3'Top'#3#207#0#5'Width'#3#190#0#13'Acti' - +'veControl'#7#21'SynObjectPartsListBox'#11'BorderStyle'#7#13'bsSizeToolWin'#7 - +'Caption'#6'#SynObjectPartListPropertyEditorForm'#12'ClientHeight'#3','#1#11 + +'m'#4'Left'#3#236#6#6'Height'#3','#1#3'Top'#2'\'#5'Width'#3#190#0#13'ActiveC' + +'ontrol'#7#21'SynObjectPartsListBox'#11'BorderStyle'#7#13'bsSizeToolWin'#7'C' + +'aption'#6'#SynObjectPartListPropertyEditorForm'#12'ClientHeight'#3','#1#11 +'ClientWidth'#3#190#0#21'Constraints.MinHeight'#2'd'#20'Constraints.MinWidth' +#3#190#0#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#8'Posit' +'ion'#7#16'poDefaultPosOnly'#10'LCLVersion'#6#6'0.9.27'#0#8'TToolBar'#8'Tool' +'Bar1'#21'AnchorSideTop.Control'#7#13'ClassComboBox'#18'AnchorSideTop.Side'#7 +#9'asrBottom'#4'Left'#2#0#6'Height'#2'*'#3'Top'#2#0#5'Width'#3#190#0#8'AutoS' - +'ize'#9#12'ButtonHeight'#2'('#11'ButtonWidth'#2','#7'Caption'#6#8'ToolBar1'#5 - +'Ctl3D'#8#12'ShowCaptions'#9#8'TabOrder'#2#0#0#11'TToolButton'#9'AddButton'#4 - +'Left'#2#1#3'Top'#2#2#7'Caption'#6#3'Add'#7'OnClick'#7#14'AddButtonClick'#0#0 - +#11'TToolButton'#12'DeleteButton'#4'Left'#2'-'#3'Top'#2#2#7'Caption'#6#6'Del' - +'ete'#7'OnClick'#7#17'DeleteButtonClick'#0#0#11'TToolButton'#11'ToolButton3' - +#4'Left'#2'Y'#3'Top'#2#2#5'Width'#2#10#7'Caption'#6#11'ToolButton3'#5'Style' - +#7#12'tbsSeparator'#0#0#11'TToolButton'#12'MoveUpButton'#4'Left'#2'c'#3'Top' - +#2#2#7'Caption'#6#2'Up'#7'OnClick'#7#17'MoveUpButtonClick'#0#0#11'TToolButto' - +'n'#14'MoveDownButton'#4'Left'#3#143#0#3'Top'#2#2#7'Caption'#6#4'Down'#7'OnC' - +'lick'#7#19'MoveDownButtonClick'#0#0#0#8'TListBox'#21'SynObjectPartsListBox' - +#4'Left'#2#0#6'Height'#3#237#0#3'Top'#2'?'#5'Width'#3#190#0#5'Align'#7#8'alC' - +'lient'#10'ItemHeight'#2#0#7'OnClick'#7#26'SynObjectPartsListBoxClick'#8'Tab' - +'Order'#2#1#0#0#9'TComboBox'#13'ClassComboBox'#21'AnchorSideTop.Control'#7#8 - +'ToolBar1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#21#3 - +'Top'#2'*'#5'Width'#3#190#0#5'Align'#7#5'alTop'#7'Anchors'#11#0#12'AutoCompl' - +'ete'#8#5'Ctl3D'#8#10'ItemHeight'#2#13#9'ItemWidth'#2#0#5'Style'#7#14'csDrop' - +'DownList'#8'TabOrder'#2#2#0#0#0 + +'ize'#9#12'ButtonHeight'#2'('#11'ButtonWidth'#2','#7'Caption'#6#8'ToolBar1' + +#12'ShowCaptions'#9#8'TabOrder'#2#0#0#11'TToolButton'#9'AddButton'#4'Left'#2 + +#1#3'Top'#2#2#7'Caption'#6#3'Add'#7'OnClick'#7#14'AddButtonClick'#0#0#11'TTo' + +'olButton'#12'DeleteButton'#4'Left'#2'-'#3'Top'#2#2#7'Caption'#6#6'Delete'#7 + +'OnClick'#7#17'DeleteButtonClick'#0#0#11'TToolButton'#11'ToolButton3'#4'Left' + +#2'Y'#3'Top'#2#2#5'Width'#2#10#7'Caption'#6#11'ToolButton3'#5'Style'#7#12'tb' + +'sSeparator'#0#0#11'TToolButton'#12'MoveUpButton'#4'Left'#2'c'#3'Top'#2#2#7 + +'Caption'#6#2'Up'#7'OnClick'#7#17'MoveUpButtonClick'#0#0#11'TToolButton'#14 + +'MoveDownButton'#4'Left'#3#143#0#3'Top'#2#2#7'Caption'#6#4'Down'#7'OnClick'#7 + +#19'MoveDownButtonClick'#0#0#0#8'TListBox'#21'SynObjectPartsListBox'#4'Left' + +#2#0#6'Height'#3#237#0#3'Top'#2'?'#5'Width'#3#190#0#5'Align'#7#8'alClient'#10 + +'ItemHeight'#2#0#7'OnClick'#7#26'SynObjectPartsListBoxClick'#8'TabOrder'#2#1 + +#0#0#9'TComboBox'#13'ClassComboBox'#21'AnchorSideTop.Control'#7#8'ToolBar1' + +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#21#3'Top'#2'*' + +#5'Width'#3#190#0#5'Align'#7#5'alTop'#7'Anchors'#11#0#12'AutoComplete'#8#10 + +'ItemHeight'#2#13#9'ItemWidth'#2#0#5'Style'#7#14'csDropDownList'#8'TabOrder' + +#2#2#0#0#0 ]); diff --git a/components/synedit/synpropertyeditobjectlist.pas b/components/synedit/synpropertyeditobjectlist.pas index 6123a71ae5..8d89faff89 100644 --- a/components/synedit/synpropertyeditobjectlist.pas +++ b/components/synedit/synpropertyeditobjectlist.pas @@ -24,7 +24,7 @@ interface uses Classes, SysUtils, LCLProc, - SynGutter, SynGutterBase, SynEditMiscClasses, + SynGutterBase, SynEditMiscClasses, LResources, PropEdits, Forms, StdCtrls, ComCtrls, Dialogs, ObjInspStrConsts, Controls, IDEImagesIntf, typinfo; diff --git a/components/synunihighlighter/synunihighlighter.pas b/components/synunihighlighter/synunihighlighter.pas index c9095b7d3a..74a779f9c2 100644 --- a/components/synunihighlighter/synunihighlighter.pas +++ b/components/synunihighlighter/synunihighlighter.pas @@ -343,7 +343,7 @@ type function GetToken: string; override; ////TL Added the following 3 lines... and the implementation procedure {$IFDEF SYN_LAZARUS} - procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; ////TL: Added 2003-06-11 + procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; ////TL: Added 2003-06-11 {$ENDIF} function GetTokenAttribute: TSynHighlighterAttributes; override; @@ -1718,8 +1718,8 @@ end; ////TL 2003-06-12: Added the following to satisfy abstract method override {$IFDEF SYN_LAZARUS} -procedure TSynUniSyn.GetTokenEx(var TokenStart: PChar; - var TokenLength: integer); +procedure TSynUniSyn.GetTokenEx(out TokenStart: PChar; + out TokenLength: integer); begin TokenLength:=Run-fTokenPos; TokenStart:=FLine + fTokenPos;