IDE: removed compiler option for switch -vm

git-svn-id: trunk@38411 -

ide/compileroptions.pp

@@ -1534,7 +1534,6 @@ begin
   ShowDebugInfo := aXMLConfig.GetValue(p+'Verbosity/ShowDebugInfo/Value', false);
   ShowUsedFiles := aXMLConfig.GetValue(p+'Verbosity/ShowUsedFiles/Value', false);
   ShowTriedFiles := aXMLConfig.GetValue(p+'Verbosity/ShowTriedFiles/Value', false);
-  ShowDefMacros := aXMLConfig.GetValue(p+'Verbosity/ShowDefMacros/Value', false);
   ShowCompProc := aXMLConfig.GetValue(p+'Verbosity/ShowCompProc/Value', false);
   ShowCond := aXMLConfig.GetValue(p+'Verbosity/ShowCond/Value', false);
   ShowExecInfo := aXMLConfig.GetValue(p+'Verbosity/ShowExecInfo/Value', false);
@@ -1730,7 +1729,6 @@ begin
   aXMLConfig.SetDeleteValue(p+'Verbosity/ShowDebugInfo/Value', ShowDebugInfo,false);
   aXMLConfig.SetDeleteValue(p+'Verbosity/ShowUsedFiles/Value', ShowUsedFiles,false);
   aXMLConfig.SetDeleteValue(p+'Verbosity/ShowTriedFiles/Value', ShowTriedFiles,false);
-  aXMLConfig.SetDeleteValue(p+'Verbosity/ShowDefMacros/Value', ShowDefMacros,false);
   aXMLConfig.SetDeleteValue(p+'Verbosity/ShowCompProc/Value', ShowCompProc,false);
   aXMLConfig.SetDeleteValue(p+'Verbosity/ShowCond/Value', ShowCond,false);
   aXMLConfig.SetDeleteValue(p+'Verbosity/ShowExecInfo/Value', ShowExecInfo,false);
@@ -2785,7 +2783,6 @@ begin
     { Use Heaptrc Unit }
     if (UseHeaptrc) and (not (ccloNoLinkerOpts in Flags)) then
       switches := switches + ' -g-h'; // heaptrc, without -g
-
   end;
 
   { Generate code gprof }
@@ -2857,8 +2854,6 @@ begin
     tempsw := tempsw + 'u';
   if (ShowTriedFiles) then
     tempsw := tempsw + 't';
-  if (ShowDefMacros) then
-    tempsw := tempsw + 'm';
   if (ShowCompProc) then
     tempsw := tempsw + 'p';
   if (ShowCond) then
@@ -2880,11 +2875,6 @@ begin
   if (StopAfterErrCount>1) then
     switches := switches + ' -Se'+IntToStr(StopAfterErrCount);
 
-
-  { Write an FPC logo }
-  if (WriteFPCLogo) then
-    switches := switches + ' -l';
-
   { Ignore Config File }
   if DontUseConfigFile then
     switches := switches + ' -n';
@@ -2937,6 +2927,9 @@ begin
       switches := switches + ' '+PrepareCmdLineOption('-FU'+CurOutputDir);
   end;
 
+  // verbosity
+  if (WriteFPCLogo) then
+    switches := switches + ' -l';
   t := GetMsgsIndexesWithState(CompilerMessages, ',', msOff);
   if t <> '' then
     switches := switches + ' ' + PrepareCmdLineOption('-vm'+t);
@@ -3190,7 +3183,6 @@ begin
   fShowDebugInfo := false;
   fShowUsedFiles := false;
   fShowTriedFiles := false;
-  fShowDefMacros := false;
   fShowCompProc := false;
   fShowCond := false;
   fShowExecInfo := false;
@@ -3308,7 +3300,6 @@ begin
   fShowDebugInfo := CompOpts.fShowDebugInfo;
   fShowUsedFiles := CompOpts.fShowUsedFiles;
   fShowTriedFiles := CompOpts.fShowTriedFiles;
-  fShowDefMacros := CompOpts.fShowDefMacros;
   fShowCompProc := CompOpts.fShowCompProc;
   fShowCond := CompOpts.fShowCond;
   fShowCond := CompOpts.fShowExecInfo;
