From 323352579d6309e3a4adb7475f220835b678602d Mon Sep 17 00:00:00 2001 From: juha Date: Thu, 5 Oct 2017 16:37:05 +0000 Subject: [PATCH] IDE: Use local variable FStringTable instead of global property in ProjectVersionInfo. git-svn-id: trunk@55978 - --- ide/w32versioninfo.pas | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ide/w32versioninfo.pas b/ide/w32versioninfo.pas index dc8eee0bd6..f142286d8b 100644 --- a/ide/w32versioninfo.pas +++ b/ide/w32versioninfo.pas @@ -446,10 +446,10 @@ begin // write string info DeletePath(Path + 'VersionInfo/StringTable'); - for i := 0 to StringTable.Count - 1 do begin - Key:=StringTable.Keys[i]; + for i := 0 to FStringTable.Count - 1 do begin + Key:=FStringTable.Keys[i]; if Key='FileVersion' then continue; // FileVersion is created automatically - SetDeleteValue(Path + 'VersionInfo/StringTable/' + Key, StringTable.ValuesByIndex[i], ''); + SetDeleteValue(Path + 'VersionInfo/StringTable/' + Key, FStringTable.ValuesByIndex[i], ''); end; end; end; @@ -492,24 +492,24 @@ begin Node := FindNode(Path + 'VersionInfo/StringTable', False); if Assigned(Node) then begin - StringTable.Clear; + FStringTable.Clear; for i := 0 to Node.Attributes.Length - 1 do - StringTable[Node.Attributes[i].NodeName] := Node.Attributes[i].NodeValue; - StringTable.AddRequired; + FStringTable[Node.Attributes[i].NodeName] := Node.Attributes[i].NodeValue; + FStringTable.AddRequired; end else begin // read old info - StringTable['Comments'] := GetValue(Path + 'VersionInfo/Comments/Value', ''); - StringTable['CompanyName'] := GetValue(Path + 'VersionInfo/CompanyName/Value', ''); - StringTable['FileDescription'] := GetValue(Path + 'VersionInfo/FileDescription/Value', ''); - // StringTable['FileVersion'] := BuildFileVersionString; // not needed due to SetFileVersionFromVersion - StringTable['InternalName'] := GetValue(Path + 'VersionInfo/InternalName/Value', ''); - StringTable['LegalCopyright'] := GetValue(Path + 'VersionInfo/LegalCopyright/Value', ''); - StringTable['LegalTrademarks'] := GetValue(Path + 'VersionInfo/LegalTrademarks/Value', ''); - StringTable['OriginalFilename'] := GetValue(Path + 'VersionInfo/OriginalFilename/Value', ''); - StringTable['ProductName'] := GetValue(Path + 'VersionInfo/ProductName/Value', ''); - StringTable['ProductVersion'] := GetValue(Path + 'VersionInfo/ProductVersion/Value', ''); + FStringTable['Comments'] := GetValue(Path + 'VersionInfo/Comments/Value', ''); + FStringTable['CompanyName'] := GetValue(Path + 'VersionInfo/CompanyName/Value', ''); + FStringTable['FileDescription'] := GetValue(Path + 'VersionInfo/FileDescription/Value', ''); + // FStringTable['FileVersion'] := BuildFileVersionString; // not needed due to SetFileVersionFromVersion + FStringTable['InternalName'] := GetValue(Path + 'VersionInfo/InternalName/Value', ''); + FStringTable['LegalCopyright'] := GetValue(Path + 'VersionInfo/LegalCopyright/Value', ''); + FStringTable['LegalTrademarks'] := GetValue(Path + 'VersionInfo/LegalTrademarks/Value', ''); + FStringTable['OriginalFilename'] := GetValue(Path + 'VersionInfo/OriginalFilename/Value', ''); + FStringTable['ProductName'] := GetValue(Path + 'VersionInfo/ProductName/Value', ''); + FStringTable['ProductVersion'] := GetValue(Path + 'VersionInfo/ProductVersion/Value', ''); end; SetFileVersionFromVersion; @@ -603,7 +603,7 @@ var S, Part: string; i, p: integer; begin - S := StringTable['ProductVersion']; + S := FStringTable['ProductVersion']; for i := 0 to 3 do begin p := Pos('.', S);