paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-07-28 23:16:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: formatting

Browse Source 
git-svn-id: trunk@33097 -
This commit is contained in:
juha 2011-10-26 16:40:09 +00:00
parent 59131a8b2b
commit 683285b605
2 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ide/ideprocs.pp
View File

@ -159,12 +159,10 @@ function SearchDirectoryInSearchPath(SearchPath: TStrings;
const Directory: string; DirStartPos: integer = 0): integer; const Directory: string; DirStartPos: integer = 0): integer;
// XMLConfig // XMLConfig
procedure LoadRecentList(XMLConfig: TXMLConfig; List: TStrings; procedure LoadRecentList(XMLConfig: TXMLConfig; List: TStrings; const Path: string);
const Path: string); procedure SaveRecentList(XMLConfig: TXMLConfig; List: TStrings; const Path: string);
procedure SaveRecentList(XMLConfig: TXMLConfig; List: TStrings; function AddToRecentList(const s: string; RecentList: TStrings; Max: integer): boolean;
const Path: string); function AddComboTextToRecentList(cb: TCombobox; Max: integer): boolean;
function AddToRecentList(const s: string; RecentList: TStrings;
Max: integer): boolean;
procedure RemoveFromRecentList(const s: string; RecentList: TStrings); procedure RemoveFromRecentList(const s: string; RecentList: TStrings);
procedure LoadRect(XMLConfig: TXMLConfig; const Path:string; procedure LoadRect(XMLConfig: TXMLConfig; const Path:string;
var ARect:TRect); var ARect:TRect);
@ -301,8 +299,7 @@ begin
end; end;
end; end;
procedure SaveRecentList(XMLConfig: TXMLConfig; List: TStrings; procedure SaveRecentList(XMLConfig: TXMLConfig; List: TStrings; const Path: string);
const Path: string);
begin begin
SaveStringList(XMLConfig,List,Path); SaveStringList(XMLConfig,List,Path);
end; end;

40
ide/inputhistory.pas
View File

