Changeset 86


Ignore:
Timestamp:
Oct 31, 2010, 9:30:56 PM (14 years ago)
Author:
george
Message:
  • Modified: In all files include directive changed to shorter form {$I 'file.inc'}.
  • Fixed: Export directory Generic as include dir.
Location:
Generics/TemplateGenerics
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • Generics/TemplateGenerics/Demo/ListObject.pas

    r84 r86  
    1818{$DEFINE TGObjectListStringConverter := TObjectListStringConverterInteger}
    1919{$DEFINE INTERFACE}
    20 {$INCLUDE '..\Generic\GenericObjectList.inc'}
     20{$I 'GenericObjectList.inc'}
    2121
    2222
    2323implementation
     24
     25{$DEFINE IMPLEMENTATION_USES}
     26{$I 'GenericObjectList.inc'}
    2427
    2528// TListObject<Integer, TObject>
    … …  
    3134{$DEFINE TGObjectListStringConverter := TObjectListStringConverterInteger}
    3235{$DEFINE IMPLEMENTATION}
    33 {$INCLUDE '..\Generic\GenericObjectList.inc'}
     36{$I 'GenericObjectList.inc'}
    3437
    3538end.

  • Generics/TemplateGenerics/Generic/GenericDictionary.inc

    r84 r86  
    1414{$DEFINE TGListStringConverter := TDictionaryStringConverter}
    1515{$DEFINE INTERFACE}
    16 {$INCLUDE 'GenericList.inc'}
     16{$I 'GenericList.inc'}
    1717
    1818  // TGDictionary<TGDictionaryIndex, TGPair<TGPairKey, TGPairValue>> = class(TGList)
    … …  
    3939{$UNDEF IMPLEMENTATION}
    4040{$DEFINE IMPLEMENTATION_USES}
    41 {$INCLUDE '..\Generic\GenericList.inc'}
     41{$I '..\Generic\GenericList.inc'}
    4242
    4343{$DEFINE TGListIndex := TGDictionaryIndex}
    … …  
    4747{$DEFINE TGListStringConverter := TDictionaryStringConverter}
    4848{$DEFINE IMPLEMENTATION}
    49 {$INCLUDE 'GenericList.inc'}
     49{$I 'GenericList.inc'}
    5050
    5151function TGDictionary.GetKey(Index: TGDictionaryIndex): TGPairKey;

  • Generics/TemplateGenerics/Generic/GenericObjectList.inc

    r85 r86  
    77{$DEFINE TGListStringConverter := TGObjectListStringConverter}
    88{$DEFINE INTERFACE}
    9 {$INCLUDE 'GenericList.inc'}
     9{$I 'GenericList.inc'}
    1010
    1111  // TGObjectList<TObjectListIndex, TObjectListItem> = class(TGList)
    … …  
    2727
    2828  {$DEFINE IMPLEMENTATION_USES}
    29   {$INCLUDE '..\Generic\GenericList.inc'}
     29  {$I '..\Generic\GenericList.inc'}
    3030
    3131{$UNDEF IMPLEMENTATION_USES}
    … …  
    4040{$DEFINE TGListStringConverter := TGObjectListStringConverter}
    4141{$DEFINE IMPLEMENTATION}
    42 {$INCLUDE 'GenericList.inc'}
     42{$I 'GenericList.inc'}
    4343
    4444{ TGObjectList }

  • Generics/TemplateGenerics/Generic/GenericQueue.inc

    r84 r86  
    77{$DEFINE TGListStringConverter := TGQueueStringConverter}
    88{$DEFINE INTERFACE}
    9 {$INCLUDE 'GenericList.inc'}
     9{$I 'GenericList.inc'}
    1010
    1111  // TGQueue<TSetIndex, TSetItem> = class(TGList)
    … …  
    2828
    2929  {$DEFINE IMPLEMENTATION_USES}
    30   {$INCLUDE '..\Generic\GenericList.inc'}
     30  {$I 'GenericList.inc'}
    3131
    3232{$UNDEF IMPLEMENTATION_USES}
    … …  
    4141{$DEFINE TGListStringConverter := TGQueueStringConverter}
    4242{$DEFINE IMPLEMENTATION}
    43 {$INCLUDE 'GenericList.inc'}
     43{$I 'GenericList.inc'}
    4444
    4545{ TGQueue }

  • Generics/TemplateGenerics/Generic/GenericSet.inc

    r84 r86  
    77{$DEFINE TGListStringConverter := TGSetStringConverter}
    88{$DEFINE INTERFACE}
    9 {$INCLUDE 'GenericList.inc'}
     9{$I 'GenericList.inc'}
    1010
    1111  // TGSet<TGSetIndex, TGSetItem> = class
    … …  
    2626
    2727  {$DEFINE IMPLEMENTATION_USES}
    28   {$INCLUDE '..\Generic\GenericList.inc'}
     28  {$I 'GenericList.inc'}
    2929
    3030{$UNDEF IMPLEMENTATION_USES}
    … …  
    3939{$DEFINE TGListStringConverter := TGSetStringConverter}
    4040{$DEFINE IMPLEMENTATION}
    41 {$INCLUDE 'GenericList.inc'}
     41{$I 'GenericList.inc'}
    4242
    4343{ TGSet }

  • Generics/TemplateGenerics/Generic/GenericStack.inc

    r84 r86  
    77{$DEFINE TGListStringConverter := TGStackStringConverter}
    88{$DEFINE INTERFACE}
    9 {$INCLUDE 'GenericList.inc'}
     9{$I 'GenericList.inc'}
    1010
    1111  // TGStack<TStackIndex, TStackItem> = class(TGList)
    … …  
    2727
    2828  {$DEFINE IMPLEMENTATION_USES}
    29   {$INCLUDE '..\Generic\GenericList.inc'}
     29  {$I 'GenericList.inc'}
    3030
    3131{$UNDEF IMPLEMENTATION_USES}
    … …  
    4040{$DEFINE TGListStringConverter := TGStackStringConverter}
    4141{$DEFINE IMPLEMENTATION}
    42 {$INCLUDE 'GenericList.inc'}
     42{$I 'GenericList.inc'}
    4343
    4444{ TGStack }

  • Generics/TemplateGenerics/Generic/GenericTree.inc

    r84 r86  
    99{$DEFINE TGListStringConverter := TGTreeStringConverter}
    1010{$DEFINE INTERFACE}
    11 {$INCLUDE 'GenericList.inc'}
     11{$I 'GenericList.inc'}
    1212
    1313  // TGTreeNode<TGTreeIndex, TGTreeItem> = class
    … …  
    3030
    3131  {$DEFINE IMPLEMENTATION_USES}
    32   {$INCLUDE 'GenericList.inc'}
     32  {$I 'GenericList.inc'}
    3333
    3434{$UNDEF INTERFACE_USES}
    … …  
    4545{$DEFINE TGListStringConverter := TGTreeStringConverter}
    4646{$DEFINE IMPLEMENTATION}
    47 {$INCLUDE 'GenericList.inc'}
     47{$I 'GenericList.inc'}
    4848
    4949{ TGTreeNode }

  • Generics/TemplateGenerics/Specialized/SpecializedDictionary.pas

    r84 r86  
    2121{$DEFINE TGDictionaryStringConverter := TDictionaryStringConverterInteger}
    2222{$DEFINE INTERFACE}
    23 {$INCLUDE '..\Generic\GenericDictionary.inc'}
     23{$I 'GenericDictionary.inc'}
    2424
    2525implementation
    … …  
    3535{$DEFINE TGDictionaryStringConverter := TDictionaryStringConverterInteger}
    3636{$DEFINE IMPLEMENTATION}
    37 {$INCLUDE '..\Generic\GenericDictionary.inc'}
     37{$I 'GenericDictionary.inc'}
    3838
    3939end.

  • Generics/TemplateGenerics/Specialized/SpecializedList.pas

    r84 r86  
    1818{$DEFINE TGListStringConverter := TListIntegerStringConverter}
    1919{$DEFINE INTERFACE}
    20 {$INCLUDE '..\Generic\GenericList.inc'}
     20{$I 'GenericList.inc'}
    2121
    2222// TListSmallInt<Integer, SmallInt>
    … …  
    2727{$DEFINE TGListStringConverter := TListSmallIntStringConverter}
    2828{$DEFINE INTERFACE}
    29 {$INCLUDE '..\Generic\GenericList.inc'}
     29{$I 'GenericList.inc'}
    3030
    3131// TListDouble<Integer, Double>
    … …  
    4545{$DEFINE TGListStringConverter := TListPointerStringConverter}
    4646{$DEFINE INTERFACE}
    47 {$INCLUDE '..\Generic\GenericList.inc'}
     47{$I 'GenericList.inc'}
    4848
    4949// TListString<Integer, string>
    … …  
    5454{$DEFINE TGListStringConverter := TListStringStringConverter}
    5555{$DEFINE INTERFACE}
    56 {$INCLUDE '..\Generic\GenericList.inc'}
     56{$I 'GenericList.inc'}
    5757
    5858// TListByte<Integer, Byte>
    … …  
    6363{$DEFINE TGListStringConverter := TListByteStringConverter}
    6464{$DEFINE INTERFACE}
    65 {$INCLUDE '..\Generic\GenericList.inc'}
    66 
    67 
     65{$I 'GenericList.inc'}
    6866
    6967// TListChar<Integer, Char>
    … …  
    7472{$DEFINE TGListStringConverter := TListStringConverterChar}
    7573{$DEFINE INTERFACE}
    76 {$INCLUDE '..\Generic\GenericList.inc'}
     74{$I 'GenericList.inc'}
    7775
    7876{ TListChar }
    … …  
    9088
    9189{$DEFINE IMPLEMENTATION_USES}
    92 {$INCLUDE '..\Generic\GenericList.inc'}
     90{$I 'GenericList.inc'}
    9391
    9492// TListInteger<Integer, Integer>
    … …  
    9997{$DEFINE TGListStringConverter:=TListIntegerStringConverter}
    10098{$DEFINE IMPLEMENTATION}
    101 {$INCLUDE '..\Generic\GenericList.inc'}
     99{$I 'GenericList.inc'}
    102100
    103101// TListSmallInt<Integer, SmallInt>
    … …  
    108106{$DEFINE TGListStringConverter:=TListSmallIntStringConverter}
    109107{$DEFINE IMPLEMENTATION}
    110 {$INCLUDE '..\Generic\GenericList.inc'}
     108{$I 'GenericList.inc'}
    111109
    112110// TListDouble<Integer, Double>
    … …  
    117115{$DEFINE TGListStringConverter := TListDoubleStringConverter}
    118116{$DEFINE IMPLEMENTATION}
    119 {$INCLUDE '..\Generic\GenericList.inc'}
     117{$I 'GenericList.inc'}
    120118
    121119// TListPointer<Integer, Pointer>
    … …  
    126124{$DEFINE TGListStringConverter := TListPointerStringConverter}
    127125{$DEFINE IMPLEMENTATION}
    128 {$INCLUDE '..\Generic\GenericList.inc'}
     126{$I 'GenericList.inc'}
    129127
    130128// TListString<Integer, string>
    … …  
    135133{$DEFINE TGListStringConverter := TListStringStringConverter}
    136134{$DEFINE IMPLEMENTATION}
    137 {$INCLUDE '..\Generic\GenericList.inc'}
     135{$I 'GenericList.inc'}
    138136
    139137// TListByte<Integer, Byte>
    … …  
    144142{$DEFINE TGListStringConverter := TListByteStringConverter}
    145143{$DEFINE IMPLEMENTATION}
    146 {$INCLUDE '..\Generic\GenericList.inc'}
     144{$I 'GenericList.inc'}
    147145
    148146// TListByte<Integer, Char>
    … …  
    153151{$DEFINE TGListStringConverter := TListStringConverterChar}
    154152{$DEFINE IMPLEMENTATION}
    155 {$INCLUDE '..\Generic\GenericList.inc'}
     153{$I 'GenericList.inc'}
    156154
    157155{ TListChar }

  • Generics/TemplateGenerics/Specialized/SpecializedQueue.pas

    r84 r86  
    1919{$DEFINE TGQueueStringConverter := TQueueStringConverterInteger}
    2020{$DEFINE INTERFACE}
    21 {$INCLUDE '..\Generic\GenericQueue.inc'}
     21{$I 'GenericQueue.inc'}
    2222
    2323// TQueueInteger<Integer, Pointer>
    … …  
    2929{$DEFINE TGQueueStringConverter := TQueueStringConverterPointer}
    3030{$DEFINE INTERFACE}
    31 {$INCLUDE '..\Generic\GenericQueue.inc'}
     31{$I 'GenericQueue.inc'}
    3232
    3333// TQueueByte<Integer, Byte>
    … …  
    3939{$DEFINE TGQueueStringConverter := TQueueStringConverterByte}
    4040{$DEFINE INTERFACE}
    41 {$INCLUDE '..\Generic\GenericQueue.inc'}
     41{$I 'GenericQueue.inc'}
    4242
    4343implementation
    4444
    4545{$DEFINE IMPLEMENTATION_USES}
    46 {$INCLUDE '..\Generic\GenericQueue.inc'}
     46{$I 'GenericQueue.inc'}
    4747
    4848// TQueueInteger<Integer, Integer>
    … …  
    5454{$DEFINE TGQueueStringConverter := TQueueStringConverterInteger}
    5555{$DEFINE IMPLEMENTATION}
    56 {$INCLUDE '..\Generic\GenericQueue.inc'}
     56{$I '..\Generic\GenericQueue.inc'}
    5757
    5858// TQueueInteger<Integer, Pointer>
    … …  
    6464{$DEFINE TGQueueStringConverter := TQueueStringConverterPointer}
    6565{$DEFINE IMPLEMENTATION}
    66 {$INCLUDE '..\Generic\GenericQueue.inc'}
     66{$I 'GenericQueue.inc'}
    6767
    6868// TQueueByte<Integer, Byte>
    … …  
    7474{$DEFINE TGQueueStringConverter := TQueueStringConverterByte}
    7575{$DEFINE IMPLEMENTATION}
    76 {$INCLUDE '..\Generic\GenericQueue.inc'}
     76{$I 'GenericQueue.inc'}
    7777
    7878end.

  • Generics/TemplateGenerics/Specialized/SpecializedSet.pas

    r84 r86  
    1919{$DEFINE TGSetStringConverter := TSetStringConverterInteger}
    2020{$DEFINE INTERFACE}
    21 {$INCLUDE '..\Generic\GenericSet.inc'}
     21{$I 'GenericSet.inc'}
    2222
    2323// TSetPointer<Integer, Pointer>
    … …  
    2929{$DEFINE TGSetStringConverter := TSetStringConverterPointer}
    3030{$DEFINE INTERFACE}
    31 {$INCLUDE '..\Generic\GenericSet.inc'}
     31{$I 'GenericSet.inc'}
    3232
    3333implementation
    3434
    3535{$DEFINE IMPLEMENTATION_USES}
    36 {$INCLUDE '..\Generic\GenericSet.inc'}
     36{$I 'GenericSet.inc'}
    3737
    3838// TSetInteger<Integer, Integer>
    … …  
    4444{$DEFINE TGSetStringConverter := TSetStringConverterInteger}
    4545{$DEFINE IMPLEMENTATION}
    46 {$INCLUDE '..\Generic\GenericSet.inc'}     
     46{$I 'GenericSet.inc'}
    4747
    4848// TSetPointer<Integer, Pointer>
    … …  
    5454{$DEFINE TGSetStringConverter := TSetStringConverterPointer}
    5555{$DEFINE IMPLEMENTATION}
    56 {$INCLUDE '..\Generic\GenericSet.inc'}
     56{$I 'GenericSet.inc'}
    5757
    5858end.

  • Generics/TemplateGenerics/Specialized/SpecializedStack.pas

    r84 r86  
    1919{$DEFINE TGStackStringConverter := TStackStringConverterInteger}
    2020{$DEFINE INTERFACE}
    21 {$INCLUDE '..\Generic\GenericStack.inc'}
     21{$I 'GenericStack.inc'}
    2222
    2323// TStackInteger<Integer, Pointer>
    … …  
    2929{$DEFINE TGStackStringConverter := TStackStringConverterPointer}
    3030{$DEFINE INTERFACE}
    31 {$INCLUDE '..\Generic\GenericStack.inc'}
     31{$I 'GenericStack.inc'}
    3232
    3333
    … …  
    3535
    3636{$DEFINE IMPLEMENTATION_USES}
    37 {$INCLUDE '..\Generic\GenericStack.inc'}
     37{$I 'GenericStack.inc'}
    3838
    3939// TStackInteger<Integer, Integer>
    … …  
    4545{$DEFINE TGStackStringConverter := TStackStringConverterInteger}
    4646{$DEFINE IMPLEMENTATION}
    47 {$INCLUDE '..\Generic\GenericStack.inc'}     
     47{$I 'GenericStack.inc'}
    4848
    4949// TStackInteger<Integer, Pointer>
    … …  
    5555{$DEFINE TGStackStringConverter := TStackStringConverterPointer}
    5656{$DEFINE IMPLEMENTATION}
    57 {$INCLUDE '..\Generic\GenericStack.inc'}
     57{$I 'GenericStack.inc'}
    5858end.

  • Generics/TemplateGenerics/Specialized/SpecializedTree.pas

    r84 r86  
    1919{$DEFINE TGTreeStringConverter := TTreeStringConverterInteger}
    2020{$DEFINE INTERFACE}
    21 {$INCLUDE '..\Generic\GenericTree.inc'}
     21{$I 'GenericTree.inc'}
    2222
    2323// TTreeString<Integer, string>
    … …  
    3030{$DEFINE TGTreeStringConverter := TTreeStringConverterString}
    3131{$DEFINE INTERFACE}
    32 {$INCLUDE '..\Generic\GenericTree.inc'}
     32{$I 'GenericTree.inc'}
    3333
    3434// TTreePointer<Integer, Pointer>
    … …  
    4141{$DEFINE TGTreeStringConverter := TTreeStringConverterPointer}
    4242{$DEFINE INTERFACE}
    43 {$INCLUDE '..\Generic\GenericTree.inc'}
     43{$I 'GenericTree.inc'}
    4444
    4545implementation
    4646
    4747{$DEFINE IMPLEMENTATION_USES}
    48 {$INCLUDE '..\Generic\GenericTree.inc'}
     48{$I 'GenericTree.inc'}
    4949
    5050// TTreeInteger<Integer, Integer>
    … …  
    5757{$DEFINE TGTreeStringConverter := TTreeStringConverterInteger}
    5858{$DEFINE IMPLEMENTATION}
    59 {$INCLUDE '..\Generic\GenericTree.inc'}
     59{$I 'GenericTree.inc'}
    6060
    6161// TTreeString<Integer, string>
    … …  
    6868{$DEFINE TGTreeStringConverter := TTreeStringConverterString}
    6969{$DEFINE IMPLEMENTATION}
    70 {$INCLUDE '..\Generic\GenericTree.inc'}
     70{$I 'GenericTree.inc'}
    7171
    7272// TTreePointer<Integer, Pointer>
    … …  
    7979{$DEFINE TGTreeStringConverter := TTreeStringConverterPointer}
    8080{$DEFINE IMPLEMENTATION}
    81 {$INCLUDE '..\Generic\GenericTree.inc'}
     81{$I 'GenericTree.inc'}
    8282
    8383end.

  • Generics/TemplateGenerics/TemplateGenerics.lpk

    r84 r86  
    99      <PathDelim Value="\"/>
    1010      <SearchPaths>
    11         <OtherUnitFiles Value="Specialized\"/>
     11        <IncludeFiles Value="Generic\"/>
     12        <OtherUnitFiles Value="Specialized\;Generic\"/>
    1213        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
    1314      </SearchPaths>
    … …  
    1617      </Other>
    1718    </CompilerOptions>
    18     <Version Minor="1"/>
     19    <Description Value="Generic classes implemented as templates."/>
     20    <Version Minor="2"/>
    1921    <Files Count="15">
    2022      <Item1>
    … …  
    8789    </RequiredPkgs>
    8890    <UsageOptions>
    89       <UnitPath Value="$(PkgOutDir)"/>
     91      <IncludePath Value="Generic\"/>
     92      <UnitPath Value="$(PkgOutDir)\"/>
    9093    </UsageOptions>
    9194    <PublishOptions>
Note: See TracChangeset for help on using the changeset viewer.