From dd20833f33275d8b326703790a03eea050ed959b Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Mon, 23 Jun 2014 18:50:49 +0000
Subject: [PATCH] IDE: refactor TProjectBuildModes.SaveToXMLConfig.

git-svn-id: trunk@45635 -
---
 ide/project.pp | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/ide/project.pp b/ide/project.pp
index 39504139d2..806eca7f9a 100644
--- a/ide/project.pp
+++ b/ide/project.pp
@@ -714,8 +714,10 @@ type
     procedure LoadProjFromXMLConfig(XMLConfig: TXMLConfig; const Path: string);
     procedure LoadSessionFromXMLConfig(XMLConfig: TXMLConfig; const Path: string;
                                        LoadParts: boolean);
-    procedure SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string;
-                              SaveData, SaveSession: boolean);
+    procedure SaveProjToXMLConfig(XMLConfig: TXMLConfig; const Path: string;
+                                  SaveSession: boolean);
+    procedure SaveSessionToXMLConfig(XMLConfig: TXMLConfig; const Path: string;
+                                     SaveSession: boolean);
   public
     property Items[Index: integer]: TProjectBuildMode read GetItems; default;
     property ChangeStamp: integer read FChangeStamp;
@@ -3159,7 +3161,7 @@ begin
   // save custom data
   SaveStringToStringTree(FXMLConfig,CustomData,Path+'CustomData/');
   // Save the macro values and compiler options
-  BuildModes.SaveToXMLConfig(FXMLConfig, Path, True, FSaveSessionInLPI);
+  BuildModes.SaveProjToXMLConfig(FXMLConfig, Path, FSaveSessionInLPI);
   // save the Publish Options
   PublishOptions.SaveToXMLConfig(FXMLConfig,Path+'PublishOptions/',fCurStorePathDelim);
   // save the Run and Build parameter options
@@ -3204,7 +3206,7 @@ begin
   FXMLConfig.SetValue(Path+'Version/Value',ProjectInfoFileVersion);
 
   // Save the session build modes
-  BuildModes.SaveToXMLConfig(FXMLConfig, Path, False, True);
+  BuildModes.SaveSessionToXMLConfig(FXMLConfig, Path, True);
   // save all units
   SaveUnits(Path,true,true);
   // save custom defines
@@ -3296,8 +3298,7 @@ begin
   FProjectWriteFlags := ProjectWriteFlags;
   BuildModes.FGlobalMatrixOptions := GlobalMatrixOptions;
   // first save the .lpi file
-  if (pwfSkipSeparateSessionInfo in ProjectWriteFlags)
-  or (SessionStorage=pssNone) then
+  if (pwfSkipSeparateSessionInfo in ProjectWriteFlags) or (SessionStorage=pssNone) then
     FSaveSessionInLPI:=false
   else
     FSaveSessionInLPI:=(SessFilename='') or (CompareFilenames(SessFilename,CfgFilename)=0);
@@ -7306,28 +7307,38 @@ begin
 end;
 
 // SaveToXMLConfig itself
-procedure TProjectBuildModes.SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string;
-  SaveData, SaveSession: boolean);
+procedure TProjectBuildModes.SaveProjToXMLConfig(XMLConfig: TXMLConfig; const Path: string;
+  SaveSession: boolean);
 var
-  CurMode: TProjectBuildMode;
   i, Cnt: Integer;
-  SubPath: String;
 begin
   FXMLConfig := XMLConfig;
-
   // the first build mode is the default mode
-  if SaveData then
-    Items[0].SaveDefaultCompilerOpts(FXMLConfig, Path);
+  Items[0].SaveDefaultCompilerOpts(FXMLConfig, Path);
 
   Cnt:=0;
   for i:=0 to Count-1 do
-    if (Items[i].InSession and SaveSession) or ((not Items[i].InSession) and SaveData) then
+    if (Items[i].InSession and SaveSession) or not Items[i].InSession then
       Items[i].SaveToXMLConfig(FXMLConfig, Path, i=0, Cnt);
   FXMLConfig.SetDeleteValue(Path+'BuildModes/Count',Cnt,0);
 
-  if SaveData then
-    SharedMatrixOptions.SaveToXMLConfig(FXMLConfig,
-      Path+'BuildModes/SharedMatrixOptions/',@IsSharedMode);
+  SharedMatrixOptions.SaveToXMLConfig(FXMLConfig, Path+'BuildModes/SharedMatrixOptions/',@IsSharedMode);
+  if SaveSession then
+    SaveSessionData(Path);
+end;
+
+procedure TProjectBuildModes.SaveSessionToXMLConfig(XMLConfig: TXMLConfig; const Path: string;
+  SaveSession: boolean);
+var
+  i, Cnt: Integer;
+begin
+  FXMLConfig := XMLConfig;
+
+  Cnt:=0;
+  for i:=0 to Count-1 do
+    if Items[i].InSession and SaveSession then
+      Items[i].SaveToXMLConfig(FXMLConfig, Path, i=0, Cnt);
+  FXMLConfig.SetDeleteValue(Path+'BuildModes/Count',Cnt,0);
 
   if SaveSession then
     SaveSessionData(Path);