From 9ca1326edd9be2a63ad9d32ab1a5241d2c8a01c6 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Mon, 10 Jul 2017 11:28:04 +0200 Subject: [PATCH] remove dead vars + reimplement dup checker in libman ctor, deleted IDKW --- src/ce_libman.pas | 15 ++++++++++----- src/ce_messages.pas | 1 - 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/ce_libman.pas b/src/ce_libman.pas index 49f1da89..4fc7411a 100644 --- a/src/ce_libman.pas +++ b/src/ce_libman.pas @@ -322,8 +322,8 @@ end; constructor TLibraryManager.create(aOwner: TComponent); var nme: string; - als: string; - lib: TLibraryItem; + lb2: TLibraryItem; + lb1: TLibraryItem; i: integer; begin inherited; @@ -335,9 +335,14 @@ begin loadFromFile(nme); for i := fCollection.Count-1 downto 0 do begin - lib := libraryByIndex[i]; - als := lib.libAlias.upperCase; - lib.updateModulesInfo; + lb2 := libraryByIndex[i]; + lb1 := libraryByAlias[lb2.libAlias]; + if lb1.isNotNil and (lb1.Index < lb2.Index) then + begin + fCollection.Delete(i); + continue; + end; + lb2.updateModulesInfo; end; updateItemsByAlias; updateDCD; diff --git a/src/ce_messages.pas b/src/ce_messages.pas index 98298ff8..9d93f8b6 100644 --- a/src/ce_messages.pas +++ b/src/ce_messages.pas @@ -1003,7 +1003,6 @@ procedure TCEMessagesWidget.filterMessages(aCtxt: TCEAppMessageCtxt); var itm: TTreeNode; i: integer; - f: boolean; begin if updating then exit;