@@ -3457,7 +3448,6 @@ begin
   if Done(Tool.AddDiff('ShowDebugInfo',fShowDebugInfo,CompOpts.fShowDebugInfo)) then exit;
   if Done(Tool.AddDiff('ShowUsedFiles',fShowUsedFiles,CompOpts.fShowUsedFiles)) then exit;
   if Done(Tool.AddDiff('ShowTriedFiles',fShowTriedFiles,CompOpts.fShowTriedFiles)) then exit;
-  if Done(Tool.AddDiff('ShowDefMacros',fShowDefMacros,CompOpts.fShowDefMacros)) then exit;
   if Done(Tool.AddDiff('ShowCompProc',fShowCompProc,CompOpts.fShowCompProc)) then exit;
   if Done(Tool.AddDiff('ShowCond',fShowCond,CompOpts.fShowCond)) then exit;
   if Done(Tool.AddDiff('ShowExecInfo',fShowExecInfo,CompOpts.fShowExecInfo)) then exit;

ide/frames/compiler_verbosity_options.pas

@@ -52,7 +52,6 @@ begin
     Items.Add(dlgShowHint + ' (-vh)');
     Items.Add(dlgShowTriedFiles + ' (-vt)');
     Items.Add(dlgShowGeneralInfo + ' (-vi)');
-    Items.Add(dlgShowDefinedMacros + ' (-vm)');
     Items.Add(dlgShowCompilingLineNumbers + ' (-vl)');
     Items.Add(dlgShowCompiledProcedures + ' (-vp)');
     Items.Add(dlgShowProcsError + ' (-vb)');
@@ -70,58 +69,62 @@ begin
 end;
 
 procedure TCompilerVerbosityOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
+var
+  i: Integer;
 begin
+  i:=0;
   with AOptions as TBaseCompilerOptions, grpVerbosity do
   begin
-    Checked[0] := ShowErrors;
-    Checked[1] := ShowHintsForSenderNotUsed;
-    Checked[2] := ShowWarn;
-    Checked[3] := ShowDebugInfo;
-    Checked[4] := ShowNotes;
-    Checked[5] := ShowUsedFiles;
-    Checked[6] := ShowHints;
-    Checked[7] := ShowTriedFiles;
-    Checked[8] := ShowGenInfo;
-    Checked[9] := ShowDefMacros;
-    Checked[10] := ShowLineNum;
-    Checked[11] := ShowCompProc;
-    Checked[12] := ShowAllProcsOnError;
-    Checked[13] := ShowCond;
-    Checked[14] := ShowAll;
-    Checked[15] := ShowExecInfo;
-    Checked[16] := ShowSummary;
-    Checked[17] := ShowNothing;
-    Checked[18] := ShowHintsForUnusedUnitsInMainSrc;
-    Checked[19] := WriteFPCLogo;
+    Checked[i] := ShowErrors;  i+=1;
+    Checked[i] := ShowHintsForSenderNotUsed; i+=1;
+    Checked[i] := ShowWarn; i+=1;
+    Checked[i] := ShowDebugInfo; i+=1;
+    Checked[i] := ShowNotes; i+=1;
+    Checked[i] := ShowUsedFiles; i+=1;
+    Checked[i] := ShowHints; i+=1;
+    Checked[i] := ShowTriedFiles; i+=1;
+    Checked[i] := ShowGenInfo; i+=1;
+    Checked[i] := ShowLineNum; i+=1;
+    Checked[i] := ShowCompProc; i+=1;
+    Checked[i] := ShowAllProcsOnError; i+=1;
+    Checked[i] := ShowCond; i+=1;
+    Checked[i] := ShowAll; i+=1;
+    Checked[i] := ShowExecInfo; i+=1;
+    Checked[i] := ShowSummary; i+=1;
+    Checked[i] := ShowNothing; i+=1;
+    Checked[i] := ShowHintsForUnusedUnitsInMainSrc; i+=1;
+    Checked[i] := WriteFPCLogo; i+=1;
 
     edtErrorCnt.Text := IntToStr(StopAfterErrCount);
   end;
 end;
 
 procedure TCompilerVerbosityOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
+var
+  i: Integer;
 begin
+  i:=0;
   with AOptions as TBaseCompilerOptions, grpVerbosity do
   begin
