From 03de26cc1f63ba403c8d5c6d06b0f2dbf3089ff2 Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 25 Jan 2012 23:53:40 +0000 Subject: [PATCH] SynEdit clean up git-svn-id: trunk@34942 - --- components/synedit/synedithighlighterxmlbase.pas | 2 +- components/synedit/syneditmarkup.pp | 2 +- components/synedit/synhighlighterdiff.pas | 2 +- components/synedit/synhighlighterlfm.pas | 2 +- components/synedit/synhighlighterpas.pp | 3 +-- components/synedit/synmacrorecorder.pas | 1 - components/synedit/synpluginsyncroedit.pp | 2 +- components/synedit/synpluginsyncronizededitbase.pp | 2 +- components/synedit/synplugintemplateedit.pp | 4 ++-- components/synedit/synregexpr.pas | 8 ++++---- 10 files changed, 13 insertions(+), 15 deletions(-) diff --git a/components/synedit/synedithighlighterxmlbase.pas b/components/synedit/synedithighlighterxmlbase.pas index 780de60b73..05c2fd1cec 100644 --- a/components/synedit/synedithighlighterxmlbase.pas +++ b/components/synedit/synedithighlighterxmlbase.pas @@ -31,7 +31,7 @@ interface uses SysUtils, Classes, math, LCLType, - SynEditTypes, SynEditTextBase, SynEditTextBuffer, + SynEditTextBase, SynEditHighlighter, SynEditHighlighterFoldBase; type diff --git a/components/synedit/syneditmarkup.pp b/components/synedit/syneditmarkup.pp index a7e722ccf1..5e4360258c 100644 --- a/components/synedit/syneditmarkup.pp +++ b/components/synedit/syneditmarkup.pp @@ -27,7 +27,7 @@ interface uses Classes, SysUtils, Graphics, SynEditTypes, LazSynEditText, SynEditPointClasses, - SynEditMiscClasses, SynEditMiscProcs, Controls, SynEditHighlighter, LCLProc; + SynEditMiscClasses, Controls, SynEditHighlighter, LCLProc; type diff --git a/components/synedit/synhighlighterdiff.pas b/components/synedit/synhighlighterdiff.pas index a4bc583810..2cc5e8915f 100644 --- a/components/synedit/synhighlighterdiff.pas +++ b/components/synedit/synhighlighterdiff.pas @@ -35,7 +35,7 @@ interface uses Classes, Graphics, math, - SynEditTextBuffer, SynEditHighlighter, SynEditHighlighterFoldBase; + SynEditHighlighter, SynEditHighlighterFoldBase; type TtkTokenKind = (tkNull, tkUnknown, tkSpace, diff --git a/components/synedit/synhighlighterlfm.pas b/components/synedit/synhighlighterlfm.pas index 52ef4fc469..b53bc7305d 100644 --- a/components/synedit/synhighlighterlfm.pas +++ b/components/synedit/synhighlighterlfm.pas @@ -50,7 +50,7 @@ interface uses SysUtils, Classes, FileUtil, Graphics, - SynEditTextBuffer, SynEditTypes, SynEditHighlighter, SynEditHighlighterFoldBase; + SynEditTypes, SynEditHighlighter, SynEditHighlighterFoldBase; type TtkTokenKind = (tkComment, tkIdentifier, tkKey, tkNull, tkNumber, tkSpace, diff --git a/components/synedit/synhighlighterpas.pp b/components/synedit/synhighlighterpas.pp index 50228ad4fb..9451bd73ca 100644 --- a/components/synedit/synhighlighterpas.pp +++ b/components/synedit/synhighlighterpas.pp @@ -58,8 +58,7 @@ uses Windows, Messages, {$ENDIF} Classes, Registry, Graphics, SynEditHighlighterFoldBase, SynEditMiscProcs, - SynEditTypes, SynEditHighlighter, SynEditTextBase, SynEditTextBuffer, - SynEditStrConst; + SynEditTypes, SynEditHighlighter, SynEditTextBase, SynEditStrConst; type TSynPasStringMode = (spsmDefault, spsmStringOnly, spsmNone); diff --git a/components/synedit/synmacrorecorder.pas b/components/synedit/synmacrorecorder.pas index acfe6f2d66..01fc13b577 100644 --- a/components/synedit/synmacrorecorder.pas +++ b/components/synedit/synmacrorecorder.pas @@ -53,7 +53,6 @@ uses QGraphics, QMenus, {$ELSE} - StdCtrls, Controls, {$IFDEF SYN_LAZARUS} {$IFDEF USE_UTF8BIDI_LCL} diff --git a/components/synedit/synpluginsyncroedit.pp b/components/synedit/synpluginsyncroedit.pp index 1f773b64e4..79ae144c7a 100644 --- a/components/synedit/synpluginsyncroedit.pp +++ b/components/synedit/synpluginsyncroedit.pp @@ -26,7 +26,7 @@ unit SynPluginSyncroEdit; interface uses - Classes, Controls, SysUtils, math, LCLProc, Forms, Graphics, SynEditMiscClasses, + Classes, Controls, SysUtils, LCLProc, Forms, Graphics, SynEditMiscClasses, LCLType, SynEdit, SynPluginSyncronizedEditBase, LazSynEditText, SynEditMiscProcs, SynEditMouseCmds, SynEditKeyCmds, SynEditTypes, LCLIntf; diff --git a/components/synedit/synpluginsyncronizededitbase.pp b/components/synedit/synpluginsyncronizededitbase.pp index 3e64995c7b..356a2d3010 100644 --- a/components/synedit/synpluginsyncronizededitbase.pp +++ b/components/synedit/synpluginsyncronizededitbase.pp @@ -26,7 +26,7 @@ unit SynPluginSyncronizedEditBase; interface uses - Classes, SysUtils, math, Graphics, LCLProc, SynEditTextBase, + Classes, SysUtils, Graphics, LCLProc, SynEditTextBase, SynEditMiscClasses, SynEdit, SynEditMarkup, SynEditMiscProcs, LazSynEditText, SynEditTextTrimmer, SynEditKeyCmds; diff --git a/components/synedit/synplugintemplateedit.pp b/components/synedit/synplugintemplateedit.pp index d045a634fc..cb4a2be510 100644 --- a/components/synedit/synplugintemplateedit.pp +++ b/components/synedit/synplugintemplateedit.pp @@ -26,9 +26,9 @@ unit SynPluginTemplateEdit; interface uses - Classes, SysUtils, math, Graphics, LCLType, SynEditMiscClasses, + Classes, SysUtils, Graphics, LCLType, SynPluginSyncronizedEditBase, SynEditKeyCmds, SynEdit, SynEditMiscProcs, - LazSynEditText, LCLProc; + LCLProc; type diff --git a/components/synedit/synregexpr.pas b/components/synedit/synregexpr.pas index 61248c0b65..038f1f2b48 100644 --- a/components/synedit/synregexpr.pas +++ b/components/synedit/synregexpr.pas @@ -306,7 +306,7 @@ type function GetModifierStr : RegExprString; class function ParseModifiersStr (const AModifiers : RegExprString; - out AModifiersInt : integer) : boolean; //###0.941 class function now + var AModifiersInt : integer) : boolean; //###0.941 class function now // Parse AModifiers string and return true and set AModifiersInt // if it's in format 'ismxrg-ismxrg'. procedure SetModifierStr (const AModifiers : RegExprString); @@ -343,7 +343,7 @@ type function ParseReg (paren : integer; out flagp : integer) : PRegExprChar; // regular expression, i.e. main body or parenthesized thing - function ParseBranch (var flagp : integer) : PRegExprChar; + function ParseBranch (out flagp : integer) : PRegExprChar; // one alternative of an | operator function ParsePiece (var flagp : integer) : PRegExprChar; @@ -1328,7 +1328,7 @@ function TRegExpr.GetModifierStr : RegExprString; --------------------------------------------------------------} class function TRegExpr.ParseModifiersStr (const AModifiers : RegExprString; -out AModifiersInt : integer) : boolean; +var AModifiersInt : integer) : boolean; // !!! Be carefull - this is class function and must not use object instance fields var i : integer; @@ -1831,7 +1831,7 @@ function TRegExpr.ParseReg (paren : integer; out flagp : integer) : PRegExprChar end; { of function TRegExpr.ParseReg --------------------------------------------------------------} -function TRegExpr.ParseBranch (var flagp : integer) : PRegExprChar; +function TRegExpr.ParseBranch (out flagp : integer) : PRegExprChar; // one alternative of an | operator // Implements the concatenation operator. var