Browse Source

Optimization and refactoring

Source commit: 786063bd0a4dc8ae4c756aeeb5daec4e36bb87ab
Martin Prikryl 1 năm trước cách đây
mục cha
commit
630cbfca02

+ 4 - 7
source/forms/SynchronizeChecklist.cpp

@@ -1311,9 +1311,9 @@ TSynchronizeChecklistDialog::TSynchronizeMoveItems __fastcall TSynchronizeCheckl
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::DeleteItem(TListItem * Item)
+void __fastcall TSynchronizeChecklistDialog::DeleteItem(const TSynchronizeChecklist::TItem * ChecklistItem)
 {
-  const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(Item);
+  TListItem * Item = FChecklistToListViewMap[ChecklistItem];
   CountItemTotal(ChecklistItem, -1);
   if (Item->Checked)
   {
@@ -1373,11 +1373,8 @@ void __fastcall TSynchronizeChecklistDialog::MoveActionExecute(TObject *)
 
   FOnSynchronizeMove(Side, FileName, NewFileName, RemoteFile);
 
-  TListItem * Item1 = DebugNotNull(ListView->FindData(0, const_cast<TSynchronizeChecklist::TItem *>(MoveItems.first), true, false));
-  TListItem * Item2 = DebugNotNull(ListView->FindData(0, const_cast<TSynchronizeChecklist::TItem *>(MoveItems.second), true, false));
-
-  DeleteItem(Item1);
-  DeleteItem(Item2);
+  DeleteItem(MoveItems.first);
+  DeleteItem(MoveItems.second);
   UpdateControls();
 }
 //---------------------------------------------------------------------------

+ 1 - 1
source/forms/SynchronizeChecklist.h

@@ -195,7 +195,7 @@ protected:
   void __fastcall CountItemTotal(const TSynchronizeChecklist::TItem * ChecklistItem, int Factor);
   typedef std::pair<const TSynchronizeChecklist::TItem *, const TSynchronizeChecklist::TItem *> TSynchronizeMoveItems;
   TSynchronizeMoveItems __fastcall GetMoveItems();
-  void __fastcall DeleteItem(TListItem * Item);
+  void __fastcall DeleteItem(const TSynchronizeChecklist::TItem * ChecklistItem);
   void __fastcall CheckDirectory(bool Check);
   void __fastcall DoBrowse(TOperationSide Side);
   void __fastcall ListViewHintShow(TCMHintShow & HintShow);