-    ShowErrors := Checked[0];
-    ShowHintsForSenderNotUsed := Checked[1];
-    ShowWarn := Checked[2];
-    ShowDebugInfo := Checked[3];
-    ShowNotes := Checked[4];
-    ShowUsedFiles := Checked[5];
-    ShowHints := Checked[6];
-    ShowTriedFiles := Checked[7];
-    ShowGenInfo := Checked[8];
-    ShowDefMacros := Checked[9];
-    ShowLineNum := Checked[10];
-    ShowCompProc := Checked[11];
-    ShowAllProcsOnError := Checked[12];
-    ShowCond := Checked[13];
-    ShowAll := Checked[14];
-    ShowExecInfo := Checked[15];
-    ShowSummary := Checked[16];
-    ShowNothing := Checked[17];
-    ShowHintsForUnusedUnitsInMainSrc := Checked[18];
-    WriteFPCLogo := Checked[19];
+    ShowErrors := Checked[i]; i+=1;
+    ShowHintsForSenderNotUsed := Checked[i]; i+=1;
+    ShowWarn := Checked[i]; i+=1;
+    ShowDebugInfo := Checked[i]; i+=1;
+    ShowNotes := Checked[i]; i+=1;
+    ShowUsedFiles := Checked[i]; i+=1;
+    ShowHints := Checked[i]; i+=1;
+    ShowTriedFiles := Checked[i]; i+=1;
+    ShowGenInfo := Checked[i]; i+=1;
+    ShowLineNum := Checked[i]; i+=1;
+    ShowCompProc := Checked[i]; i+=1;
+    ShowAllProcsOnError := Checked[i]; i+=1;
+    ShowCond := Checked[i]; i+=1;
+    ShowAll := Checked[i]; i+=1;
+    ShowExecInfo := Checked[i]; i+=1;
+    ShowSummary := Checked[i]; i+=1;
+    ShowNothing := Checked[i]; i+=1;
+    ShowHintsForUnusedUnitsInMainSrc := Checked[i]; i+=1;
+    WriteFPCLogo := Checked[i]; i+=1;
     StopAfterErrCount := StrToIntDef(edtErrorCnt.Text, 1);
   end;
 end;

ide/lazarusidestrconsts.pas

@@ -1986,7 +1986,6 @@ resourcestring
   dlgShowDebugInfo = 'Show debug info';
   dlgShowUsedFiles = 'Show used files';
   dlgShowTriedFiles = 'Show tried files';
-  dlgShowDefinedMacros = 'Show defined macros';
   dlgShowCompiledProcedures = 'Show compiled procedures';
   dlgShowConditionals = 'Show conditionals';
   dlgShowExecutableInfo = 'Show executable info (Win32 only)';

ideintf/compoptsintf.pas

@@ -138,7 +138,6 @@ type
     procedure SetShowCompProc(const AValue: Boolean);
     procedure SetShowCond(const AValue: Boolean);
     procedure SetShowDebugInfo(const AValue: Boolean);
-    procedure SetShowDefMacros(const AValue: Boolean);
     procedure SetShowErrors(const AValue: Boolean);
     procedure SetShowExecInfo(const AValue: Boolean);
     procedure SetShowGenInfo(const AValue: Boolean);
@@ -245,7 +244,6 @@ type
     fShowDebugInfo: Boolean;
     fShowUsedFiles: Boolean;
     fShowTriedFiles: Boolean;
-    fShowDefMacros: Boolean;
     fShowCompProc: Boolean;
     fShowCond: Boolean;
     fShowExecInfo: Boolean;
@@ -407,7 +405,6 @@ type
     property ShowDebugInfo: Boolean read fShowDebugInfo write SetShowDebugInfo;
     property ShowUsedFiles: Boolean read fShowUsedFiles write SetShowUsedFiles;
     property ShowTriedFiles: Boolean read fShowTriedFiles write SetShowTriedFiles;
-    property ShowDefMacros: Boolean read fShowDefMacros write SetShowDefMacros;
     property ShowCompProc: Boolean read fShowCompProc write SetShowCompProc;
     property ShowCond: Boolean read fShowCond write SetShowCond;
     property ShowExecInfo: Boolean read fShowExecInfo write SetShowExecInfo;
@@ -514,13 +511,6 @@ begin
   IncreaseChangeStamp;
 end;
 
-procedure TLazCompilerOptions.SetShowDefMacros(const AValue: Boolean);
-begin
-  if fShowDefMacros=AValue then exit;
-  fShowDefMacros:=AValue;
-  IncreaseChangeStamp;
-end;
-
 procedure TLazCompilerOptions.SetShowErrors(const AValue: Boolean);
 begin
   if fShowErrors=AValue then exit;