Removing duplicate definition of spXXX constants

Source commit: c912c5a065f0c46a75613ad6c788423eb2bf3572

source/forms/CustomScpExplorer.cpp

@@ -4882,7 +4882,7 @@ bool __fastcall TCustomScpExplorerForm::DoSynchronizeDirectories(
   Params.RemoteDirectory = RemoteDirectory;
   int UnusedParams =
     (GUIConfiguration->SynchronizeParams &
-      (spPreviewChanges | spTimestamp | spNotByTime | spBySize));
+      (TTerminal::spPreviewChanges | TTerminal::spTimestamp | TTerminal::spNotByTime | TTerminal::spBySize));
   Params.Params = GUIConfiguration->SynchronizeParams & ~UnusedParams;
   Params.Options = GUIConfiguration->SynchronizeOptions;
   bool SaveSettings = false;
@@ -5042,7 +5042,7 @@ void __fastcall TCustomScpExplorerForm::Synchronize(const UnicodeString LocalDir
 
     AChecklist = Terminal->SynchronizeCollect(LocalDirectory, RemoteDirectory,
       static_cast<TTerminal::TSynchronizeMode>(Mode),
-      &CopyParam, Params | spNoConfirmation, TerminalSynchronizeDirectory,
+      &CopyParam, Params | TTerminal::spNoConfirmation, TerminalSynchronizeDirectory,
       Options);
 
     SAFE_DESTROY(FSynchronizeProgressForm);
@@ -5060,7 +5060,7 @@ void __fastcall TCustomScpExplorerForm::Synchronize(const UnicodeString LocalDir
 
     // No need to call if !AnyOperation
     Terminal->SynchronizeApply(AChecklist, LocalDirectory, RemoteDirectory,
-      &CopyParam, Params | spNoConfirmation, TerminalSynchronizeDirectory);
+      &CopyParam, Params | TTerminal::spNoConfirmation, TerminalSynchronizeDirectory);
   }
   __finally
   {
@@ -5100,7 +5100,7 @@ void __fastcall TCustomScpExplorerForm::SynchronizeSessionLog(const UnicodeStrin
 void __fastcall TCustomScpExplorerForm::GetSynchronizeOptions(
   int Params, TSynchronizeOptions & Options)
 {
-  if (FLAGSET(Params, spSelectedOnly) && SynchronizeAllowSelectedOnly())
+  if (FLAGSET(Params, TTerminal::spSelectedOnly) && SynchronizeAllowSelectedOnly())
   {
     Options.Filter = new TStringList();
     Options.Filter->CaseSensitive = false;
@@ -5166,7 +5166,7 @@ bool __fastcall TCustomScpExplorerForm::DoFullSynchronizeDirectories(
 
         Checklist = Terminal->SynchronizeCollect(LocalDirectory, RemoteDirectory,
           static_cast<TTerminal::TSynchronizeMode>(Mode),
-          &CopyParam, Params | spNoConfirmation, TerminalSynchronizeDirectory,
+          &CopyParam, Params | TTerminal::spNoConfirmation, TerminalSynchronizeDirectory,
           &SynchronizeOptions);
       }
       __finally
@@ -5181,7 +5181,7 @@ bool __fastcall TCustomScpExplorerForm::DoFullSynchronizeDirectories(
         MessageDialog(Message, qtInformation, qaOK,
           HELP_SYNCHRONIZE_NO_DIFFERENCES);
       }
-      else if (FLAGCLEAR(Params, spPreviewChanges) ||
+      else if (FLAGCLEAR(Params, TTerminal::spPreviewChanges) ||
                DoSynchronizeChecklistDialog(Checklist, Mode, Params,
                  LocalDirectory, RemoteDirectory, CustomCommandMenu))
       {
@@ -5190,7 +5190,7 @@ bool __fastcall TCustomScpExplorerForm::DoFullSynchronizeDirectories(
         BatchStart(BatchStorage);
         FAutoOperation = true;
 
-        if (FLAGSET(Params, spPreviewChanges))
+        if (FLAGSET(Params, TTerminal::spPreviewChanges))
         {
           StartTime = Now();
         }
@@ -5201,7 +5201,7 @@ bool __fastcall TCustomScpExplorerForm::DoFullSynchronizeDirectories(
           FSynchronizeProgressForm->Start();
 
           Terminal->SynchronizeApply(Checklist, LocalDirectory, RemoteDirectory,
-            &CopyParam, Params | spNoConfirmation, TerminalSynchronizeDirectory);
+            &CopyParam, Params | TTerminal::spNoConfirmation, TerminalSynchronizeDirectory);
         }
         __finally
         {

source/forms/FullSynchronize.cpp

@@ -14,6 +14,7 @@
 #include <TextsWin.h>
 #include <HelpWin.h>
 #include <GUITools.h>
+#include <Terminal.h>
 #include <CustomWinConfiguration.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
@@ -235,17 +236,18 @@ TSynchronizeMode __fastcall TFullSynchronizeDialog::GetMode()
 //---------------------------------------------------------------------------
 void __fastcall TFullSynchronizeDialog::SetParams(int value)
 {
-  FParams = value & ~(spDelete | spExistingOnly |
-    spPreviewChanges | spTimestamp | spNotByTime | spBySize | spSelectedOnly | spMirror);
-  SynchronizeDeleteCheck->Checked = FLAGSET(value, spDelete);
-  SynchronizeExistingOnlyCheck->Checked = FLAGSET(value, spExistingOnly);
-  SynchronizePreviewChangesCheck->Checked = FLAGSET(value, spPreviewChanges);
-  SynchronizeSelectedOnlyCheck->Checked = FLAGSET(value, spSelectedOnly);
-  if (FLAGSET(value, spTimestamp) && FLAGCLEAR(Options, fsoDisableTimestamp))
+  FParams = value &
+    ~(TTerminal::spDelete | TTerminal::spExistingOnly | TTerminal::spPreviewChanges | TTerminal::spTimestamp |
+      TTerminal::spNotByTime | TTerminal::spBySize | TTerminal::spSelectedOnly | TTerminal::spMirror);
+  SynchronizeDeleteCheck->Checked = FLAGSET(value, TTerminal::spDelete);
+  SynchronizeExistingOnlyCheck->Checked = FLAGSET(value, TTerminal::spExistingOnly);
+  SynchronizePreviewChangesCheck->Checked = FLAGSET(value, TTerminal::spPreviewChanges);
+  SynchronizeSelectedOnlyCheck->Checked = FLAGSET(value, TTerminal::spSelectedOnly);
+  if (FLAGSET(value, TTerminal::spTimestamp) && FLAGCLEAR(Options, fsoDisableTimestamp))
   {
     SynchronizeTimestampsButton->Checked = true;
   }
-  else if (FLAGSET(value, spMirror))
+  else if (FLAGSET(value, TTerminal::spMirror))
   {
     MirrorFilesButton->Checked = true;
   }
@@ -253,23 +255,23 @@ void __fastcall TFullSynchronizeDialog::SetParams(int value)
   {
     SynchronizeFilesButton->Checked = true;
   }
-  SynchronizeByTimeCheck->Checked = FLAGCLEAR(value, spNotByTime);
-  SynchronizeBySizeCheck->Checked = FLAGSET(value, spBySize);
+  SynchronizeByTimeCheck->Checked = FLAGCLEAR(value, TTerminal::spNotByTime);
+  SynchronizeBySizeCheck->Checked = FLAGSET(value, TTerminal::spBySize);
   UpdateControls();
 }
 //---------------------------------------------------------------------------
 int __fastcall TFullSynchronizeDialog::GetParams()
 {
   return FParams |
-    FLAGMASK(SynchronizeDeleteCheck->Checked, spDelete) |
-    FLAGMASK(SynchronizeExistingOnlyCheck->Checked, spExistingOnly) |
-    FLAGMASK(SynchronizePreviewChangesCheck->Checked, spPreviewChanges) |
-    FLAGMASK(SynchronizeSelectedOnlyCheck->Checked, spSelectedOnly) |
+    FLAGMASK(SynchronizeDeleteCheck->Checked, TTerminal::spDelete) |
+    FLAGMASK(SynchronizeExistingOnlyCheck->Checked, TTerminal::spExistingOnly) |
+    FLAGMASK(SynchronizePreviewChangesCheck->Checked, TTerminal::spPreviewChanges) |
+    FLAGMASK(SynchronizeSelectedOnlyCheck->Checked, TTerminal::spSelectedOnly) |
     FLAGMASK(SynchronizeTimestampsButton->Checked && FLAGCLEAR(Options, fsoDisableTimestamp),
-      spTimestamp) |
-    FLAGMASK(MirrorFilesButton->Checked, spMirror) |
-    FLAGMASK(!SynchronizeByTimeCheck->Checked, spNotByTime) |
-    FLAGMASK(SynchronizeBySizeCheck->Checked, spBySize);
+      TTerminal::spTimestamp) |
+    FLAGMASK(MirrorFilesButton->Checked, TTerminal::spMirror) |
+    FLAGMASK(!SynchronizeByTimeCheck->Checked, TTerminal::spNotByTime) |
+    FLAGMASK(SynchronizeBySizeCheck->Checked, TTerminal::spBySize);
 }
 //---------------------------------------------------------------------------
 void __fastcall TFullSynchronizeDialog::LocalDirectoryBrowseButtonClick(
@@ -377,7 +379,7 @@ TCopyParamType __fastcall TFullSynchronizeDialog::GetCopyParams()
   TCopyParamType Result = FCopyParams;
   // when synchronizing by time, we force preserving time,
   // otherwise it does not make any sense
-  if (FLAGCLEAR(Params, spNotByTime))
+  if (FLAGCLEAR(Params, TTerminal::spNotByTime))
   {
     Result.PreserveTime = true;
   }

source/forms/Synchronize.cpp

@@ -204,9 +204,9 @@ void __fastcall TSynchronizeDialog::SetParams(const TSynchronizeParamType& value
   FParams = value;
   RemoteDirectoryEdit->Text = value.RemoteDirectory;
   LocalDirectoryEdit->Text = value.LocalDirectory;
-  SynchronizeDeleteCheck->Checked = FLAGSET(value.Params, spDelete);
-  SynchronizeExistingOnlyCheck->Checked = FLAGSET(value.Params, spExistingOnly);
-  SynchronizeSelectedOnlyCheck->Checked = FLAGSET(value.Params, spSelectedOnly);
+  SynchronizeDeleteCheck->Checked = FLAGSET(value.Params, TTerminal::spDelete);
+  SynchronizeExistingOnlyCheck->Checked = FLAGSET(value.Params, TTerminal::spExistingOnly);
+  SynchronizeSelectedOnlyCheck->Checked = FLAGSET(value.Params, TTerminal::spSelectedOnly);
   SynchronizeRecursiveCheck->Checked = FLAGSET(value.Options, soRecurse);
   SynchronizeSynchronizeCheck->State =
     FLAGSET(value.Options, soSynchronizeAsk) ? cbGrayed :
@@ -220,10 +220,10 @@ TSynchronizeParamType __fastcall TSynchronizeDialog::GetParams()
   Result.RemoteDirectory = RemoteDirectoryEdit->Text;
   Result.LocalDirectory = LocalDirectoryEdit->Text;
   Result.Params =
-    (Result.Params & ~(spDelete | spExistingOnly | spSelectedOnly | spTimestamp)) |
-    FLAGMASK(SynchronizeDeleteCheck->Checked, spDelete) |
-    FLAGMASK(SynchronizeExistingOnlyCheck->Checked, spExistingOnly) |
-    FLAGMASK(SynchronizeSelectedOnlyCheck->Checked, spSelectedOnly);
+    (Result.Params & ~(TTerminal::spDelete | TTerminal::spExistingOnly | TTerminal::spSelectedOnly | TTerminal::spTimestamp)) |
+    FLAGMASK(SynchronizeDeleteCheck->Checked, TTerminal::spDelete) |
+    FLAGMASK(SynchronizeExistingOnlyCheck->Checked, TTerminal::spExistingOnly) |
+    FLAGMASK(SynchronizeSelectedOnlyCheck->Checked, TTerminal::spSelectedOnly);
   Result.Options =
     (Result.Options & ~(soRecurse | soSynchronize | soSynchronizeAsk | soContinueOnError)) |
     FLAGMASK(SynchronizeRecursiveCheck->Checked, soRecurse) |

source/forms/SynchronizeChecklist.cpp

@@ -499,34 +499,34 @@ void __fastcall TSynchronizeChecklistDialog::StatusBarDrawPanel(
 
       case TSynchronizeChecklist::saUploadNew:
         Possible = ((FMode == smRemote) || (FMode == smBoth)) &&
-          FLAGCLEAR(FParams, spTimestamp);
+          FLAGCLEAR(FParams, TTerminal::spTimestamp);
         break;
 
       case TSynchronizeChecklist::saDownloadNew:
         Possible = ((FMode == smLocal) || (FMode == smBoth)) &&
-          FLAGCLEAR(FParams, spTimestamp);
+          FLAGCLEAR(FParams, TTerminal::spTimestamp);
         break;
 
       case TSynchronizeChecklist::saUploadUpdate:
         Possible =
           ((FMode == smRemote) || (FMode == smBoth)) &&
-          (FLAGCLEAR(FParams, spNotByTime) || FLAGSET(FParams, spBySize));
+          (FLAGCLEAR(FParams, TTerminal::spNotByTime) || FLAGSET(FParams, TTerminal::spBySize));
         break;
 
       case TSynchronizeChecklist::saDownloadUpdate:
         Possible =
           ((FMode == smLocal) || (FMode == smBoth)) &&
-          (FLAGCLEAR(FParams, spNotByTime) || FLAGSET(FParams, spBySize));
+          (FLAGCLEAR(FParams, TTerminal::spNotByTime) || FLAGSET(FParams, TTerminal::spBySize));
         break;
 
       case TSynchronizeChecklist::saDeleteRemote:
         Possible = (FMode == smRemote) &&
-          FLAGCLEAR(FParams, spTimestamp);
+          FLAGCLEAR(FParams, TTerminal::spTimestamp);
         break;
 
       case TSynchronizeChecklist::saDeleteLocal:
         Possible = (FMode == smLocal) &&
-          FLAGCLEAR(FParams, spTimestamp);
+          FLAGCLEAR(FParams, TTerminal::spTimestamp);
         break;
 
       default:

source/windows/WinInterface.h

@@ -306,16 +306,6 @@ bool __fastcall DoFilterMaskDialog(TCustomDirView * Parent,
 // forms\EditMask.cpp
 bool __fastcall DoEditMaskDialog(TFileMasks & Mask);
 
-const spDelete = 0x01;
-const spNoConfirmation = 0x02;
-const spExistingOnly = 0x04;
-const spPreviewChanges = 0x40; // not used by core
-const spTimestamp = 0x100;
-const spNotByTime = 0x200;
-const spBySize = 0x400;
-const spSelectedOnly = 0x800;
-const spMirror = 0x1000;
-
 // forms\Synchronize.cpp
 const soDoNotUsePresets =  0x01;
 const soNoMinimize =       0x02;