@ -483,8 +483,7 @@ begin
FIgnores.Clear; FIgnores.Clear;
end; end;
procedure TInputHistories.LoadFromXMLConfig(XMLConfig: TXMLConfig; procedure TInputHistories.LoadFromXMLConfig(XMLConfig: TXMLConfig; const Path: string);
const Path: string);
var var
DiffFlag: TTextDiffFlag; DiffFlag: TTextDiffFlag;
FIFOption: TLazFindInFileSearchOption; FIFOption: TLazFindInFileSearchOption;
@ -566,8 +565,7 @@ begin
Ignores.LoadFromXMLConfig(XMLConfig,Path+'Ignores/'); Ignores.LoadFromXMLConfig(XMLConfig,Path+'Ignores/');
end; end;
procedure TInputHistories.SaveToXMLConfig(XMLConfig: TXMLConfig; procedure TInputHistories.SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string);
const Path: string);
var var
DiffFlag: TTextDiffFlag; DiffFlag: TTextDiffFlag;
FIFOption: TLazFindInFileSearchOption; FIFOption: TLazFindInFileSearchOption;
@ -645,8 +643,7 @@ procedure TInputHistories.SetLazarusDefaultFilename;
var var
ConfFileName: string; ConfFileName: string;
begin begin
ConfFileName:=SetDirSeparators( ConfFileName:=SetDirSeparators(GetPrimaryConfigPath+'/'+DefaultHistoryFile);
GetPrimaryConfigPath+'/'+DefaultHistoryFile);
CopySecondaryConfigFile(DefaultHistoryFile); CopySecondaryConfigFile(DefaultHistoryFile);
FFilename:=ConfFilename; FFilename:=ConfFilename;
end; end;
@ -706,11 +703,10 @@ function TInputHistories.AddToFindInFilesMaskHistory(const AMaskStr: String): bo
begin begin
Result:= AddToRecentList(AMaskStr,FFindInFilesMaskHistory,FMaxFindHistory); Result:= AddToRecentList(AMaskStr,FFindInFilesMaskHistory,FMaxFindHistory);
end; end;
function TInputHistories.AddToUnitDependenciesHistory(
const ARootFilename: String): boolean; function TInputHistories.AddToUnitDependenciesHistory(const ARootFilename: String): boolean;
begin begin
Result:=AddToRecentList(ARootFilename,FUnitDependenciesHistory, Result:=AddToRecentList(ARootFilename,FUnitDependenciesHistory,FMaxUnitDependenciesHistory);
FMaxUnitDependenciesHistory);
end; end;
function TInputHistories.LastFPCUnitLinksValid: boolean; function TInputHistories.LastFPCUnitLinksValid: boolean;
@ -748,8 +744,7 @@ begin
FFileDialogSettings.Height:=SourceDialog.Height; FFileDialogSettings.Height:=SourceDialog.Height;
s:=ExtractFilePath(FFileDialogSettings.InitialDir); s:=ExtractFilePath(FFileDialogSettings.InitialDir);
if s<>'' then if s<>'' then
AddToRecentList(s,FFileDialogSettings.HistoryList, AddToRecentList(s,FFileDialogSettings.HistoryList,FFileDialogSettings.MaxHistory);
FFileDialogSettings.MaxHistory);
end; end;
procedure TInputHistories.SetFileDialogSettingsInitialDir(const InitialDir: string); procedure TInputHistories.SetFileDialogSettingsInitialDir(const InitialDir: string);
@ -758,8 +753,7 @@ begin
end; end;
function TInputHistories.SelectDirectory(const Title: string; function TInputHistories.SelectDirectory(const Title: string;
MustExist: boolean; const InitialDir: string; MustExist: boolean; const InitialDir: string; const Directory: string): string;
const Directory: string): string;
var var
WorkDirectoryDialog: TSelectDirectoryDialog; WorkDirectoryDialog: TSelectDirectoryDialog;
begin begin
@ -871,8 +865,7 @@ begin
Result:=FItems.Count; Result:=FItems.Count;
end; end;
procedure THistoryLists.LoadFromXMLConfig(XMLConfig: TXMLConfig; procedure THistoryLists.LoadFromXMLConfig(XMLConfig: TXMLConfig; const Path: string);
const Path: string);
var var
MergeCount, i: integer; MergeCount, i: integer;
CurList: THistoryList; CurList: THistoryList;
@ -888,8 +881,7 @@ begin
end; end;
end; end;
procedure THistoryLists.SaveToXMLConfig(XMLConfig: TXMLConfig; procedure THistoryLists.SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string);
const Path: string);
var var
i, CurID: integer; i, CurID: integer;
begin begin
@ -986,8 +978,7 @@ begin
while (Result>=0) and (Options<>Items[Result].Options) do dec(Result); while (Result>=0) and (Options<>Items[Result].Options) do dec(Result);
end; end;
procedure TFPCConfigCache.SetItem(const Options, SearchPath, FPCSrcDir, procedure TFPCConfigCache.SetItem(const Options, SearchPath, FPCSrcDir, UnitLinks: string);
UnitLinks: string);
var var
i: Integer; i: Integer;
CurItem: TFPCConfigCacheItem; CurItem: TFPCConfigCacheItem;
@ -1004,8 +995,7 @@ begin
CurItem.UnitLinks:=UnitLinks; CurItem.UnitLinks:=UnitLinks;
end; end;
procedure TFPCConfigCache.LoadFromXMLConfig(XMLConfig: TXMLConfig; procedure TFPCConfigCache.LoadFromXMLConfig(XMLConfig: TXMLConfig; const Path: string);
const Path: string);
var var
NewCount: Integer; NewCount: Integer;
i: Integer; i: Integer;
@ -1026,8 +1016,7 @@ begin
end; end;
end; end;
procedure TFPCConfigCache.SaveToXMLConfig(XMLConfig: TXMLConfig; procedure TFPCConfigCache.SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string);
const Path: string);
var var
i: Integer; i: Integer;
begin begin
@ -1090,8 +1079,7 @@ procedure TFPCConfigCacheItem.LoadFromXMLConfig(XMLConfig: TXMLConfig;
const Path: string); const Path: string);
begin begin
Options:=XMLConfig.GetValue(Path+'Options/Value',''); Options:=XMLConfig.GetValue(Path+'Options/Value','');
SearchPath:=LineBreaksToDelimiter( SearchPath:=LineBreaksToDelimiter(XMLConfig.GetValue(Path+'SearchPath/Value',''),';');
XMLConfig.GetValue(Path+'SearchPath/Value',''),';');
FPCSrcDir:=XMLConfig.GetValue(Path+'FPCSrcDir/Value',''); FPCSrcDir:=XMLConfig.GetValue(Path+'FPCSrcDir/Value','');
UnitLinks:=XMLConfig.GetValue(Path+'UnitLinks/Value',''); UnitLinks:=XMLConfig.GetValue(Path+'UnitLinks/Value','');
end; end;