Changeset 132 for trunk/Modules


Ignore:
Timestamp:
Mar 18, 2022, 3:47:27 PM (3 years ago)
Author:
chronos
Message:
  • Modified: Code cleanup.
Location:
trunk/Modules
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Modules/Finance/UModuleFinance.pas

    r105 r132  
    66
    77uses
    8   Classes, SysUtils, UModularSystem, SpecializedDictionary, UModuleBase,
     8  Classes, SysUtils, UModularSystem, UModuleBase,
    99  UWebPage;
    1010
    … …  
    7373var
    7474  DbRows: TDbRows;
    75   Data: TDictionaryStringString;
    7675begin
    7776  try
    7877    DbRows := TDbRows.Create;
    79     Data := TDictionaryStringString.Create;
    8078
    8179    Core.CommonDatabase.Query(DbRows,
    … …  
    144142
    145143  finally
    146     Data.Free;
    147144    DbRows.Free;
    148145  end;

  • trunk/Modules/Network/UModuleNetwork.pas

    r105 r132  
    66
    77uses
    8   Classes, SysUtils, UModularSystem, SpecializedDictionary, UModuleBase,
     8  Classes, SysUtils, UModularSystem, UModuleBase,
    99  UWebPage;
    1010
    … …  
    7373var
    7474  DbRows: TDbRows;
    75   Data: TDictionaryStringString;
    7675begin
    7776  try
    7877    DbRows := TDbRows.Create;
    79     Data := TDictionaryStringString.Create;
    8078
    8179    Core.CommonDatabase.Query(DbRows,
    … …  
    151149
    152150  finally
    153     Data.Free;
    154151    DbRows.Free;
    155152  end;
    156   inherited Install;
     153  inherited;
    157154end;
    158155

  • trunk/Modules/News/UNews.pas

    r107 r132  
    66
    77uses
    8   Classes, SysUtils, SpecializedList, USqlDatabase, UModuleUser, UUtils,
    9   UWebSession, UHTTPServer, UModuleBase;
     8  Classes, SysUtils, USqlDatabase, UModuleUser, UUtils, fgl, UWebSession,
     9  UHTTPServer, UModuleBase, SpecializedList;
    1010
    1111type
    … …  
    1919  end;
    2020
     21  TNewsSettingItems = class(TFPGObjectList<TNewsSettingItem>)
     22  end;
     23
    2124  { TNews }
    2225
    … …  
    2629    UploadedFilesFolder: string; // = 'aktuality/uploads/';
    2730  public
    28     Settings: TListObject; // TListObject<TNewsSettingItem>
     31    Settings: TNewsSettingItems;
    2932    Database: TSqlDatabase;
    3033    ModuleUser: TModuleUser;
    … …  
    152155constructor TNews.Create;
    153156begin
    154   inherited Create;
    155   Settings := TListObject.Create;
     157  inherited;
     158  Settings := TNewsSettingItems.Create;
    156159end;
    157160
    … …  
    159162begin
    160163  FreeAndNil(Settings);
    161   inherited Destroy;
     164  inherited;
    162165end;
    163166

  • trunk/Modules/Portal/UModulePortal.pas

    r130 r132  
    66
    77uses
    8   Classes, SysUtils, UModularSystem, SpecializedDictionary, USqlDatabase,
     8  Classes, SysUtils, UModularSystem, USqlDatabase,
    99  UUtils, UWebSession, SpecializedList, UUser, UWebPage, UHtmlClasses,
    1010  UModuleBase, UModuleUser, UModuleNews;
    … …  
    8585var
    8686  DbRows: TDbRows;
    87   Data: TDictionaryStringString;
    8887begin
    8988  try
    9089    DbRows := TDbRows.Create;
    91     Data := TDictionaryStringString.Create;
    9290
    9391    Core.CommonDatabase.Query(DbRows,
    … …  
    140138
    141139  finally
    142     Data.Free;
    143140    DbRows.Free;
    144141  end;
    145   inherited Install;
     142  inherited;
    146143end;
    147144

  • trunk/Modules/Portal/UPagePortal.pas

    r114 r132  
    77uses
    88  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, UUtils,
    9   SpecializedDictionary, UWebSession, SpecializedList, UHtmlClasses,
    10   UModularSystem, UModuleUser, UModuleNews;
     9  SpecializedDictionary, UWebSession, UHtmlClasses, UModularSystem, UModuleUser,
     10  UModuleNews;
    1111
    1212type
    … …  
    1818  private
    1919    Session: TWebSession;
    20     function ShowPanel(Title, Content: string; Menu: TListString = nil): string;
     20    function ShowPanel(Title, Content: string; Menu: TStrings = nil): string;
    2121    function SystemMessage(Title, Text: string): string;
    2222    function ShowLinks(GroupId: Integer): string;
    … …  
    283283end;
    284284
    285 function TWebPagePortal.ShowPanel(Title, Content: string; Menu: TListString): string;
     285function TWebPagePortal.ShowPanel(Title, Content: string; Menu: TStrings): string;
    286286var
    287287  I: Integer;

  • trunk/Modules/TV/UModuleTV.pas

    r105 r132  
    66
    77uses
    8   Classes, SysUtils, UModularSystem, SpecializedDictionary, UModuleBase,
    9   UWebPage;
     8  Classes, SysUtils, UModularSystem, UModuleBase, UWebPage;
    109
    1110type
    … …  
    7271var
    7372  DbRows: TDbRows;
    74   Data: TDictionaryStringString;
    7573begin
    7674  try
    7775    DbRows := TDbRows.Create;
    78     Data := TDictionaryStringString.Create;
    7976
    8077    Core.CommonDatabase.Query(DbRows,
    … …  
    9592
    9693  finally
    97     Data.Free;
    9894    DbRows.Free;
    9995  end;

  • trunk/Modules/User/UModuleUser.pas

    r108 r132  
    66
    77uses
    8   Classes, SysUtils, UModularSystem, SpecializedDictionary, UUser,
    9   UModuleBase, UWebPage;
     8  Classes, SysUtils, UModularSystem, UUser, UModuleBase, UWebPage;
    109
    1110type
    … …  
    8382var
    8483  DbRows: TDbRows;
    85   Data: TDictionaryStringString;
    8684begin
    8785  try
    8886    DbRows := TDbRows.Create;
    89     Data := TDictionaryStringString.Create;
    9087
    9188    Core.CommonDatabase.Query(DbRows,
    … …  
    171168    '  ADD CONSTRAINT `PermissionUserAssignment_ibfk_2` FOREIGN KEY (`AssignedGroup`) REFERENCES `permissiongroup` (`Id`),' +
    172169    '  ADD CONSTRAINT `PermissionUserAssignment_ibfk_3` FOREIGN KEY (`AssignedOperation`) REFERENCES `permissionoperation` (`Id`);');
    173 
    174 
    175170  finally
    176     Data.Free;
    177171    DbRows.Free;
    178172  end;
    179   inherited Install;
     173  inherited;
    180174end;
    181175
    … …  
    184178  DbRows: TDbRows;
    185179begin
    186   inherited Uninstall;
     180  inherited;
    187181  try
    188182    DbRows := TDbRows.Create;

  • trunk/Modules/ZdechovNET/UModuleZdechovNET.pas

    r119 r132  
    66
    77uses
    8   Classes, SysUtils, UModularSystem, SpecializedDictionary, UWebPage,
     8  Classes, SysUtils, UModularSystem, UWebPage,
    99  UWebSession, DateUtils, UModuleBase, UModuleUser, UIPTVPage,
    1010  UInternetPage, UHostingPage, UHistoryPage, UDocumentsPage, UVoIPPage,
    … …  
    6969destructor TModuleZdechovNET.Destroy;
    7070begin
    71   inherited Destroy;
     71  inherited;
    7272end;
    7373
    … …  
    167167var
    168168  DbRows: TDbRows;
    169   Data: TDictionaryStringString;
    170169begin
    171170  try
    172171    DbRows := TDbRows.Create;
    173     Data := TDictionaryStringString.Create;
    174172
    175173    Core.CommonDatabase.Query(DbRows,
    … …  
    235233
    236234  finally
    237     Data.Free;
    238235    DbRows.Free;
    239236  end;
    240237
    241   inherited Install;
     238  inherited;
    242239end;
    243240
    … …  
    246243  DbRows: TDbRows;
    247244begin
    248   inherited Uninstall;
     245  inherited;
    249246  ModuleBase.GeneratePage := nil;
    250247  try
    … …  
    377374end;
    378375
    379 
    380376end.
    381377
Note: See TracChangeset for help on using the changeset viewer.