diff options
author | Andrew <andrewd207@aol.com> | 2010-03-11 09:56:30 +0200 |
---|---|---|
committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2010-03-11 09:56:30 +0200 |
commit | 858789d00c5d5ef376cad08b6dce4385a6f7699c (patch) | |
tree | d1f0142b805cb287b5c7c871076d93680b70b979 | |
parent | f96c9ed67347181166e21d99a632c864a06b35d9 (diff) | |
download | fpGUI-858789d00c5d5ef376cad08b6dce4385a6f7699c.tar.xz |
fixes compilation for docview and fpc 2.5.1
Not sure when it became the case but it makes sense that var parameters
must use the exact type and not a descendant class. This patch puts that
into effect.
-rw-r--r-- | docview/components/richtext/ACLStringUtility.pas | 2 | ||||
-rw-r--r-- | docview/components/richtext/RichTextStyleUnit.pas | 2 | ||||
-rw-r--r-- | docview/src/HelpFile.pas | 4 | ||||
-rw-r--r-- | docview/src/HelpTopic.pas | 30 | ||||
-rw-r--r-- | docview/src/SearchUnit.pas | 4 | ||||
-rw-r--r-- | docview/src/TextSearchQuery.pas | 2 | ||||
-rw-r--r-- | docview/src/nvUtilities.pas | 6 |
7 files changed, 25 insertions, 25 deletions
diff --git a/docview/components/richtext/ACLStringUtility.pas b/docview/components/richtext/ACLStringUtility.pas index f60aeed0..5ddcb2b7 100644 --- a/docview/components/richtext/ACLStringUtility.pas +++ b/docview/components/richtext/ACLStringUtility.pas @@ -31,7 +31,7 @@ type TSerializableStringList = class(TObject) private - stringList: TStringList; + stringList: TStrings; public constructor Create; destructor Destroy; override; diff --git a/docview/components/richtext/RichTextStyleUnit.pas b/docview/components/richtext/RichTextStyleUnit.pas index ff70c0d0..64612b0e 100644 --- a/docview/components/richtext/RichTextStyleUnit.pas +++ b/docview/components/richtext/RichTextStyleUnit.pas @@ -158,7 +158,7 @@ var ParseIndex: longint; XSizeStr: string; YSizeStr: string; - tmpFontParts : TStringList; + tmpFontParts : TStrings; MarginSize: longint; ParsePoint: longint; diff --git a/docview/src/HelpFile.pas b/docview/src/HelpFile.pas index af4a2cb9..acba5b14 100644 --- a/docview/src/HelpFile.pas +++ b/docview/src/HelpFile.pas @@ -1151,9 +1151,9 @@ var H: longint; i: longint; pFontSpec: pTHelpFontSpec; - tmpSubstitutionItems : TStringList; + tmpSubstitutionItems : TStrings; tmpCounter : integer; - tmpDimensionParts : TStringList; + tmpDimensionParts : TStrings; s: string; PointSize: word; cp: integer; diff --git a/docview/src/HelpTopic.pas b/docview/src/HelpTopic.pas index 13dbbc63..e925dd38 100644 --- a/docview/src/HelpTopic.pas +++ b/docview/src/HelpTopic.pas @@ -559,7 +559,7 @@ var SubEscapeCode: uint8; BitmapOffset: longword; BitmapFlags: uint8; - Link: TInternalHelpLink; + Link: THelpLink;//TInternalHelpLink; LinkTopicIndex: integer; begin LinkTopicIndex := -1; @@ -605,10 +605,10 @@ begin // Don't make it a link if we didn't find a // overall link code, i.e. degrade gracefully. if LinkTopicIndex > -1 then - begin + begin if CreateLink( State.LinkIndex, Link, TInternalHelpLink ) then begin - Link.TopicIndex := LinkTopicIndex; + TInternalHelpLink(Link).TopicIndex := LinkTopicIndex; end; OutputString := GetBeginLink( State.LinkIndex ) @@ -838,9 +838,9 @@ var EscapeLen: uint8; EscapeCode: uint8; - Link: TInternalHelpLink; - FootnoteLink: TFootnoteHelpLink; - LinkByResourceID: THelpLinkByResourceID; + Link: THelpLink; //TInternalHelpLink; + FootnoteLink: THelpLink; //TFootnoteHelpLink; + LinkByResourceID: THelpLink; //THelpLinkByResourceID; Margin: integer; @@ -864,7 +864,7 @@ var ProgramPath: string; ProgramFilename: string; ProgramInfo : TSerializableStringList; - tmpProgramLinkParts : TStringList; + tmpProgramLinkParts : TStrings; OutputString: string; begin @@ -932,17 +932,17 @@ begin CheckForAutoURL( AText, State ); if CreateLink( State.LinkIndex, Link, TInternalHelpLink ) then begin - Link.TopicIndex := pUInt16( pData + 2 )^; + TInternalHelpLink(Link).TopicIndex := pUInt16( pData + 2 )^; if EscapeLen >= 6 then begin - GetExtraLinkData( Link, pData + 4 ); + GetExtraLinkData( TInternalHelpLink(Link), pData + 4 ); end; end; // If it's not an automatic link // then put code in to show it. - if not Link.Automatic then + if not TInternalHelpLink(Link).Automatic then begin OutputString := '<blue>' + GetBeginLink( State.LinkIndex ); @@ -956,8 +956,8 @@ begin CheckForAutoURL( AText, State ); if CreateLink( State.LinkIndex, FootnoteLink, TFootnoteHelpLink ) then begin - FootnoteLink.TopicIndex := pUInt16( pData + 2 )^; - State.FootnoteLink := FootnoteLink; + TFootnoteHelpLink(FootnoteLink).TopicIndex := pUInt16( pData + 2 )^; + State.FootnoteLink := TFootnoteHelpLink(FootnoteLink); end; OutputString := '<blue>' + GetBeginLink( State.LinkIndex ); @@ -970,11 +970,11 @@ begin CheckForAutoURL( AText, State ); if CreateLink( State.LinkIndex, LinkByResourceID, THelpLinkByResourceID ) then begin - LinkByResourceID.ResourceID := pUInt16( pData + 2 )^; + THelpLinkByResourceID(LinkByResourceID).ResourceID := pUInt16( pData + 2 )^; if EscapeLen >= 6 then begin - GetExtraLinkData( LinkByResourceID, pData + 4 ); + GetExtraLinkData( THelpLinkByResourceID(LinkByResourceID), pData + 4 ); end; end; @@ -2219,7 +2219,7 @@ var ProgramLink: string; ProgramPath: string; - tmpProgramLinkParts : TStringList; + tmpProgramLinkParts : TStrings; OutputString: string; begin diff --git a/docview/src/SearchUnit.pas b/docview/src/SearchUnit.pas index d8f9c6d6..f7a8eb8e 100644 --- a/docview/src/SearchUnit.pas +++ b/docview/src/SearchUnit.pas @@ -202,7 +202,7 @@ var TitleWordIndex: longint; WordRelevance: longint; TitleWordRelevance: longint; - tmpTitleWords : TStringList; + tmpTitleWords : TStrings; i : integer; begin tmpTitleWords := TStringList.Create; @@ -258,7 +258,7 @@ var IndexEntryWordIndex: longint; WordRelevance: longint; IndexEntryWordRelevance: longint; - tmpIndexWords : TStringList; + tmpIndexWords : TStrings; i : integer; begin tmpIndexWords := TStringList.Create; diff --git a/docview/src/TextSearchQuery.pas b/docview/src/TextSearchQuery.pas index 444b27f1..3a8037a2 100644 --- a/docview/src/TextSearchQuery.pas +++ b/docview/src/TextSearchQuery.pas @@ -66,7 +66,7 @@ var TermText: string; CombineMethod: TSearchTermCombineMethod; lTerm: TSearchTerm; - tmpTerms : TStringList; + tmpTerms : TStrings; i : integer; begin inherited Create; diff --git a/docview/src/nvUtilities.pas b/docview/src/nvUtilities.pas index aed9d392..8dc928a1 100644 --- a/docview/src/nvUtilities.pas +++ b/docview/src/nvUtilities.pas @@ -118,7 +118,7 @@ uses Procedure SetLogAspects(const aCommaSeparatedListOfAspectNames : String); Var - tmpAspects : TStringList; + tmpAspects : TStrings; i : Integer; Begin tmpAspects := TStringList.Create; @@ -322,7 +322,7 @@ var tmpRC: longint; tmpSearchResults: TSearchRec; tmpMask: String; - tmpFilterParts : TStringList; + tmpFilterParts : TStrings; tmpDirectory: String; i: integer; begin @@ -357,7 +357,7 @@ end; procedure ParseAndExpandFileNames(const aFileNameString: String; aResult: TStrings); var i: longint; - tmpFileNamesList: TStringList; + tmpFileNamesList: TStrings; tmpItem: String; tmpEnvironmentVarValue: string; begin |