Browse Source

Unused code

Source commit: f997d31f88646e0cc995d250e45bdf823eb6be8a
Martin Prikryl 8 months ago
parent
commit
0f32339a84
2 changed files with 3 additions and 16 deletions
  1. 3 12
      source/forms/Copy.cpp
  2. 0 4
      source/windows/WinInterface.h

+ 3 - 12
source/forms/Copy.cpp

@@ -254,17 +254,11 @@ void __fastcall TCopyDialog::AdjustControls()
   RemoteDirectoryEdit->Visible = false;
   LocalDirectoryEdit->Visible = false;
   DirectoryEdit->Visible = FLAGCLEAR(FOptions, coTemp);
-  EnableControl(DirectoryEdit, FLAGCLEAR(FOptions, coDisableDirectory));
   EnableControl(DirectoryLabel, DirectoryEdit->Enabled);
   EnableControl(LocalDirectoryBrowseButton, DirectoryEdit->Enabled);
   DirectoryLabel->FocusControl = DirectoryEdit;
 
-  UnicodeString QueueLabel = LoadStr(COPY_BACKGROUND);
-  if (FLAGCLEAR(FOptions, coNoQueue))
-  {
-    QueueLabel = FMTLOAD(COPY_QUEUE, (QueueLabel));
-  }
-  QueueCheck2->Caption = QueueLabel;
+  QueueCheck2->Caption = FMTLOAD(COPY_QUEUE, (LoadStr(COPY_BACKGROUND)));
 
   AdjustTransferControls();
 
@@ -433,8 +427,7 @@ bool __fastcall TCopyDialog::Execute()
     Configuration->BeginUpdate();
     try
     {
-      if (FLAGSET(OutputOptions, cooSaveSettings) &&
-          FLAGCLEAR(FOptions, coDisableSaveSettings))
+      if (FLAGSET(OutputOptions, cooSaveSettings))
       {
         GUIConfiguration->DefaultCopyParam = Params;
       }
@@ -571,9 +564,7 @@ void __fastcall TCopyDialog::CopyParamListPopup(TRect R, int AdditionalOptions)
   ::CopyParamListPopup(R, FPresetsMenu,
     FCopyParams, FPreset, CopyParamClick,
     AdditionalOptions |
-      FLAGMASK(
-          FLAGCLEAR(FOptions, coDisableSaveSettings) && !RemoteTransfer,
-        cplSaveSettings) |
+      FLAGMASK(!RemoteTransfer, cplSaveSettings) |
       FLAGMASK(FLAGCLEAR(FOutputOptions, cooRemoteTransfer) && FLAGCLEAR(FOptions, coTemp), cplGenerateCode),
     ActualCopyParamAttrs(),
     FSaveSettings);

+ 0 - 4
source/windows/WinInterface.h

@@ -216,12 +216,8 @@ void __fastcall DoConsoleDialog(TTerminal * Terminal,
 // forms\Copy.cpp
 const coTemp                = 0x001;
 const coDisableQueue        = 0x002;
-const coDisableDirectory    = 0x008; // not used anymore
 const coDoNotShowAgain      = 0x020;
-const coDisableSaveSettings = 0x040; // not used anymore
-const coDoNotUsePresets     = 0x080; // not used anymore
 const coAllowRemoteTransfer = 0x100;
-const coNoQueue             = 0x200;
 const coShortCutHint        = 0x800;
 const coAllFiles            = 0x1000;
 const coBrowse              = 0x2000;