From 4733d3b7a1dcb69ac14dcfcb53e29bfd4658da17 Mon Sep 17 00:00:00 2001 From: juha Date: Fri, 5 Feb 2021 20:07:12 +0000 Subject: [PATCH] Fix compilation with FPC 3.0.4. git-svn-id: trunk@64498 - --- components/codetools/finddeclarationtool.pas | 2 +- components/ideintf/changeparentdlg.pas | 2 +- components/ideintf/componentreg.pas | 4 ++-- components/ideintf/frmselectprops.pas | 2 +- components/ideintf/propedits.pp | 2 +- components/jcf2/Parse/AsmKeywords.pas | 4 ++-- .../jcf2/Parse/PreProcessor/PreProcessorParseTree.pas | 4 ++-- components/jcf2/Settings/JcfRegistrySettings.pas | 6 +++--- components/jcf2/Settings/SetAnyWordCaps.pas | 4 ++-- components/jcf2/Settings/SetClarify.pas | 6 +++--- components/jcf2/Settings/SetPreProcessor.pas | 6 +++--- components/jcf2/Settings/SetReplace.pas | 6 +++--- components/jcf2/Settings/SetWordList.pas | 4 ++-- components/lazdebuggergdbmi/gdbmidebugger.pp | 4 ++-- components/synedit/synhighlighterany.pas | 2 +- components/synedit/synhighlighterpas.pp | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas index 7af01913f4..666c4be8b1 100644 --- a/components/codetools/finddeclarationtool.pas +++ b/components/codetools/finddeclarationtool.pas @@ -1575,7 +1575,7 @@ begin inherited; FResults := TStringList.Create; FResults.CaseSensitive := True; // Why CaseSensitive? - FResults.UseLocale := False; + {$IF FPC_FULLVERSION>=30200}FResults.UseLocale := False;{$ENDIF} FResults.Duplicates := dupIgnore; FResults.Sorted := True; end; diff --git a/components/ideintf/changeparentdlg.pas b/components/ideintf/changeparentdlg.pas index cb6a21e256..6d19deced9 100644 --- a/components/ideintf/changeparentdlg.pas +++ b/components/ideintf/changeparentdlg.pas @@ -231,7 +231,7 @@ var begin ControlsCount := 0; CurParentNameList := TStringList.Create; - CurParentNameList.UseLocale := False; + {$IF FPC_FULLVERSION>=30200}CurParentNameList.UseLocale := False;{$ENDIF} for i:=0 to ASelection.Count-1 do if ASelection.Items[i] is TControl then diff --git a/components/ideintf/componentreg.pas b/components/ideintf/componentreg.pas index baa0fffa22..c9ca9b2201 100644 --- a/components/ideintf/componentreg.pas +++ b/components/ideintf/componentreg.pas @@ -802,12 +802,12 @@ begin fComponentCache:=TAVLTree.Create(@CompareIDEComponentByClass); fOrigComponentPageCache:=TStringList.Create; fOrigComponentPageCache.OwnsObjects:=True; - fOrigComponentPageCache.UseLocale:=False; + {$IF FPC_FULLVERSION>=30200}fOrigComponentPageCache.UseLocale:=False;{$ENDIF} fOrigComponentPageCache.CaseSensitive:=True; fOrigComponentPageCache.Sorted:=True; fUserComponentPageCache:=TStringList.Create; fUserComponentPageCache.OwnsObjects:=True; - fUserComponentPageCache.UseLocale:=False; + {$IF FPC_FULLVERSION>=30200}fUserComponentPageCache.UseLocale:=False;{$ENDIF} fUserComponentPageCache.CaseSensitive:=True; fUserComponentPageCache.Sorted:=True; fOrigPageHelper:=TStringListUTF8Fast.Create; // Note: CaseSensitive = False diff --git a/components/ideintf/frmselectprops.pas b/components/ideintf/frmselectprops.pas index 757a4cc69d..21811a6801 100644 --- a/components/ideintf/frmselectprops.pas +++ b/components/ideintf/frmselectprops.pas @@ -141,7 +141,7 @@ var begin //debugln('TSelectPropertiesForm.SetSelectedProps'); L:=TStringList.Create; - L.UseLocale:=False; + {$IF FPC_FULLVERSION>=30200}L.UseLocale:=False;{$ENDIF} Try L.Delimiter:=';'; L.DelimitedText:=AValue; diff --git a/components/ideintf/propedits.pp b/components/ideintf/propedits.pp index acda35322f..ec9906dd1f 100644 --- a/components/ideintf/propedits.pp +++ b/components/ideintf/propedits.pp @@ -2735,7 +2735,7 @@ var begin if not AutoFill then Exit; Values:=TStringList.Create; - Values.UseLocale := False; + {$IF FPC_FULLVERSION>=30200}Values.UseLocale := False;{$ENDIF} Values.Sorted:=paSortList in GetAttributes; try AddValue := @Values.Add; diff --git a/components/jcf2/Parse/AsmKeywords.pas b/components/jcf2/Parse/AsmKeywords.pas index 2f5ddf4ce0..18f65f02cb 100644 --- a/components/jcf2/Parse/AsmKeywords.pas +++ b/components/jcf2/Parse/AsmKeywords.pas @@ -52,8 +52,8 @@ begin ... } - mcWords := TStringList.Create(); - mcWords.UseLocale := False; // Will compare with CompareText. + mcWords := TStringList.Create(); // Will compare with CompareText. + {$IF FPC_FULLVERSION>=30200}mcWords.UseLocale := False;{$ENDIF} mcWords.Add('RAX'); mcWords.Add('EAX'); diff --git a/components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas b/components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas index da1eae3014..64814ba581 100644 --- a/components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas +++ b/components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas @@ -160,8 +160,8 @@ begin fiCurrentTokenIndex := 0; - fcDefinedSymbols := TStringList.Create; - fcDefinedSymbols.UseLocale := False; // Will compare with CompareText. + fcDefinedSymbols := TStringList.Create; // Will compare with CompareText. + {$IF FPC_FULLVERSION>=30200}fcDefinedSymbols.UseLocale := False;{$ENDIF} fcDefinedSymbols.Sorted := True; fcDefinedSymbols.Duplicates := dupIgnore; diff --git a/components/jcf2/Settings/JcfRegistrySettings.pas b/components/jcf2/Settings/JcfRegistrySettings.pas index 16492851ab..b9bc2b3d5d 100644 --- a/components/jcf2/Settings/JcfRegistrySettings.pas +++ b/components/jcf2/Settings/JcfRegistrySettings.pas @@ -279,10 +279,10 @@ begin // New registry location fcReg := TRegIniFile.Create(REG_ROOT_KEY); - fcExclusionsFiles := TStringList.Create; - fcExclusionsFiles.UseLocale := False; // Will compare with CompareText. + fcExclusionsFiles := TStringList.Create; // Will compare with CompareText. + {$IF FPC_FULLVERSION>=30200}fcExclusionsFiles.UseLocale := False;{$ENDIF} fcExclusionsDirs := TStringList.Create; - fcExclusionsDirs.UseLocale := False; + {$IF FPC_FULLVERSION>=30200}fcExclusionsDirs.UseLocale := False;{$ENDIF} end; destructor TJCFRegistrySettings.Destroy; diff --git a/components/jcf2/Settings/SetAnyWordCaps.pas b/components/jcf2/Settings/SetAnyWordCaps.pas index 88236a5dd5..af5de08640 100644 --- a/components/jcf2/Settings/SetAnyWordCaps.pas +++ b/components/jcf2/Settings/SetAnyWordCaps.pas @@ -133,8 +133,8 @@ begin inherited; SetSection('SpecificWordCaps'); - fcWords := TStringList.Create; - fcWords.UseLocale := False; // Will compare with CompareText. + fcWords := TStringList.Create; // Will compare with CompareText. + {$IF FPC_FULLVERSION>=30200}fcWords.UseLocale := False;{$ENDIF} fcWords.Duplicates := dupIgnore; end; diff --git a/components/jcf2/Settings/SetClarify.pas b/components/jcf2/Settings/SetClarify.pas index 28d392ab96..993de6cc3c 100644 --- a/components/jcf2/Settings/SetClarify.pas +++ b/components/jcf2/Settings/SetClarify.pas @@ -88,12 +88,12 @@ begin inherited; SetSection('Clarify'); - fcIgnoreUnusedParams := TStringList.Create; - fcIgnoreUnusedParams.UseLocale := False; // Will compare with CompareText. + fcIgnoreUnusedParams := TStringList.Create; // Will compare with CompareText. + {$IF FPC_FULLVERSION>=30200}fcIgnoreUnusedParams.UseLocale := False;{$ENDIF} fcIgnoreUnusedParams.Duplicates := dupIgnore; fcFileExtensions := TStringList.Create; - fcFileExtensions.UseLocale := False; + {$IF FPC_FULLVERSION>=30200}fcFileExtensions.UseLocale := False;{$ENDIF} fcFileExtensions.Duplicates := dupIgnore; end; diff --git a/components/jcf2/Settings/SetPreProcessor.pas b/components/jcf2/Settings/SetPreProcessor.pas index bdf4eb00ba..80ad6cc8e2 100644 --- a/components/jcf2/Settings/SetPreProcessor.pas +++ b/components/jcf2/Settings/SetPreProcessor.pas @@ -77,13 +77,13 @@ begin inherited; SetSection('PreProcessor'); - fcDefinedSymbols := TStringList.Create; - fcDefinedSymbols.UseLocale := False; // Will compare with CompareText. + fcDefinedSymbols := TStringList.Create; // Will compare with CompareText. + {$IF FPC_FULLVERSION>=30200}fcDefinedSymbols.UseLocale := False;{$ENDIF} //fcDefinedSymbols.Sorted := True; fcDefinedSymbols.Duplicates := dupIgnore; fcDefinedOptions := TStringList.Create; - fcDefinedOptions.UseLocale := False; + {$IF FPC_FULLVERSION>=30200}fcDefinedOptions.UseLocale := False;{$ENDIF} //fcDefinedOptions.Sorted := True; fcDefinedOptions.Duplicates := dupIgnore; end; diff --git a/components/jcf2/Settings/SetReplace.pas b/components/jcf2/Settings/SetReplace.pas index a5c50847e8..335fd5ae86 100644 --- a/components/jcf2/Settings/SetReplace.pas +++ b/components/jcf2/Settings/SetReplace.pas @@ -84,10 +84,10 @@ begin SetSection('Replace'); fcWords := TStringList.Create; - fcLeftWords := TStringList.Create; - fcLeftWords.UseLocale := False; // Will compare with CompareText. + fcLeftWords := TStringList.Create; // Will compare with CompareText. + {$IF FPC_FULLVERSION>=30200}fcLeftWords.UseLocale := False;{$ENDIF} fcRightWords := TStringList.Create; - fcRightWords.UseLocale := False; + {$IF FPC_FULLVERSION>=30200}fcRightWords.UseLocale := False;{$ENDIF} end; destructor TSetReplace.Destroy; diff --git a/components/jcf2/Settings/SetWordList.pas b/components/jcf2/Settings/SetWordList.pas index ffed053023..a45e810b4f 100644 --- a/components/jcf2/Settings/SetWordList.pas +++ b/components/jcf2/Settings/SetWordList.pas @@ -83,8 +83,8 @@ begin SetSection(psSectionName); - fcWords := TStringList.Create; - fcWords.UseLocale := False; // Will compare with CompareText. + fcWords := TStringList.Create; // Will compare with CompareText. + {$IF FPC_FULLVERSION>=30200}fcWords.UseLocale := False;{$ENDIF} fcWords.Sorted := True; fcWords.Duplicates := dupIgnore; end; diff --git a/components/lazdebuggergdbmi/gdbmidebugger.pp b/components/lazdebuggergdbmi/gdbmidebugger.pp index 86f355df82..3b18a7fd4a 100644 --- a/components/lazdebuggergdbmi/gdbmidebugger.pp +++ b/components/lazdebuggergdbmi/gdbmidebugger.pp @@ -8135,12 +8135,12 @@ end; constructor TGDBMILineInfo.Create(const ADebugger: TDebuggerIntf); begin FSourceIndex := TStringList.Create; - FSourceIndex.UseLocale := False; + {$IF FPC_FULLVERSION>=30200}FSourceIndex.UseLocale := False;{$ENDIF} FSourceIndex.Sorted := True; FSourceIndex.Duplicates := dupError; FSourceIndex.CaseSensitive := True; FRequestedSources := TStringList.Create; - FRequestedSources.UseLocale := False; + {$IF FPC_FULLVERSION>=30200}FRequestedSources.UseLocale := False;{$ENDIF} FRequestedSources.Sorted := True; FRequestedSources.Duplicates := dupError; FRequestedSources.CaseSensitive := True; diff --git a/components/synedit/synhighlighterany.pas b/components/synedit/synhighlighterany.pas index a786a8d358..f51a3fecd4 100644 --- a/components/synedit/synhighlighterany.pas +++ b/components/synedit/synhighlighterany.pas @@ -1139,7 +1139,7 @@ begin else HL.StringDelim:=sdSingleQuote; genlist:=TStringList.create; - genlist.UseLocale:=false; + {$IF FPC_FULLVERSION>=30200}genlist.UseLocale:=false;{$ENDIF} // read keywords hini.ReadSectionNames('Keywords',genlist); if genlist.count>0 then diff --git a/components/synedit/synhighlighterpas.pp b/components/synedit/synhighlighterpas.pp index de55dbfbcb..467a036c80 100644 --- a/components/synedit/synhighlighterpas.pp +++ b/components/synedit/synhighlighterpas.pp @@ -4514,7 +4514,7 @@ var begin if KeywordsList = nil then begin KeywordsList := TStringList.Create; - KeywordsList.UseLocale := false; + {$IF FPC_FULLVERSION>=30200}KeywordsList.UseLocale := false;{$ENDIF} KeywordsList.CaseSensitive := true; for i := 1 to High(RESERVED_WORDS_TP) do KeywordsList.AddObject(RESERVED_WORDS_TP[i], TObject(pcmTP));