From 9d5979171612db5a89de6ff5e0d2698c8ee4c9c1 Mon Sep 17 00:00:00 2001 From: juha Date: Tue, 9 Jul 2013 21:17:09 +0000 Subject: [PATCH] IDE: rename linking options -> debugging options git-svn-id: trunk@42046 - --- .gitattributes | 4 ++-- ide/compiler.pp | 3 +-- ide/fpmake.pp | 2 +- ...ler_linking_options.lfm => compiler_debugging_options.lfm} | 0 ...ler_linking_options.pas => compiler_debugging_options.pas} | 2 +- ide/main.pp | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) rename ide/frames/{compiler_linking_options.lfm => compiler_debugging_options.lfm} (100%) rename ide/frames/{compiler_linking_options.pas => compiler_debugging_options.pas} (99%) diff --git a/.gitattributes b/.gitattributes index 21d3adffb5..9b5881bfbe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4997,8 +4997,8 @@ ide/frames/compiler_compilation_options.lfm svneol=native#text/plain ide/frames/compiler_compilation_options.pas svneol=native#text/pascal ide/frames/compiler_config_target.lfm svneol=native#text/plain ide/frames/compiler_config_target.pas svneol=native#text/pascal -ide/frames/compiler_linking_options.lfm svneol=native#text/plain -ide/frames/compiler_linking_options.pas svneol=native#text/pascal +ide/frames/compiler_debugging_options.lfm svneol=native#text/plain +ide/frames/compiler_debugging_options.pas svneol=native#text/pascal ide/frames/compiler_messages_options.lfm svneol=native#text/plain ide/frames/compiler_messages_options.pas svneol=native#text/plain ide/frames/compiler_modematrix.lfm svneol=native#text/plain diff --git a/ide/compiler.pp b/ide/compiler.pp index 945e6f0a7f..fe8cb83ad9 100644 --- a/ide/compiler.pp +++ b/ide/compiler.pp @@ -43,8 +43,7 @@ uses IDEMsgIntf, LazIDEIntf, ProjectIntf, CompOptsIntf; type - TOnCmdLineCreate = procedure(var CmdLine: string; var Abort:boolean) - of object; + TOnCmdLineCreate = procedure(var CmdLine: string; var Abort:boolean) of object; {$IFDEF WithAsyncCompile} TBuildProjectData = class diff --git a/ide/fpmake.pp b/ide/fpmake.pp index cfa29d0ba4..dd7dd5f204 100644 --- a/ide/fpmake.pp +++ b/ide/fpmake.pp @@ -198,7 +198,7 @@ begin P.Sources.AddSrc('frames/compiler_codegen_options.pas'); P.Sources.AddSrc('frames/compiler_compilation_options.pas'); P.Sources.AddSrc('frames/compiler_config_target.pas'); - P.Sources.AddSrc('frames/compiler_linking_options.pas'); + P.Sources.AddSrc('frames/compiler_debugging_options.pas'); P.Sources.AddSrc('frames/compiler_messages_options.pas'); P.Sources.AddSrc('frames/compiler_other_options.pas'); P.Sources.AddSrc('frames/compiler_parsing_options.pas'); diff --git a/ide/frames/compiler_linking_options.lfm b/ide/frames/compiler_debugging_options.lfm similarity index 100% rename from ide/frames/compiler_linking_options.lfm rename to ide/frames/compiler_debugging_options.lfm diff --git a/ide/frames/compiler_linking_options.pas b/ide/frames/compiler_debugging_options.pas similarity index 99% rename from ide/frames/compiler_linking_options.pas rename to ide/frames/compiler_debugging_options.pas index 539a78d217..38ae6f8f46 100644 --- a/ide/frames/compiler_linking_options.pas +++ b/ide/frames/compiler_debugging_options.pas @@ -1,4 +1,4 @@ -unit compiler_linking_options; +unit compiler_debugging_options; {$mode objfpc}{$H+} diff --git a/ide/main.pp b/ide/main.pp index 6e1240750b..4adf188638 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -130,7 +130,7 @@ uses project_misc_options, // project compiler option frames compiler_path_options, compiler_config_target, compiler_parsing_options, - compiler_codegen_options, compiler_linking_options, compiler_verbosity_options, + compiler_codegen_options, compiler_debugging_options, compiler_verbosity_options, compiler_messages_options, Compiler_Other_Options, compiler_compilation_options, compiler_buildmacro_options, Compiler_ModeMatrix, // package option frames