Examples, Multithreading: cleaned up LRS files

git-svn-id: trunk@39346 -
2025-10-20 16:31:34 +02:00 · 2012-11-22 19:41:50 +00:00 · 2012-11-22 19:41:50 +00:00 · 622a8a0c6b
commit 622a8a0c6b
parent ca534db83b
13 changed files with 57 additions and 90 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -4396,21 +4396,18 @@ examples/mssql/mssqlconnsample.lpr svneol=native#text/plain
 examples/multithreading/criticalsectionexample1.lpi svneol=native#text/plain
 examples/multithreading/criticalsectionexample1.lpr svneol=native#text/plain
 examples/multithreading/criticalsectionunit1.lfm svneol=native#text/plain
-examples/multithreading/criticalsectionunit1.lrs svneol=native#text/pascal
 examples/multithreading/criticalsectionunit1.pas svneol=native#text/plain
 examples/multithreading/mainunit.lfm svneol=native#text/plain
 examples/multithreading/mainunit.pas svneol=native#text/plain
 examples/multithreading/multithreadingexample1.lpi svneol=native#text/plain
 examples/multithreading/multithreadingexample1.lpr svneol=native#text/plain
 examples/multithreading/processmessagesunit1.lfm svneol=native#text/plain
-examples/multithreading/processmessagesunit1.lrs svneol=native#text/pascal
 examples/multithreading/processmessagesunit1.pas svneol=native#text/plain
 examples/multithreading/singlethreadingexample1.lpi svneol=native#text/plain
 examples/multithreading/singlethreadingexample1.lpr svneol=native#text/plain
 examples/multithreading/waitforexample1.lpi svneol=native#text/plain
 examples/multithreading/waitforexample1.lpr svneol=native#text/plain
 examples/multithreading/waitforunit1.lfm svneol=native#text/plain
-examples/multithreading/waitforunit1.lrs svneol=native#text/pascal
 examples/multithreading/waitforunit1.pas svneol=native#text/plain
 examples/notebk.lpi svneol=native#text/plain
 examples/notebk.pp svneol=native#text/pascal
--- a/examples/multithreading/criticalsectionexample1.lpi
+++ b/examples/multithreading/criticalsectionexample1.lpi
@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <CONFIG>
  <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
    <General>
      <Flags>
        <LRSInOutputDirectory Value="False"/>
      </Flags>
      <SessionStorage Value="InProjectDir"/>
      <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
+      <ResourceType Value="res"/>
    </General>
-    <VersionInfo>
-      <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="0.0.0.0" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion="0.0.0.0"/>
-    </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
    <PublishOptions>
      <Version Value="2"/>
      <IgnoreBinaries Value="False"/>
@ -40,16 +40,22 @@
        <Filename Value="criticalsectionunit1.pas"/>
        <IsPartOfProject Value="True"/>
        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="CriticalSectionUnit1"/>
      </Unit1>
    </Units>
  </ProjectOptions>
  <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
    <SearchPaths>
-      <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/>
+      <SrcPath Value="$(LazarusDir)/lcl;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)"/>
    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
    <Linking>
      <Options>
        <Win32>
--- a/examples/multithreading/criticalsectionunit1.lfm
+++ b/examples/multithreading/criticalsectionunit1.lfm
@ -9,20 +9,20 @@ object Form1: TForm1
  Caption = 'Form1'
  ClientHeight = 169
  ClientWidth = 312
-  LCLVersion = '0.9.29'
+  LCLVersion = '1.1'
  object Label1: TLabel
    Left = 43
-    Height = 18
+    Height = 13
    Top = 125
-    Width = 46
+    Width = 31
    Caption = 'Label1'
    ParentColor = False
  end
  object CountWithCritSecButton: TButton
    Left = 40
-    Height = 37
+    Height = 31
    Top = 24
-    Width = 196
+    Width = 156
    AutoSize = True
    BorderSpacing.InnerBorder = 4
    Caption = 'Count with critical section'
@ -31,9 +31,9 @@ object Form1: TForm1
  end
  object CountWithoutCritSecButton: TButton
    Left = 40
-    Height = 37
+    Height = 31
    Top = 64
-    Width = 219
+    Width = 172
    AutoSize = True
    BorderSpacing.InnerBorder = 4
    Caption = 'Count without critical section'
