浏览代码

Factoring out ReverseOperationSide

Source commit: 583bd96f34edca99cccd3c9ca0df684403f7999b
Martin Prikryl 8 年之前
父节点
当前提交
c08b64cda4

+ 22 - 0
source/core/CopyParam.cpp

@@ -956,3 +956,25 @@ void __fastcall CopySpeedLimits(TStrings * Source, TStrings * Dest)
 
   Dest->Assign(Temp.get());
 }
+//---------------------------------------------------------------------------
+TOperationSide ReverseOperationSide(TOperationSide Side)
+{
+  TOperationSide Result;
+  switch (Side)
+  {
+    case osLocal:
+      Result = osRemote;
+      break;
+
+    case osRemote:
+      Result = osLocal;
+      break;
+
+    default:
+    case osCurrent:
+      DebugFail();
+      Result = Side;
+      break;
+  }
+  return Result;
+}

+ 1 - 0
source/core/CopyParam.h

@@ -140,5 +140,6 @@ public:
 unsigned long __fastcall GetSpeedLimit(const UnicodeString & Text);
 UnicodeString __fastcall SetSpeedLimit(unsigned long Limit);
 void __fastcall CopySpeedLimits(TStrings * Source, TStrings * Dest);
+TOperationSide ReverseOperationSide(TOperationSide Side);
 //---------------------------------------------------------------------------
 #endif

+ 1 - 1
source/core/FtpFileSystem.cpp

@@ -1358,7 +1358,7 @@ bool __fastcall TFTPFileSystem::ConfirmOverwrite(
       TSuspendFileOperationProgress Suspend(OperationProgress);
       Answer = FTerminal->ConfirmFileOverwrite(
         SourceFullFileName, TargetFileName, FileParams, Answers, &QueryParams,
-        OperationProgress->Side == osLocal ? osRemote : osLocal,
+        ReverseOperationSide(OperationProgress->Side),
         CopyParam, Params, OperationProgress);
     }
   }

+ 1 - 1
source/core/SftpFileSystem.cpp

@@ -4295,7 +4295,7 @@ void __fastcall TSFTPFileSystem::SFTPConfirmOverwrite(
     Answer = FTerminal->ConfirmFileOverwrite(
       SourceFullFileName, TargetFileName, FileParams,
       Answers, &QueryParams,
-      OperationProgress->Side == osLocal ? osRemote : osLocal,
+      ReverseOperationSide(OperationProgress->Side),
       CopyParam, Params, OperationProgress);
   }
 

+ 1 - 1
source/core/WebDAVFileSystem.cpp

@@ -1131,7 +1131,7 @@ void __fastcall TWebDAVFileSystem::ConfirmOverwrite(
     Answer =
       FTerminal->ConfirmFileOverwrite(
         SourceFullFileName, TargetFileName, FileParams, Answers, &QueryParams,
-        (OperationProgress->Side == osLocal) ? osRemote : osLocal,
+        ReverseOperationSide(OperationProgress->Side),
         CopyParam, Params, OperationProgress);
   }
 

+ 1 - 1
source/forms/ScpCommander.cpp

@@ -2069,7 +2069,7 @@ void __fastcall TScpCommanderForm::DoFocusRemotePath(TTerminal * Terminal, const
 TOperationSide __fastcall TScpCommanderForm::GetOtherSize(TOperationSide Side)
 {
   Side = GetSide(Side);
-  return ((Side == osLocal) ? osRemote : osLocal);
+  return ReverseOperationSide(Side);
 }
 //---------------------------------------------------------------------------
 void __fastcall TScpCommanderForm::HistoryGo(TOperationSide Side, int Index)