diff --git a/ide/checklfmdlg.pas b/ide/checklfmdlg.pas index bf46f8cedc..8fe2295799 100644 --- a/ide/checklfmdlg.pas +++ b/ide/checklfmdlg.pas @@ -407,7 +407,8 @@ begin //writeln(LFMSource.Source); for i:=LFMChangeList.Count-1 downto 0 do begin Entry:=TLFMChangeEntry(LFMChangeList[i]); - writeln('TCheckLFMDialog.ApplyReplacements A ',i,' ',Entry.StartPos,',',Entry.EndPos, + DebugLn('TCheckLFMDialog.ApplyReplacements A ',IntToStr(i),' ', + IntToStr(Entry.StartPos),',',IntToStr(Entry.EndPos), ' "',copy(LFMSource.Source,Entry.StartPos,Entry.EndPos-Entry.StartPos),'" -> "',Entry.NewText,'"'); LFMSource.Replace(Entry.StartPos,Entry.EndPos-Entry.StartPos,Entry.NewText); end; diff --git a/ide/cleandirdlg.pas b/ide/cleandirdlg.pas index e6f5a8b614..38593215d7 100644 --- a/ide/cleandirdlg.pas +++ b/ide/cleandirdlg.pas @@ -31,7 +31,7 @@ interface uses Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons, - StdCtrls, FileCtrl, Laz_XMLCfg, SynRegExpr, + StdCtrls, FileCtrl, LCLProc, Laz_XMLCfg, SynRegExpr, LazarusIDEStrConsts, LazConf, IDEProcs, TransferMacros; type @@ -160,7 +160,7 @@ begin Filename:=GetConfigFilename; XMLConfig:=TXMLConfig.Create(Filename); except - writeln('ERROR: unable to open clean directory options "',Filename,'"'); + DebugLn('ERROR: unable to open clean directory options "',Filename,'"'); exit; end; try @@ -192,7 +192,7 @@ begin end; except on E: Exception do begin - writeln('ERROR: unable to read clean directory options from "', + DebugLn('ERROR: unable to read clean directory options from "', Filename,'": ',E.Message); end; end; @@ -208,7 +208,7 @@ begin Filename:=GetConfigFilename; XMLConfig:=TXMLConfig.CreateClean(Filename); except - writeln('ERROR: unable to open clean directory options "',Filename,'"'); + DebugLn('ERROR: unable to open clean directory options "',Filename,'"'); exit; end; try @@ -234,7 +234,7 @@ begin end; except on E: Exception do begin - writeln('ERROR: unable to write clean directory options from "', + DebugLn('ERROR: unable to write clean directory options from "', Filename,'": ',E.Message); end; end; @@ -383,7 +383,7 @@ begin // delete them all for i:=0 to List.Count-1 do begin Filename:=List[i]; - writeln('TCleanDirectoryDialog: Deleting file ',Filename); + DebugLn('TCleanDirectoryDialog: Deleting file ',Filename); if FileExists(Filename) then begin repeat if DeleteFile(Filename) then begin diff --git a/ide/codeexplorer.pas b/ide/codeexplorer.pas index 6c8b6d1bc2..9cf4149363 100644 --- a/ide/codeexplorer.pas +++ b/ide/codeexplorer.pas @@ -32,8 +32,8 @@ unit CodeExplorer; interface uses - Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons, - ComCtrls, + Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs, + Buttons, ComCtrls, CodeToolManager, CodeAtom, CodeCache, CodeTree, PascalParserTool, IDECommands, EnvironmentOpts, IDEOptionDefs, LazarusIDEStrConsts, InputHistory, IDEProcs, @@ -142,7 +142,7 @@ procedure TCodeExplorerView.CodeExplorerViewCREATE(Sender: TObject); begin Pixmap:=TPixmap.Create; if LazarusResources.Find(ResName)=nil then - writeln('TCodeExplorerView.CodeExplorerViewCREATE: ', + DebugLn('TCodeExplorerView.CodeExplorerViewCREATE: ', ' WARNING: icon not found: "',ResName,'"'); Pixmap.LoadFromLazarusResource(ResName); ImgList.Add(Pixmap,nil) diff --git a/ide/codetoolsdefines.pas b/ide/codetoolsdefines.pas index d7e1752534..463c9d57f7 100644 --- a/ide/codetoolsdefines.pas +++ b/ide/codetoolsdefines.pas @@ -634,7 +634,7 @@ begin // ask the compiler for Macros CompilerPath:=FileNames[1]; if Macros<>nil then Macros.SubstituteStr(CompilerPath); - writeln(' CompilerPath="',CompilerPath,'"'); + DebugLn(' CompilerPath="',CompilerPath,'"'); TargetOS:=''; TargetProcessor:=''; if (CompilerPath<>'') and (CompilerPath<>DefaultCompiler) then @@ -648,7 +648,7 @@ begin // create path defines FPCSrcDir:=FileNames[2]; if Macros<>nil then Macros.SubstituteStr(FPCSrcDir); - writeln(' FPCSrcDir="',FPCSrcDir,'"'); + DebugLn(' FPCSrcDir="',FPCSrcDir,'"'); if (FPCSrcDir<>'') and (FPCSrcDir<>DefaultFPCSrcDir) and (UnitSearchPath<>'') then FPCSrcTemplate:=Boss.DefinePool.CreateFPCSrcTemplate(FPCSrcDir, @@ -713,7 +713,7 @@ begin CompilerPath:=FileNames[0]; if Macros<>nil then Macros.SubstituteStr(CompilerPath); - writeln(' CompilerPath="',CompilerPath,'"'); + DebugLn(' CompilerPath="',CompilerPath,'"'); FPCTemplate:=Boss.DefinePool.CreateFPCTemplate(CompilerPath,'', CreateCompilerTestPascalFilename,s, @@ -760,7 +760,7 @@ begin // ask the compiler for Macros CompilerPath:=FileNames[1]; if Macros<>nil then Macros.SubstituteStr(CompilerPath); - writeln(' CompilerPath="',CompilerPath,'"'); + DebugLn(' CompilerPath="',CompilerPath,'"'); TargetOS:=''; TargetProcessor:=''; @@ -768,20 +768,20 @@ begin CreateCompilerTestPascalFilename,UnitSearchPath, TargetOS,TargetProcessor,CodeToolsOpts); if FPCTemplate=nil then begin - writeln('ERROR: unable to get FPC Compiler Macros from "',CompilerPath,'"'); + DebugLn('ERROR: unable to get FPC Compiler Macros from "',CompilerPath,'"'); exit; end; // create FPC CVS Source defines FPCSrcDir:=FileNames[0]; if Macros<>nil then Macros.SubstituteStr(FPCSrcDir); - writeln(' FPCSrcDir="',FPCSrcDir,'"'); + DebugLn(' FPCSrcDir="',FPCSrcDir,'"'); UnitSearchPath:=''; FPCSrcTemplate:=Boss.DefinePool.CreateFPCSrcTemplate(FPCSrcDir, UnitSearchPath, 'ppu', TargetOS, TargetProcessor, false, UnitLinks, CodeToolsOpts); if FPCSrcTemplate=nil then begin - writeln('ERROR: unable to create FPC CVS Src defines for "',FPCSrcDir,'"'); + DebugLn('ERROR: unable to create FPC CVS Src defines for "',FPCSrcDir,'"'); FPCTemplate.Free; exit; end; @@ -1905,9 +1905,9 @@ function TCodeToolsDefinesEditor.ConsistencyCheck: integer; else write('ADefNode.Next=nil '); DummyDefNode:=TDefineTemplate(ATreeNode.GetNextSibling.Data); if DummyDefNode<>nil then - writeln('ATreeNode.GetNextSibling.Next=',DummyDefNode.Name) + DebugLn('ATreeNode.GetNextSibling.Next=',DummyDefNode.Name) else - writeln('ATreeNode.GetNextSibling.Next=nil'); + DebugLn('ATreeNode.GetNextSibling.Next=nil'); {writeln('============================================='); DefineTreeView.WriteDebugReport('TV ',true); writeln('============================================='); diff --git a/ide/codetoolsoptions.pas b/ide/codetoolsoptions.pas index 1c6f61c46d..d6b9772730 100644 --- a/ide/codetoolsoptions.pas +++ b/ide/codetoolsoptions.pas @@ -35,7 +35,7 @@ unit CodeToolsOptions; interface uses - Classes, SysUtils, LazConf, LResources, Forms, Controls, Buttons, + Classes, SysUtils, LazConf, LResources, Forms, Controls, Buttons, LclProc, ExtCtrls, StdCtrls, ComCtrls, Dialogs, Laz_XMLCfg, CodeToolManager, DefineTemplates, SourceChanger, SynEdit, IDEOptionDefs, EditDefineTree, LazarusIDEStrConsts; @@ -364,7 +364,7 @@ begin XMLConfig:=TXMLConfig.Create(FFileName); FileVersion:=XMLConfig.GetValue('CodeToolsOptions/Version/Value',0); if (FileVersion<>0) and (FileVersionnil then OutputFilter.ReadLine(E.Message,true); Result:=mrCancel; @@ -182,7 +182,7 @@ begin finally SetCurrentDir(OldCurDir); end; - writeln('[TCompiler.Compile] end'); + DebugLn('[TCompiler.Compile] end'); end; @@ -190,6 +190,9 @@ end. { $Log$ + Revision 1.44 2004/09/17 20:04:34 vincents + replaced writeln by DebugLn + Revision 1.43 2003/12/21 18:21:32 mattias implemented ShowAll and hide hints for unused package units option diff --git a/ide/compileroptions.pp b/ide/compileroptions.pp index 0c08a61833..b9058c583e 100644 --- a/ide/compileroptions.pp +++ b/ide/compileroptions.pp @@ -41,7 +41,7 @@ unit CompilerOptions; interface uses - Classes, SysUtils, FileCtrl, + Classes, SysUtils, FileCtrl, LCLProc, Laz_XMLCfg, IDEProcs, LazConf, TransferMacros; @@ -854,7 +854,7 @@ begin XMLConfigFile := nil; except on E: Exception do begin - writeln('TBaseCompilerOptions.LoadCompilerOptions '+Classname+' '+E.Message); + DebugLn('TBaseCompilerOptions.LoadCompilerOptions '+Classname+' '+E.Message); end; end; end; @@ -1143,7 +1143,7 @@ begin XMLConfigFile := nil; except on E: Exception do begin - writeln('TBaseCompilerOptions.LoadCompilerOptions '+Classname+' '+E.Message); + DebugLn('TBaseCompilerOptions.LoadCompilerOptions '+Classname+' '+E.Message); end; end; end; diff --git a/ide/compileroptionsdlg.pp b/ide/compileroptionsdlg.pp index 18a5f37b7a..71d7d988d8 100644 --- a/ide/compileroptionsdlg.pp +++ b/ide/compileroptionsdlg.pp @@ -36,8 +36,8 @@ unit CompilerOptionsDlg; interface uses - Forms, Classes, SysUtils, ComCtrls, Buttons, StdCtrls, ExtCtrls, Graphics, - LResources, FileCtrl, Dialogs, Controls, GraphType, + Forms, Classes, LCLProc, SysUtils, ComCtrls, Buttons, StdCtrls, ExtCtrls, + Graphics, LResources, FileCtrl, Dialogs, Controls, GraphType, PathEditorDlg, LazarusIDEStrConsts, IDEOptionDefs, LazConf, IDEProcs, CompilerOptions, ShowCompilerOpts, Project, PackageDefs; @@ -469,7 +469,7 @@ begin PutCompilerOptions; CurOptions := CompilerOpts.MakeOptionsString(nil, CompilerOpts.DefaultMakeOptionsFlags); - WriteLn('CompilerOpts.MakeOptionsString: ' + CurOptions); + DebugLn('CompilerOpts.MakeOptionsString: ' + CurOptions); ShowCompilerOptionsDialog(CurOptions); end; diff --git a/ide/customformeditor.pp b/ide/customformeditor.pp index a42770271e..53baa496ab 100644 --- a/ide/customformeditor.pp +++ b/ide/customformeditor.pp @@ -379,8 +379,8 @@ Result := True; tkWString : Begin //Writeln('Get String...'); ShortString(Value) := GetStrProp(FComponent,PRI); - Writeln('The string returned is '+String(value)); - Writeln('*Get String...'); + DebugLn('The string returned is '+String(value)); + DebugLn('*Get String...'); end; tkInteger, tkInt64 : Begin @@ -707,7 +707,7 @@ Begin {$IFNDEF NoCompCatch} except on E: Exception do begin - writeln('TComponentInterface.Delete ERROR:', + DebugLn('TComponentInterface.Delete ERROR:', ' "'+OldName+':'+OldClassName+'" ',E.Message); MessageDlg('Error', 'An exception occured during deletion of'#13 @@ -801,8 +801,8 @@ Begin begin FComponentInterfaces.Remove(Temp); - writeln('TCustomFormEditor.DeleteControl ', - AComponent.ClassName,' ',IsJITComponent(AComponent)); + DebugLn('TCustomFormEditor.DeleteControl ', + AComponent.ClassName,' ',BoolToStr(IsJITComponent(AComponent))); if IsJITComponent(AComponent) then begin // value is a top level component if FreeComponent then begin @@ -1086,7 +1086,8 @@ var ANonControlForm: TNonControlForm; begin ANonControlForm:=FindNonControlForm(AComponent); -writeln('TCustomFormEditor.UpdateDesignerFormName ',ANonControlForm<>nil,' ',AComponent.Name); + DebugLn('TCustomFormEditor.UpdateDesignerFormName ', + BoolToStr(ANonControlForm<>nil), ' ',AComponent.Name); if ANonControlForm<>nil then ANonControlForm.Caption:=AComponent.Name; end; @@ -1202,7 +1203,7 @@ Begin Result:=nil; Temp:=nil; try - writeln('[TCustomFormEditor.CreateComponent] Class='''+TypeClass.ClassName+''''); + DebugLn('[TCustomFormEditor.CreateComponent] Class='''+TypeClass.ClassName+''''); {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TCustomFormEditor.CreateComponent A');{$ENDIF} OwnerComponent:=nil; @@ -1244,12 +1245,12 @@ Begin begin TWinControl(Temp.Component).Parent := TWinControl(ParentComponent); - writeln('Parent is '''+TWinControl(Temp.Component).Parent.Name+''''); + DebugLn('Parent is '''+TWinControl(Temp.Component).Parent.Name+''''); end else begin TControl(Temp.Component).Parent := TControl(ParentComponent).Parent; - writeln('Parent is '''+TControl(Temp.Component).Parent.Name+''''); + DebugLn('Parent is '''+TControl(Temp.Component).Parent.Name+''''); end; end; end else begin @@ -1651,7 +1652,7 @@ begin CompEditor.Edit; except on E: Exception do begin - writeln('TCustomFormEditor.OnDesignerMenuItemClick ERROR: ',E.Message); + DebugLn('TCustomFormEditor.OnDesignerMenuItemClick ERROR: ',E.Message); MessageDlg('Error in '+CompEditor.ClassName, 'The component editor of class "'+CompEditor.ClassName+'"' +'has created the error:'#13 @@ -1672,8 +1673,9 @@ procedure TCustomFormEditor.JITListPropertyNotFound(Sender: TObject; Reader: TReader; Instance: TPersistent; var PropName: string; IsPath: boolean; var Handled, Skip: Boolean); begin - writeln('TCustomFormEditor.JITListPropertyNotFound ',Sender.ClassName, - ' Instance=',Instance.ClassName,' PropName="',PropName,'" IsPath=',IsPath); + DebugLn('TCustomFormEditor.JITListPropertyNotFound ',Sender.ClassName, + ' Instance=',Instance.ClassName,' PropName="',PropName, + '" IsPath=',BoolToStr(IsPath)); end; function TCustomFormEditor.GetPropertyEditorHook: TPropertyEditorHook; diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas index bd7c99172a..f892f60aca 100644 --- a/ide/debugmanager.pas +++ b/ide/debugmanager.pas @@ -39,8 +39,8 @@ uses {$IFDEF IDE_MEM_CHECK} MemCheck, {$ENDIF} - Classes, SysUtils, Forms, Controls, Dialogs, Menus, FileCtrl, Laz_XMLCfg, - SynEdit, CodeCache, CodeToolManager, LazConf, DebugOptionsFrm, + Classes, SysUtils, Forms, Controls, Dialogs, Menus, FileCtrl, LCLProc, + Laz_XMLCfg, SynEdit, CodeCache, CodeToolManager, LazConf, DebugOptionsFrm, CompilerOptions, EditorOptions, EnvironmentOpts, KeyMapping, UnitEditor, Project, IDEProcs, InputHistory, Debugger, IDEOptionDefs, LazarusIDEStrConsts, @@ -655,7 +655,7 @@ procedure TManagedBreakPoints.NotifyAdd(const ABreakPoint: TIDEBreakPoint); var BP: TBaseBreakPoint; begin - writeln('TManagedBreakPoints.NotifyAdd A ',ABreakpoint.Source,' ',ABreakpoint.Line); + debugln('TManagedBreakPoints.NotifyAdd A ',ABreakpoint.Source,' ',IntToStr(ABreakpoint.Line)); ABreakpoint.InitialEnabled := True; ABreakpoint.Enabled := True; @@ -672,7 +672,7 @@ end; procedure TManagedBreakPoints.NotifyRemove(const ABreakPoint: TIDEBreakPoint); begin - writeln('TManagedBreakPoints.NotifyRemove A ',ABreakpoint.Source,' ',ABreakpoint.Line,' ',TManagedBreakPoint(ABreakpoint).SourceMark <> nil); + debugln('TManagedBreakPoints.NotifyRemove A ',ABreakpoint.Source,' ',IntToStr(ABreakpoint.Line),' ',BoolToStr(TManagedBreakPoint(ABreakpoint).SourceMark <> nil)); inherited; @@ -1101,7 +1101,7 @@ begin then Include(FManagerStates,dmsInitializingDebuggerObjectFailed); end; - WriteLN('[TDebugManager.OnDebuggerChangeState] state: ', STATENAME[FDebugger.State]); + DebugLn('[TDebugManager.OnDebuggerChangeState] state: ', STATENAME[FDebugger.State]); // All conmmands // ------------------- @@ -1135,7 +1135,7 @@ begin case FDebugger.State of dsError: begin - WriteLN('Ooops, the debugger entered the error state'); + DebugLn('Ooops, the debugger entered the error state'); MessageDlg(lisDebuggerError, Format(lisDebuggerErrorOoopsTheDebuggerEnteredTheErrorState, [#13#13, #13, #13#13]), @@ -1565,7 +1565,7 @@ var NewWorkingDir: String; DebuggerClass: TDebuggerClass; begin - WriteLN('[TDebugManager.DoInitDebugger] A'); + DebugLn('[TDebugManager.DoInitDebugger] A'); Result := False; if (Project1.MainUnitID < 0) or Destroying then Exit; @@ -1658,7 +1658,7 @@ begin end; Result := True; - WriteLN('[TDebugManager.DoInitDebugger] END'); + DebugLn('[TDebugManager.DoInitDebugger] END'); end; // still part of main, should go here when dummydebugger is finished @@ -1729,7 +1729,7 @@ begin Result:=mrCancel; if Destroying then exit; if (FDebugger <> nil) then begin - writeln('TDebugManager.RunDebugger B ',FDebugger.ClassName); + DebugLn('TDebugManager.RunDebugger B ',FDebugger.ClassName); // check if debugging needs restart if (dmsDebuggerObjectBroken in FManagerStates) and (MainIDE.ToolStatus=itDebugger) then begin @@ -1788,9 +1788,11 @@ begin or (ASourceMark.Data=nil) or (not (ASourceMark.Data is TIDEBreakPoint)) then RaiseException('TDebugManager.DoDeleteBreakPointAtMark'); -writeln('TDebugManager.DoDeleteBreakPointAtMark A ',ASourceMark.GetFilename,' ',ASourceMark.Line); + DebugLn('TDebugManager.DoDeleteBreakPointAtMark A ',ASourceMark.GetFilename, + ' ',IntToStr(ASourceMark.Line)); OldBreakPoint:=TIDEBreakPoint(ASourceMark.Data); -writeln('TDebugManager.DoDeleteBreakPointAtMark B ',OldBreakPoint.ClassName,' ',OldBreakPoint.Source,' ',OldBreakPoint.Line); + DebugLn('TDebugManager.DoDeleteBreakPointAtMark B ',OldBreakPoint.ClassName, + ' ',OldBreakPoint.Source,' ',IntToStr(OldBreakPoint.Line)); OldBreakPoint.Free; Project1.Modified:=true; Result := mrOK @@ -1802,7 +1804,7 @@ var ActiveUnitInfo: TUnitInfo; UnitFilename: string; begin - writeln('TDebugManager.DoRunToCursor A'); + DebugLn('TDebugManager.DoRunToCursor A'); if (MainIDE.DoInitProjectRun <> mrOK) or (MainIDE.ToolStatus <> itDebugger) or (FDebugger = nil) or Destroying @@ -1810,7 +1812,7 @@ begin Result := mrAbort; Exit; end; - writeln('TDebugManager.DoRunToCursor B'); + DebugLn('TDebugManager.DoRunToCursor B'); Result := mrCancel; @@ -1827,11 +1829,11 @@ begin then UnitFilename:=ActiveUnitInfo.Filename else UnitFilename:=MainIDE.GetTestUnitFilename(ActiveUnitInfo); - writeln('TDebugManager.DoRunToCursor C'); + DebugLn('TDebugManager.DoRunToCursor C'); FDebugger.RunTo(ExtractFilename(UnitFilename), ActiveSrcEdit.EditorComponent.CaretY); - writeln('TDebugManager.DoRunToCursor D'); + DebugLn('TDebugManager.DoRunToCursor D'); Result := mrOK; end; @@ -1891,6 +1893,9 @@ end. { ============================================================================= $Log$ + Revision 1.73 2004/09/17 20:04:34 vincents + replaced writeln by DebugLn + Revision 1.72 2004/09/04 21:54:08 marc + Added option to skip compiler step on compile, build or run * Fixed adding of runtime watches diff --git a/ide/delphiunit2laz.pas b/ide/delphiunit2laz.pas index 0214efd032..13403fe474 100644 --- a/ide/delphiunit2laz.pas +++ b/ide/delphiunit2laz.pas @@ -39,8 +39,8 @@ interface uses // FCL+LCL - Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, - Buttons, StdCtrls, FileCtrl, + Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, + Dialogs, Buttons, StdCtrls, FileCtrl, // Components SynEdit, CodeCache, CodeToolManager, DefineTemplates, // IDE @@ -255,7 +255,7 @@ begin MissingUnits:=nil; try // find missing units - writeln('FixMissingUnits FindMissingUnits'); + DebugLn('FixMissingUnits FindMissingUnits'); CTResult:=CodeToolBoss.FindMissingUnits(LazUnitCode,MissingUnits); if not CTResult then begin Result:=mrCancel; @@ -272,7 +272,7 @@ begin MissingUnitsText:=MissingUnitsText+', '; MissingUnitsText:=MissingUnitsText+MissingUnits[i]; end; - writeln('FixMissingUnits FindMissingUnits="',MissingUnitsText,'"'); + DebugLn('FixMissingUnits FindMissingUnits="',MissingUnitsText,'"'); // ask user if missing units should be commented Result:=MessageDlg(lisUnitsNotFound, Format(lisTheFollowingUnitsWereNotFound1EitherTheseUnitsAreN, [#13, @@ -281,7 +281,7 @@ begin if Result<>mrYes then exit; // comment missing units - writeln('FixMissingUnits CommentUnitsInUsesSections'); + DebugLn('FixMissingUnits CommentUnitsInUsesSections'); CTResult:=CodeToolBoss.CommentUnitsInUsesSections(LazUnitCode,MissingUnits); if not CTResult then begin Result:=mrCancel; diff --git a/ide/diffpatch.pas b/ide/diffpatch.pas index dbede9da40..cc6ab12517 100644 --- a/ide/diffpatch.pas +++ b/ide/diffpatch.pas @@ -38,7 +38,7 @@ unit DiffPatch; interface uses - Classes, SysUtils; + Classes, SysUtils, LCLProc; type TTextDiffFlag = ( @@ -583,7 +583,7 @@ begin until false; except on E: Exception do begin - writeln('CreateTextDiff ',E.Message); + DebugLn('CreateTextDiff ',E.Message); end; end; finally diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp index a213e7f2c0..519dea564e 100644 --- a/ide/editoroptions.pp +++ b/ide/editoroptions.pp @@ -35,7 +35,7 @@ interface uses Classes, SysUtils, Math, LCLIntf, LCLType, - Forms, ComCtrls, Buttons, StdCtrls, ExtCtrls, LazConf, + Forms, ComCtrls, Buttons, StdCtrls, ExtCtrls, LazConf, LCLProc, FileCtrl, GraphType, Graphics, Controls, Dialogs, LResources, IDEProcs, SynEdit, SynEditHighlighter, SynEditAutoComplete, SynEditKeyCmds, SynHighlighterPas, SynHighlighterHTML, SynHighlighterCPP, SynHighlighterXML, @@ -1109,13 +1109,13 @@ begin CopySecondaryConfigFile(EditOptsConfFileName); try if (not FileExists(ConfFileName)) then begin - writeln('NOTE: editor options config file not found - using defaults'); + DebugLn('NOTE: editor options config file not found - using defaults'); XMLConfig:=TXMLConfig.CreateClean(ConfFileName); end else XMLConfig:=TXMLConfig.Create(ConfFileName); except on E: Exception do begin - writeln('WARNING: unable to read ',ConfFileName,' ',E.Message); + DebugLn('WARNING: unable to read ',ConfFileName,' ',E.Message); XMLConfig:=nil; end; end; @@ -1156,7 +1156,7 @@ begin fs.Free; end; except - writeln('WARNING: unable to write code template file "', + DebugLn('WARNING: unable to write code template file "', fCodeTemplateFileName,'"'); end; end; @@ -1290,7 +1290,7 @@ begin except on E: Exception do - writeln('[TEditorOptions.Load] ERROR: ',e.Message); + DebugLn('[TEditorOptions.Load] ERROR: ',e.Message); end; end; @@ -1410,7 +1410,7 @@ begin XMLConfig.Flush; except on E: Exception do - writeln('[TEditorOptions.Save] ERROR: ',e.Message); + DebugLn('[TEditorOptions.Save] ERROR: ',e.Message); end; end; @@ -2185,7 +2185,7 @@ begin try AutoCompleteList.LoadFromFile(s); except - writeln('NOTE: unable to read code template file ''',s,''''); + DebugLn('NOTE: unable to read code template file ''',s,''''); end; end; FillCodeTemplateListBox; diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp index 6583fb36ce..d458926911 100644 --- a/ide/environmentopts.pp +++ b/ide/environmentopts.pp @@ -928,7 +928,7 @@ begin ConfFileName:=SetDirSeparators(GetPrimaryConfigPath+'/'+EnvOptsConfFileName); CopySecondaryConfigFile(EnvOptsConfFileName); if (not FileExists(ConfFileName)) then begin - writeln('Note: environment config file not found - using defaults'); + DebugLn('Note: environment config file not found - using defaults'); end; Filename:=ConfFilename; end; @@ -1183,7 +1183,7 @@ begin except // ToDo on E: Exception do - writeln('[TEnvironmentOptions.Load] error reading "',FFilename,'": '+E.Message); + DebugLn('[TEnvironmentOptions.Load] error reading "',FFilename,'": '+E.Message); end; end; @@ -1381,7 +1381,7 @@ begin except on E: Exception do begin // ToDo - writeln('[TEnvironmentOptions.Save] error writing "',Filename,'": ',E.Message); + DebugLn('[TEnvironmentOptions.Save] error writing "',Filename,'": ',E.Message); end; end; end; @@ -3575,7 +3575,7 @@ begin InputHistories.StoreFileDialogSettings(SaveDialog); except on E: Exception do begin - writeln('ERROR: [TEnvironmentOptionsDialog.SaveDesktopSettingsToFileButtonClick] ',E.Message); + DebugLn('ERROR: [TEnvironmentOptionsDialog.SaveDesktopSettingsToFileButtonClick] ',E.Message); end; end; finally @@ -3610,7 +3610,7 @@ begin InputHistories.StoreFileDialogSettings(OpenDialog); except // ToDo - writeln('ERROR: [TEnvironmentOptionsDialog.SaveDesktopSettingsToFileButtonClick]'); + DebugLn('ERROR: [TEnvironmentOptionsDialog.SaveDesktopSettingsToFileButtonClick]'); end; finally OpenDialog.Free; diff --git a/ide/exttooldialog.pas b/ide/exttooldialog.pas index 5a8b2be24a..0d6a0e6365 100644 --- a/ide/exttooldialog.pas +++ b/ide/exttooldialog.pas @@ -391,7 +391,7 @@ begin KeyCommandRelation.KeyA:=IDEShortCut(Items[i].Key,Items[i].Shift, VK_UNKNOWN,[]); end else begin - writeln('[TExternalToolList.SaveShortCuts] Error: ' + DebugLn('[TExternalToolList.SaveShortCuts] Error: ' +'unable to save shortcut for external tool "',Items[i].Title,'"'); end; end; @@ -425,7 +425,7 @@ begin end; except on E: Exception do begin - writeln('Error freeing stopped process: ',E.Message); + DebugLn('Error freeing stopped process: ',E.Message); end; end; dec(i); diff --git a/ide/helpoptions.pas b/ide/helpoptions.pas index 397ae5d748..b326c7e5c6 100644 --- a/ide/helpoptions.pas +++ b/ide/helpoptions.pas @@ -35,8 +35,8 @@ unit HelpOptions; interface uses - Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons, - ExtCtrls, HelpIntf, Laz_XMLCfg, ObjectInspector, + Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs, + Buttons, ExtCtrls, HelpIntf, Laz_XMLCfg, ObjectInspector, LazConf, LazarusIDEStrConsts, IDEOptionDefs, StdCtrls; type @@ -226,7 +226,7 @@ begin try FileVersion:=XMLConfig.GetValue('HelpOptions/Version/Value',0); if (FileVersion<>0) and (FileVersionnil then begin Storage:=TXMLOptionsStorage.Create(XMLConfig,'Viewers'); @@ -239,7 +239,7 @@ begin end; except on E: Exception do begin - writeln('[THelpOptions.Load] error reading "',FFilename,'": ',E.Message); + DebugLn('[THelpOptions.Load] error reading "',FFilename,'": ',E.Message); end; end; end; @@ -267,7 +267,7 @@ begin end; except on E: Exception do begin - writeln('[THelpOptions.Save] error writing "',FFilename,'": ',E.Message); + DebugLn('[THelpOptions.Save] error writing "',FFilename,'": ',E.Message); end; end; end; @@ -280,7 +280,7 @@ begin GetPrimaryConfigPath+'/'+DefaultHelpOptsFile); CopySecondaryConfigFile(DefaultHelpOptsFile); if (not FileExists(ConfFileName)) then begin - writeln('NOTE: help options config file not found - using defaults'); + DebugLn('NOTE: help options config file not found - using defaults'); end; FFilename:=ConfFilename; end; diff --git a/ide/ideprocs.pp b/ide/ideprocs.pp index 24cefab1f0..512c5db1aa 100644 --- a/ide/ideprocs.pp +++ b/ide/ideprocs.pp @@ -1782,9 +1782,9 @@ end; ------------------------------------------------------------------------------} procedure RaiseException(const Msg: string); begin - writeln('ERROR in IDE: ',Msg); + DebugLn('ERROR in IDE: ',Msg); // creates an exception, that gdb catches: - writeln('Creating gdb catchable error:'); + DebugLn('Creating gdb catchable error:'); if (length(Msg) div (length(Msg) div 10000))=0 then ; end; diff --git a/ide/inputhistory.pas b/ide/inputhistory.pas index ad08a1d67f..dbb562daff 100644 --- a/ide/inputhistory.pas +++ b/ide/inputhistory.pas @@ -36,7 +36,7 @@ interface uses Classes, SysUtils, FileCtrl, DiffPatch, IDEProcs, Laz_XMLCfg, LazConf, - Dialogs; + Dialogs, LCLProc; const // these are the names of the various history lists in the IDE: @@ -461,7 +461,7 @@ begin XMLConfig.Free; except // ToDo - writeln('[TCodeToolsOptions.Load] error reading "',FFilename,'"'); + DebugLn('[TCodeToolsOptions.Load] error reading "',FFilename,'"'); end; end; @@ -478,7 +478,7 @@ begin XMLConfig.Free; except on E: Exception do begin - writeln('[TEnvironmentOptions.Save] error writing "',FFilename,'" ',E.Message); + DebugLn('[TEnvironmentOptions.Save] error writing "',FFilename,'" ',E.Message); end; end; end; diff --git a/ide/keymapping.pp b/ide/keymapping.pp index afacf89677..45328a367a 100644 --- a/ide/keymapping.pp +++ b/ide/keymapping.pp @@ -32,7 +32,7 @@ unit KeyMapping; interface uses - LCLIntf, LCLType, + LCLIntf, LCLType, LCLProc, Forms, Classes, SysUtils, Buttons, LResources, StdCtrls, Controls, SynEdit, SynEditKeyCmds, Laz_XMLCfg, Dialogs, StringHashList, LazarusIDEStrConsts, IDECommands; @@ -2144,8 +2144,8 @@ function TKeyCommandRelationList.GetRelation( begin if (Index<0) or (Index>=Count) then begin - writeln('[TKeyCommandRelationList.GetRelation] Index out of bounds ' - ,Index,' Count=',Count); + DebugLn('[TKeyCommandRelationList.GetRelation] Index out of bounds ' + ,IntToStr(Index),' Count=',IntToStr(Count)); // creates an exception, that gdb catches: if (Index div ((Index and 1) div 10000))=0 then ; end; diff --git a/ide/lazarus.pp b/ide/lazarus.pp index 9f03cc6f6c..d3d01b1d96 100644 --- a/ide/lazarus.pp +++ b/ide/lazarus.pp @@ -48,7 +48,7 @@ uses MemCheck, {$ENDIF} Interfaces, - Forms, + Forms, LCLProc, Splash, Main, // use the custom IDE static packages AFTER 'main' @@ -82,14 +82,14 @@ begin try Application.Run; except - writeln('lazarus.pp - unhandled exception'); + debugln('lazarus.pp - unhandled exception'); end; if (SplashForm<>nil) then begin SplashForm.Free; SplashForm:=nil; end; - writeln('LAZARUS END - cleaning up ...'); + debugln('LAZARUS END - cleaning up ...'); // free the IDE, so everything is freed before the finalization sections MainIDE.Free; @@ -99,6 +99,9 @@ end. { $Log$ + Revision 1.62 2004/09/17 20:04:34 vincents + replaced writeln by DebugLn + Revision 1.61 2004/09/04 23:50:17 marc * removed compileroptionsdlg from uses claus to get rid of compiler warning diff --git a/ide/main.pp b/ide/main.pp index 127cc34cbf..ac4381e347 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -986,7 +986,7 @@ destructor TMainIDE.Destroy; begin ToolStatus:=itExiting; - writeln('[TMainIDE.Destroy] A'); + DebugLn('[TMainIDE.Destroy] A'); {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Destroy A ');{$ENDIF} FreeThenNil(ProjInspector); @@ -1027,12 +1027,12 @@ begin FreeThenNil(EnvironmentOptions); FreeThenNil(InputHistories); - writeln('[TMainIDE.Destroy] B -> inherited Destroy...'); + DebugLn('[TMainIDE.Destroy] B -> inherited Destroy...'); {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Destroy B ');{$ENDIF} FreeThenNil(SourceNotebook); inherited Destroy; {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Destroy C ');{$ENDIF} - writeln('[TMainIDE.Destroy] END'); + DebugLn('[TMainIDE.Destroy] END'); end; procedure TMainIDE.CreateOftenUsedForms; @@ -3859,7 +3859,7 @@ begin AncestorType:=TDataModule else AncestorType:=TForm; - writeln('TMainIDE.DoLoadLFM AncestorClassName=',NewAncestorName,' AncestorType=',AncestorType.ClassName); + DebugLn('TMainIDE.DoLoadLFM AncestorClassName=',NewAncestorName,' AncestorType=',AncestorType.ClassName); // convert text to binary format try @@ -4458,7 +4458,7 @@ begin end; Result:=mrOk; - debugln('TMainIDE.DoNewEditorFile end ',NewUnitInfo.Filename); + DebugLn('TMainIDE.DoNewEditorFile end ',NewUnitInfo.Filename); {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.DoNewUnit end');{$ENDIF} end; @@ -4630,7 +4630,7 @@ var ActiveSrcEdit: TSourceEditor; ACaption,AText: string; i:integer; begin - writeln('TMainIDE.DoCloseEditorFile A PageIndex=',PageIndex); + debugln('TMainIDE.DoCloseEditorFile A PageIndex=',IntToStr(PageIndex)); Result:=mrCancel; GetUnitWithPageIndex(PageIndex,ActiveSrcEdit,ActiveUnitInfo); if ActiveUnitInfo=nil then exit; @@ -4676,7 +4676,7 @@ begin Project1.RemoveUnit(i); end; - writeln('TMainIDE.DoCloseEditorFile end'); + DebugLn('TMainIDE.DoCloseEditorFile end'); Result:=mrOk; end; @@ -4896,7 +4896,7 @@ function TMainIDE.DoOpenMainUnit(ProjectLoading: boolean): TModalResult; var MainUnitInfo: TUnitInfo; OpenFlags: TOpenFlags; begin - writeln('[TMainIDE.DoOpenMainUnit] A ProjectLoading=',ProjectLoading,' MainUnitID=',Project1.MainUnitID); + debugln('[TMainIDE.DoOpenMainUnit] A ProjectLoading=',BoolToStr(ProjectLoading),' MainUnitID=',IntToStr(Project1.MainUnitID)); Result:=mrCancel; if Project1.MainUnitID<0 then exit; MainUnitInfo:=Project1.MainUnitInfo; @@ -5284,7 +5284,7 @@ end; function TMainIDE.DoNewProject(NewProjectType:TProjectType):TModalResult; var i:integer; Begin - writeln('TMainIDE.DoNewProject A'); + DebugLn('TMainIDE.DoNewProject A'); Result:=mrCancel; // invalidate cached substituted macros @@ -5352,7 +5352,7 @@ Begin Project1.Units[i].Modified:=false; Project1.Modified:=false; - writeln('TMainIDE.DoNewProject end '); + DebugLn('TMainIDE.DoNewProject end '); Result:=mrOk; end; @@ -5372,8 +5372,10 @@ begin SaveSourceEditorChangesToCodeCache(-1); SkipSavingMainSource:=false; + {$IFDEF IDE_DEBUG} writeln('TMainIDE.DoSaveProject A SaveAs=',sfSaveAs in Flags,' SaveToTestDir=',sfSaveToTestDir in Flags); - + {$ENDIF} + // check that all new units are saved first to get valid filenames // (this can alter the mainunit: e.g. used unit names) for i:=0 to Project1.UnitCount-1 do begin @@ -5461,7 +5463,7 @@ begin end; end; -writeln('TMainIDE.DoSaveProject End'); +DebugLn('TMainIDE.DoSaveProject End'); end; function TMainIDE.DoCloseProject: TModalResult; @@ -6147,7 +6149,7 @@ end; function TMainIDE.DoRunProject: TModalResult; begin - Writeln('[TMainIDE.DoRunProject] A'); + DebugLn('[TMainIDE.DoRunProject] A'); if (DoInitProjectRun <> mrOK) or (ToolStatus <> itDebugger) @@ -6163,13 +6165,13 @@ begin Result := DebugBoss.RunDebugger; if Result<>mrOk then exit; end else begin - writeln('NOTE: No debugger defined. Starting program without debugging ...'); + DebugLn('NOTE: No debugger defined. Starting program without debugging ...'); // no debugger, just start the program try if FRunProcess = nil then Exit; try - Writeln(' EXECUTING "',FRunProcess.CommandLine,'"'); - Writeln(' WorkingDir "',FRunProcess.CurrentDirectory,'"'); + DebugLn(' EXECUTING "',FRunProcess.CommandLine,'"'); + DebugLn(' WorkingDir "',FRunProcess.CurrentDirectory,'"'); // just run the program and don't care (no watch, no debugging) // just check from time to time, if it has terminated and clean up GetDefaultProcessList.Add(FRunProcess); @@ -6185,7 +6187,7 @@ begin ToolStatus:=itNone; end; end; - Writeln('[TMainIDE.DoRunProject] END'); + DebugLn('[TMainIDE.DoRunProject] END'); end; function TMainIDE.SomethingOfProjectIsModified: boolean; @@ -6196,7 +6198,7 @@ end; function TMainIDE.DoSaveAll(Flags: TSaveFlags): TModalResult; begin - writeln('TMainIDE.DoSaveAll'); + DebugLn('TMainIDE.DoSaveAll'); Result:=DoSaveProject(Flags); SaveEnvironment; SaveIncludeLinks; @@ -6706,7 +6708,7 @@ var OldOpenEditorsOnCodeToolChange: Boolean; begin // check file and directory - writeln('TMainIDE.DoConvertDelphiUnit A ',DelphiFilename); + DebugLn('TMainIDE.DoConvertDelphiUnit A ',DelphiFilename); Result:=CheckDelphiFileExt(DelphiFilename); if Result<>mrOk then exit; Result:=CheckFileIsWritable(DelphiFilename,[mbAbort]); @@ -6714,18 +6716,18 @@ begin Result:=CheckFilenameForLCLPaths(DelphiFilename); if Result<>mrOk then exit; // close Delphi files in editor - writeln('TMainIDE.DoConvertDelphiUnit Close files in editor .pas/.dfm'); + DebugLn('TMainIDE.DoConvertDelphiUnit Close files in editor .pas/.dfm'); Result:=DoCloseEditorFile(DelphiFilename,[cfSaveFirst]); if Result<>mrOk then exit; DFMFilename:=FindDFMFileForDelphiUnit(DelphiFilename); - writeln('TMainIDE.DoConvertDelphiUnit DFM file="',DFMFilename,'"'); + DebugLn('TMainIDE.DoConvertDelphiUnit DFM file="',DFMFilename,'"'); HasDFMFile:=DFMFilename<>''; if HasDFMFile then begin Result:=DoCloseEditorFile(DFMFilename,[cfSaveFirst]); if Result<>mrOk then exit; end; // rename files (.pas,.dfm) lowercase - writeln('TMainIDE.DoConvertDelphiUnit Rename files'); + DebugLn('TMainIDE.DoConvertDelphiUnit Rename files'); LazarusUnitFilename:=''; LFMFilename:=''; Result:=RenameDelphiUnitToLazarusUnit(DelphiFilename,true, @@ -6735,21 +6737,21 @@ begin HasDFMFile:=FileExists(LFMFilename); // convert .dfm file to .lfm file if HasDFMFile then begin - writeln('TMainIDE.DoConvertDelphiUnit Convert dfm format to lfm "',LFMFilename,'"'); + DebugLn('TMainIDE.DoConvertDelphiUnit Convert dfm format to lfm "',LFMFilename,'"'); Result:=ConvertDFMFileToLFMFile(LFMFilename); if Result<>mrOk then exit; end; // create empty .lrs file - writeln('TMainIDE.DoConvertDelphiUnit Create empty lrs'); + DebugLn('TMainIDE.DoConvertDelphiUnit Create empty lrs'); if HasDFMFile then begin LRSFilename:=ChangeFileExt(LazarusUnitFilename,'.lrs'); - writeln('TMainIDE.DoConvertDelphiUnit Create ',LRSFilename); + DebugLn('TMainIDE.DoConvertDelphiUnit Create ',LRSFilename); Result:=CreateEmptyFile(LRSFilename,[mbAbort,mbRetry]); if Result<>mrOk then exit; end else LRSFilename:=''; - writeln('TMainIDE.DoConvertDelphiUnit Convert delphi source'); + DebugLn('TMainIDE.DoConvertDelphiUnit Convert delphi source'); OldOpenEditorsOnCodeToolChange:=FOpenEditorsOnCodeToolChange; FOpenEditorsOnCodeToolChange:=true; try @@ -6772,7 +6774,7 @@ begin end; // comment missing units - writeln('TMainIDE.DoConvertDelphiUnit FixMissingUnits'); + DebugLn('TMainIDE.DoConvertDelphiUnit FixMissingUnits'); Result:=FixMissingUnits(LazarusUnitFilename); if Result<>mrOk then begin DoJumpToCodeToolBossError; @@ -6780,11 +6782,11 @@ begin end; // check the LFM file and the pascal unit - writeln('TMainIDE.DoConvertDelphiUnit Check new .lfm and .pas file'); + DebugLn('TMainIDE.DoConvertDelphiUnit Check new .lfm and .pas file'); Result:=LoadUnitAndLFMFile(LazarusUnitFilename,UnitCode,LFMCode,HasDFMFile); if Result<>mrOk then exit; if HasDFMFile and (LFMCode=nil) then - writeln('WARNING: TMainIDE.DoConvertDelphiUnit unable to load LFMCode'); + DebugLn('WARNING: TMainIDE.DoConvertDelphiUnit unable to load LFMCode'); if (LFMCode<>nil) and (CheckLFMBuffer(UnitCode,LFMCode,@MessagesView.AddMsg,true,true)<>mrOk) then begin @@ -6793,12 +6795,12 @@ begin end; // save LFM file - writeln('TMainIDE.DoConvertDelphiUnit Save LFM'); + DebugLn('TMainIDE.DoConvertDelphiUnit Save LFM'); Result:=DoSaveCodeBufferToFile(LFMCode,LFMCode.Filename,false); if Result<>mrOk then exit; // convert lfm to lrs - writeln('TMainIDE.DoConvertDelphiUnit Convert lfm to lrs'); + DebugLn('TMainIDE.DoConvertDelphiUnit Convert lfm to lrs'); Result:=ConvertLFMtoLRSfile(LFMCode.Filename); if Result<>mrOk then exit; finally @@ -7522,7 +7524,7 @@ procedure TMainIDE.OnMacroSubstitution(TheMacro: TTransferMacro; var s:string; var MacroName:string; begin if TheMacro=nil then begin - writeln('WARNING: Macro not defined: "'+s+'".'); + DebugLn('WARNING: Macro not defined: "'+s+'".'); s:=''; //MessageDlg('Unknown Macro','Macro not defined: "'+s+'".',mtError,[mbAbort],0); Handled:=true; @@ -7673,7 +7675,7 @@ begin ExeExt:=LazConf.GetDefaultExecutableExt; if OldExt<>ExeExt then Result:=copy(Result,1,length(Result)-length(OldExt))+ExeExt; - writeln('TMainIDE.OnMacroFuncMakeExe A ',Filename,' ',Result); + DebugLn('TMainIDE.OnMacroFuncMakeExe A ',Filename,' ',Result); end; procedure TMainIDE.OnCmdLineCreate(var CmdLine: string; var Abort:boolean); @@ -8354,7 +8356,7 @@ var BinCompStream: TMemoryStream; CInterface: TComponentInterface; begin - writeln('TMainIDE.OnDesignerPasteComponent A'); + DebugLn('TMainIDE.OnDesignerPasteComponent A'); NewComponent:=nil; // check the class of the new component @@ -8401,7 +8403,7 @@ begin FormEditor1.CreateChildComponentFromStream(BinCompStream, ARegComp.ComponentClass,LookupRoot,ParentControl)); if CInterface=nil then begin - writeln('TMainIDE.OnDesignerPasteComponent FAILED'); + DebugLn('TMainIDE.OnDesignerPasteComponent FAILED'); exit; end; NewComponent:=CInterface.Component; @@ -8424,7 +8426,7 @@ var ADesigner: TDesigner; begin if not (Sender is TDesigner) then begin - writeln('TMainIDE.OnDesignerPersistentAdded ERROR: Sender.ClassName=', + DebugLn('TMainIDE.OnDesignerPersistentAdded ERROR: Sender.ClassName=', Sender.ClassName); exit; end; @@ -8611,8 +8613,8 @@ procedure TMainIDE.InitCodeToolBoss; const ErrorMsg: string); begin if ADefTempl=nil then begin - writeln(''); - writeln(ErrorMsg); + DebugLn(''); + DebugLn(ErrorMsg); end else begin; if AddToPool then CodeToolBoss.DefinePool.Add(ADefTempl.CreateCopy(false,true,true)); @@ -8640,20 +8642,20 @@ begin CodeToolsOpts.AssignTo(CodeToolBoss); if (not FileExists(EnvironmentOptions.CompilerFilename)) then begin - writeln(''); - writeln('NOTE: Compiler Filename not set! (see Environment Options)'); + DebugLn(''); + DebugLn('NOTE: Compiler Filename not set! (see Environment Options)'); end; if (EnvironmentOptions.LazarusDirectory='') or not DirPathExists(EnvironmentOptions.LazarusDirectory) then begin - writeln(''); - writeln( + DebugLn(''); + DebugLn( 'NOTE: Lazarus Source Directory not set! (see Environment Options)'); end; if (EnvironmentOptions.FPCSourceDirectory='') or not DirPathExists(EnvironmentOptions.FPCSourceDirectory) then begin - writeln(''); - writeln('NOTE: FPC Source Directory not set! (see Environment Options)'); + DebugLn(''); + DebugLn('NOTE: FPC Source Directory not set! (see Environment Options)'); end; // set global variables @@ -10366,14 +10368,14 @@ var ADesigner: TIDesigner; AComponent: TComponent; begin - writeln('TMainIDE.OnPropHookPersistentAdded A ',dbgsName(APersistent)); + DebugLn('TMainIDE.OnPropHookPersistentAdded A ',dbgsName(APersistent)); if APersistent is TComponent then AComponent:=TComponent(APersistent) else AComponent:=nil; ComponentClass:=IDEComponentPalette.FindComponent(APersistent.ClassName); if (ComponentClass=nil) and (AComponent<>nil) then begin - writeln('TMainIDE.OnPropHookPersistentAdded ',APersistent.ClassName, + DebugLn('TMainIDE.OnPropHookPersistentAdded ',APersistent.ClassName, ' not registered'); exit; end; @@ -10397,7 +10399,9 @@ begin if Select then begin TheControlSelection.AssignPersistent(APersistent); end; + {$IFDEF IDE_DEBUG} writeln('TMainIDE.OnPropHookPersistentAdded END ',dbgsName(APersistent),' Select=',Select); + {$ENDIF} end; procedure TMainIDE.OnPropHookDeletePersistent(APersistent: TPersistent); @@ -10405,7 +10409,7 @@ var ADesigner: TDesigner; AComponent: TComponent; begin - writeln('TMainIDE.OnPropHookDeletePersistent A ',dbgsName(APersistent)); + DebugLn('TMainIDE.OnPropHookDeletePersistent A ',dbgsName(APersistent)); if APersistent is TComponent then begin AComponent:=TComponent(APersistent); ADesigner:=TDesigner(FindRootDesigner(AComponent)); @@ -10704,6 +10708,9 @@ end. { ============================================================================= $Log$ + Revision 1.772 2004/09/17 20:04:34 vincents + replaced writeln by DebugLn + Revision 1.771 2004/09/16 00:15:49 mattias added refactoring submenu in source editor popupmenu and implemented simple var/const heuristic for extract proc diff --git a/ide/miscoptions.pas b/ide/miscoptions.pas index 7317385adc..d23fb68869 100644 --- a/ide/miscoptions.pas +++ b/ide/miscoptions.pas @@ -30,8 +30,8 @@ unit MiscOptions; interface uses - Classes, SysUtils, BuildLazDialog, CodeToolsStructs, LazConf, Laz_XMLCfg, - TextTools, LazarusIDEStrConsts; + Classes, SysUtils, LCLProc, BuildLazDialog, CodeToolsStructs, LazConf, + Laz_XMLCfg, TextTools, LazarusIDEStrConsts; type TMiscellaneousOptions = class @@ -132,7 +132,7 @@ begin ConfFileName:=SetDirSeparators(GetPrimaryConfigPath+'/'+MiscOptsFilename); CopySecondaryConfigFile(MiscOptsFilename); if (not FileExists(ConfFileName)) then begin - writeln('NOTE: miscellaneous options file not found - using defaults'); + DebugLn('NOTE: miscellaneous options file not found - using defaults'); end; FFilename:=ConfFilename; end; @@ -147,7 +147,7 @@ begin try XMLConfig:=TXMLConfig.Create(GetFilename); except - writeln('ERROR: unable to open miscellaneous options "',GetFilename,'"'); + DebugLn('ERROR: unable to open miscellaneous options "',GetFilename,'"'); exit; end; try @@ -156,7 +156,7 @@ begin FileVersion:=XMLConfig.GetValue(Path+'Version/Value',0); if (FileVersion0) then - writeln('NOTE: converting old miscellaneous options ...'); + DebugLn('NOTE: converting old miscellaneous options ...'); BuildLazOpts.Load(XMLConfig,Path+'BuildLazarusOptions/'); SortSelDirection:=SortDirectionNameToType(XMLConfig.GetValue( @@ -173,7 +173,7 @@ begin end; except on E: Exception do begin - writeln('ERROR: unable read miscellaneous options from "',GetFilename,'": ',E.Message); + DebugLn('ERROR: unable read miscellaneous options from "',GetFilename,'": ',E.Message); end; end; end; @@ -188,7 +188,7 @@ begin XMLConfig:=TXMLConfig.CreateClean(XMLFilename); except on E: Exception do begin - writeln('ERROR: unable to open miscellaneous options "',XMLFilename,'":',E.Message); + DebugLn('ERROR: unable to open miscellaneous options "',XMLFilename,'":',E.Message); exit; end; end; @@ -214,7 +214,7 @@ begin end; except on E: Exception do begin - writeln('ERROR: unable read miscellaneous options from "',XMLFilename,'": ',E.Message); + DebugLn('ERROR: unable read miscellaneous options from "',XMLFilename,'": ',E.Message); end; end; end; diff --git a/ide/outputfilter.pas b/ide/outputfilter.pas index 8f4f1c0d6f..020c6287f6 100644 --- a/ide/outputfilter.pas +++ b/ide/outputfilter.pas @@ -835,7 +835,7 @@ begin inc(FLastOutputLine); s:=s+fOutput[FLastOutputLine]+LineEnding; end; - if s<>'' then write(s); + if s<>'' then DbgOut(s); fLastOutputTime:=CurTime; end; end; diff --git a/ide/project.pp b/ide/project.pp index 8a0a7018f6..d6c4edd2fb 100644 --- a/ide/project.pp +++ b/ide/project.pp @@ -1373,7 +1373,7 @@ begin xmlconfig := TXMLConfig.CreateClean(confPath); except on E: Exception do begin - writeln('ERROR: ',E.Message); + DebugLn('ERROR: ',E.Message); MessageDlg('Write error', 'Unable to write the project info file'#13 +'"'+ProjectInfoFile+'".'#13 @@ -2920,6 +2920,9 @@ end. { $Log$ + Revision 1.163 2004/09/17 20:04:35 vincents + replaced writeln by DebugLn + Revision 1.162 2004/09/04 22:24:15 mattias added default values for compiler skip options and improved many parts of synedit for UTF8 diff --git a/ide/projectdefs.pas b/ide/projectdefs.pas index aa70c16a54..3853ae91f8 100644 --- a/ide/projectdefs.pas +++ b/ide/projectdefs.pas @@ -37,7 +37,7 @@ unit ProjectDefs; interface uses - Classes, SysUtils, Laz_XMLCfg, Forms, SynRegExpr, FileCtrl, + Classes, SysUtils, Laz_XMLCfg, Forms, SynRegExpr, FileCtrl, LCLProc, ProjectIntf, LazarusIDEStrConsts, PublishModule; @@ -716,11 +716,11 @@ end; procedure TProjectJumpHistory.WriteDebugReport; var i: integer; begin - writeln('[TProjectJumpHistory.WriteDebugReport] Count=',Count - ,' MaxCount=',MaxCount,' HistoryIndex=',HistoryIndex); + DebugLn('[TProjectJumpHistory.WriteDebugReport] Count=',IntToStr(Count), + ' MaxCount=',IntToStr(MaxCount),' HistoryIndex=',IntToStr(HistoryIndex)); for i:=0 to Count-1 do begin - writeln(' ',i,': Line=',Items[i].CaretXY.Y,' Col=',Items[i].CaretXY.X, - ' "',Items[i].Filename,'"'); + DebugLn(' ',IntToStr(i),': Line=',IntToStr(Items[i].CaretXY.Y), + ' Col=',IntToStr(Items[i].CaretXY.X), ' "',Items[i].Filename,'"'); end; end; diff --git a/ide/publishmodule.pas b/ide/publishmodule.pas index 76f120da8e..82c64c7756 100644 --- a/ide/publishmodule.pas +++ b/ide/publishmodule.pas @@ -35,7 +35,7 @@ unit PublishModule; interface uses - Classes, SysUtils, Laz_XMLCfg, IDEProcs, SynRegExpr, FileCtrl; + Classes, SysUtils, Laz_XMLCfg, IDEProcs, SynRegExpr, FileCtrl, LCLProc; type { TPublishModuleOptions } @@ -216,7 +216,7 @@ begin FIncludeFilterValid:=true; except on E: Exception do begin - writeln('Invalid Include File Expression ',Expr,' ',E.Message); + DebugLn('Invalid Include File Expression ',Expr,' ',E.Message); FIncludeFilterValid:=false; end; end; @@ -237,7 +237,7 @@ begin FExcludeFilterValid:=true; except on E: Exception do begin - writeln('Invalid Exclude File Expression ',Expr,' ',E.Message); + DebugLn('Invalid Exclude File Expression ',Expr,' ',E.Message); FExcludeFilterValid:=false; end; end; diff --git a/ide/sortselectiondlg.pas b/ide/sortselectiondlg.pas index 26611b1c06..515b3ecf71 100644 --- a/ide/sortselectiondlg.pas +++ b/ide/sortselectiondlg.pas @@ -40,9 +40,9 @@ unit SortSelectionDlg; interface uses - Classes, SysUtils, Forms, Controls, SynEdit, Buttons, StdCtrls, ExtCtrls, - IDEOptionDefs, Dialogs, BasicCodeTools, AVL_Tree, LazarusIDEStrConsts, - EditorOptions, MiscOptions, SynEditHighlighter, TextTools; + Classes, SysUtils, LCLProc, Forms, Controls, SynEdit, Buttons, StdCtrls, + ExtCtrls, IDEOptionDefs, Dialogs, BasicCodeTools, AVL_Tree, TextTools, + LazarusIDEStrConsts, EditorOptions, MiscOptions, SynEditHighlighter; type TSortSelDlgState = (ssdPreviewNeedsUpdate, ssdSortedTextNeedsUpdate); @@ -283,7 +283,7 @@ begin end; else - writeln('ERROR: Domain not implemented'); + DebugLn('ERROR: Domain not implemented'); end; // build sorted text diff --git a/ide/unitdependencies.pas b/ide/unitdependencies.pas index 3a7dea335a..a675b058cc 100644 --- a/ide/unitdependencies.pas +++ b/ide/unitdependencies.pas @@ -45,7 +45,7 @@ uses MemCheck, {$ENDIF} Classes, SysUtils, Controls, Forms, Dialogs, Buttons, ComCtrls, StdCtrls, - Graphics, LCLType, FileCtrl, LResources, + Graphics, LCLType, FileCtrl, LResources, LCLProc, CodeToolManager, CodeCache, IDECommands, EnvironmentOpts, IDEOptionDefs, LazarusIDEStrConsts, InputHistory; @@ -434,7 +434,7 @@ constructor TUnitDependenciesView.Create(TheOwner: TComponent); begin Pixmap:=TPixmap.Create; if LazarusResources.Find(ResName)=nil then - writeln('TUnitDependenciesView.Create: ', + DebugLn('TUnitDependenciesView.Create: ', ' WARNING: icon not found: "',ResName,'"'); Pixmap.LoadFromLazarusResource(ResName); ImgList.Add(Pixmap,nil) diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp index d1ea308e50..6626d2f882 100644 --- a/ide/uniteditor.pp +++ b/ide/uniteditor.pp @@ -1345,7 +1345,7 @@ end; procedure TSourceEditor.SelectCodeBlock; begin // ToDo: - writeln('TSourceEditor.SelectCodeBlock: not implemented yet'); + DebugLn('TSourceEditor.SelectCodeBlock: not implemented yet'); end; procedure TSourceEditor.SelectLine; @@ -1428,7 +1428,7 @@ end; procedure TSourceEditor.FindHelpForSourceAtCursor; begin - writeln('TSourceEditor.FindHelpForSourceAtCursor A'); + DebugLn('TSourceEditor.FindHelpForSourceAtCursor A'); ShowHelpOrErrorForSourcePosition(Filename,FEditor.CaretXY); end; @@ -1936,7 +1936,8 @@ end; Procedure TSourceEditor.EditorKeyDown(Sender: TObject; var Key: Word; Shift : TShiftState); begin - writeln('TSourceEditor.EditorKeyDown A ',TComponent(Sender).Name,':',ClassName,' ',Key); + DebugLn('TSourceEditor.EditorKeyDown A ',TComponent(Sender).Name, + ':',ClassName,' ',IntToStr(Key)); if Assigned(OnKeyDown) then OnKeyDown(Sender, Key, Shift); end; @@ -2442,7 +2443,7 @@ begin // add one entry per item CodeToolBoss.IdentifierList.Prefix:=Prefix; ItemCnt:=CodeToolBoss.IdentifierList.GetFilteredCount; - writeln('InitIdentCompletion B Prefix=',Prefix,' ItemCnt=',ItemCnt); + DebugLn('InitIdentCompletion B Prefix=',Prefix,' ItemCnt=',IntToStr(ItemCnt)); CurCompletionControl.Position:=0; for i:=0 to ItemCnt-1 do s.Add('Dummy');