--- a/examples/multithreading/criticalsectionunit1.lrs
+++ b/examples/multithreading/criticalsectionunit1.lrs
@ -1,17 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#30#1#6'Height'#3#169#0#3'Top'#3#202#0#5'W'
-  +'idth'#3'8'#1#18'HorzScrollBar.Page'#3'7'#1#18'VertScrollBar.Page'#3#168#0#13
-  +'ActiveControl'#7#22'CountWithCritSecButton'#7'Caption'#6#5'Form1'#12'Client'
-  +'Height'#3#169#0#11'ClientWidth'#3'8'#1#10'LCLVersion'#6#6'0.9.29'#0#6'TLabe'
-  +'l'#6'Label1'#4'Left'#2'+'#6'Height'#2#18#3'Top'#2'}'#5'Width'#2'.'#7'Captio'
-  +'n'#6#6'Label1'#11'ParentColor'#8#0#0#7'TButton'#22'CountWithCritSecButton'#4
-  +'Left'#2'('#6'Height'#2'%'#3'Top'#2#24#5'Width'#3#196#0#8'AutoSize'#9#25'Bor'
-  +'derSpacing.InnerBorder'#2#4#7'Caption'#6#27'Count with critical section'#7
-  +'OnClick'#7#27'CountWithCritSecButtonClick'#8'TabOrder'#2#0#0#0#7'TButton'#25
-  +'CountWithoutCritSecButton'#4'Left'#2'('#6'Height'#2'%'#3'Top'#2'@'#5'Width'
-  +#3#219#0#8'AutoSize'#9#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#30'Cou'
-  +'nt without critical section'#7'OnClick'#7#30'CountWithoutCritSecButtonClick'
-  +#8'TabOrder'#2#1#0#0#0
-]);
--- a/examples/multithreading/criticalsectionunit1.pas
+++ b/examples/multithreading/criticalsectionunit1.pas
@ -33,7 +33,7 @@ unit CriticalSectionUnit1;
 interface

 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons,
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Buttons,
  StdCtrls, LCLProc, LCLType, LCLIntf;

 type
@ -69,6 +69,8 @@ var

 implementation

+{$R *.lfm}
+
 { TForm1 }

 procedure TForm1.CountWithCritSecButtonClick(Sender: TObject);
@ -143,8 +145,5 @@ begin
  FAFinished:=true;
 end;

-initialization
-  {$I criticalsectionunit1.lrs}
-
 end.

--- a/examples/multithreading/processmessagesunit1.lfm
+++ b/examples/multithreading/processmessagesunit1.lfm
@ -10,7 +10,7 @@ object Form1: TForm1
  ClientHeight = 142
  ClientWidth = 303
  OnCreate = FormCreate
-  LCLVersion = '0.9.29'
+  LCLVersion = '1.1'
  object StartStopButton: TButton
    Left = 72
    Height = 25
--- a/examples/multithreading/processmessagesunit1.lrs
+++ b/examples/multithreading/processmessagesunit1.lrs
@ -1,14 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#30#1#6'Height'#3#142#0#3'Top'#3#202#0#5'W'
-  +'idth'#3'/'#1#18'HorzScrollBar.Page'#3'.'#1#18'VertScrollBar.Page'#3#141#0#13
-  +'ActiveControl'#7#15'StartStopButton'#7'Caption'#6#5'Form1'#12'ClientHeight'
-  +#3#142#0#11'ClientWidth'#3'/'#1#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'#6
-  +#6'0.9.29'#0#7'TButton'#15'StartStopButton'#4'Left'#2'H'#6'Height'#2#25#3'To'
-  +'p'#2'('#5'Width'#3#158#0#7'Anchors'#11#5'akTop'#0#25'BorderSpacing.InnerBor'
-  +'der'#2#4#7'Caption'#6#5'Start'#7'OnClick'#7#20'StartStopButtonClick'#8'TabO'
-  +'rder'#2#0#0#0#12'TProgressBar'#12'ProgressBar1'#4'Left'#2' '#6'Height'#2#20
-  +#3'Top'#2'X'#5'Width'#3#244#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#3
-  +'Max'#3#232#3#6'Smooth'#9#4'Step'#2#1#8'TabOrder'#2#1#0#0#0
-]);
--- a/examples/multithreading/processmessagesunit1.pas
+++ b/examples/multithreading/processmessagesunit1.pas
@ -28,7 +28,7 @@ unit ProcessMessagesUnit1;
 interface

 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons,
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Buttons,
  ComCtrls, FileUtil, StdCtrls;

 type
@ -54,6 +54,8 @@ var

 implementation

+{$R *.lfm}
+
 { TForm1 }

 procedure TForm1.FormCreate(Sender: TObject);
@ -133,8 +135,5 @@ begin
  end;
 end;

-initialization
-  {$I processmessagesunit1.lrs}
-
 end.

--- a/examples/multithreading/singlethreadingexample1.lpi
+++ b/examples/multithreading/singlethreadingexample1.lpi
@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <CONFIG>
  <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
    <General>
      <Flags>
        <LRSInOutputDirectory Value="False"/>
      </Flags>
      <SessionStorage Value="InProjectDir"/>
      <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
+      <ResourceType Value="res"/>
    </General>
-    <VersionInfo>
-      <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="0.0.0.0" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion="0.0.0.0"/>
-    </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
    <PublishOptions>
      <Version Value="2"/>
      <IgnoreBinaries Value="False"/>
@ -40,16 +40,22 @@
        <Filename Value="processmessagesunit1.pas"/>
        <IsPartOfProject Value="True"/>
        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="ProcessMessagesUnit1"/>
      </Unit1>
    </Units>
  </ProjectOptions>
  <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
    <SearchPaths>
-      <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/>
+      <SrcPath Value="$(LazarusDir)/lcl;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)"/>
    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
    <Linking>
      <Options>
        <Win32>
--- a/examples/multithreading/waitforexample1.lpi
+++ b/examples/multithreading/waitforexample1.lpi
@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <CONFIG>
  <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
    <General>
      <Flags>
        <LRSInOutputDirectory Value="False"/>
      </Flags>
      <SessionStorage Value="InProjectDir"/>
      <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
+      <ResourceType Value="res"/>
    </General>
-    <VersionInfo>
-      <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="0.0.0.0" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion="0.0.0.0"/>
-    </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
    <PublishOptions>
      <Version Value="2"/>
      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
@ -39,16 +39,22 @@
        <Filename Value="waitforunit1.pas"/>
        <IsPartOfProject Value="True"/>
        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="WaitForUnit1"/>
      </Unit1>
    </Units>
  </ProjectOptions>
  <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
    <SearchPaths>
-      <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/>
+      <SrcPath Value="$(LazarusDir)/lcl;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)"/>
    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
    <Linking>
      <Options>
        <Win32>
--- a/examples/multithreading/waitforunit1.lfm
+++ b/examples/multithreading/waitforunit1.lfm
@ -11,7 +11,7 @@ object Form1: TForm1
  ClientWidth = 394
  OnCreate = FormCreate
  OnDestroy = FormDestroy
-  LCLVersion = '0.9.29'
+  LCLVersion = '1.1'
  object Button1: TButton
    Left = 32
    Height = 25
--- a/examples/multithreading/waitforunit1.lrs
+++ b/examples/multithreading/waitforunit1.lrs
@ -1,14 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#30#1#6'Height'#3'g'#1#3'Top'#3#202#0#5'Wi'
-  +'dth'#3#138#1#18'HorzScrollBar.Page'#3#137#1#18'VertScrollBar.Page'#3'f'#1#13
-  +'ActiveControl'#7#7'Button1'#7'Caption'#6#5'Form1'#12'ClientHeight'#3'g'#1#11
-  +'ClientWidth'#3#138#1#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDes'
-  +'troy'#10'LCLVersion'#6#6'0.9.29'#0#7'TButton'#7'Button1'#4'Left'#2' '#6'Hei'
-  +'ght'#2#25#3'Top'#2#16#5'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#4#7'Cap'
-  +'tion'#6#5'Start'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#0#0#0#5'TMemo'
-  +#5'Memo1'#4'Left'#2#0#6'Height'#3'/'#1#3'Top'#2'8'#5'Width'#3#138#1#7'Anchor'
-  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#10'ScrollBars'#7#10'ssAut'
-  +'oBoth'#8'TabOrder'#2#1#0#0#0
-]);
--- a/examples/multithreading/waitforunit1.pas
+++ b/examples/multithreading/waitforunit1.pas
@ -28,7 +28,7 @@ unit WaitForUnit1;
 interface

 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons,
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Buttons,
  StdCtrls, LCLProc;

 type
@ -80,6 +80,8 @@ var

 implementation

+{$R *.lfm}
+
 { TForm1 }

 procedure TForm1.Button1Click(Sender: TObject);
@ -155,8 +157,5 @@ begin
  LeaveCriticalsection(Form1.ACriticalSection);
 end;

-initialization
-  {$I waitforunit1.lrs}
-
 end.