Browse Source

Typo in identifier name

Source commit: ea97b78fb4c97f02610fbaa7c8ce213e38821657
Martin Prikryl 9 years ago
parent
commit
28e0dbca5b

+ 3 - 3
source/core/FileOperationProgress.cpp

@@ -81,7 +81,7 @@ void __fastcall TFileOperationProgressType::ClearTransfer()
   FLocallyUsed = 0;
   FSkippedSize = 0;
   FTransferredSize = 0;
-  FTransferingFile = false;
+  FTransferringFile = false;
   FLastSecond = 0;
 }
 //---------------------------------------------------------------------------
@@ -351,9 +351,9 @@ void __fastcall TFileOperationProgressType::SetTransferSize(__int64 ASize)
   DoProgress();
 }
 //---------------------------------------------------------------------------
-void __fastcall TFileOperationProgressType::SetTransferingFile(bool ATransferingFile)
+void __fastcall TFileOperationProgressType::SetTransferringFile(bool ATransferringFile)
 {
-  FTransferingFile = ATransferingFile;
+  FTransferringFile = ATransferringFile;
 }
 //---------------------------------------------------------------------------
 void __fastcall TFileOperationProgressType::SetCancel(TCancelStatus ACancel)

+ 3 - 3
source/core/FileOperationProgress.h

@@ -29,7 +29,7 @@ private:
   UnicodeString FFullFileName;
   UnicodeString FDirectory;
   bool FAsciiTransfer;
-  bool FTransferingFile;
+  bool FTransferringFile;
   bool FTemp;
   __int64 FLocalSize;
   __int64 FLocallyUsed;
@@ -79,7 +79,7 @@ public:
   __property UnicodeString Directory = { read = FDirectory };
   __property bool AsciiTransfer = { read = FAsciiTransfer };
   // Can be true with SCP protocol only
-  __property bool TransferingFile = { read = FTransferingFile };
+  __property bool TransferringFile = { read = FTransferringFile };
   __property bool Temp = { read = FTemp };
 
   // file size to read/write
@@ -154,7 +154,7 @@ public:
   int __fastcall OverallProgress();
   int __fastcall TotalTransferProgress();
   void __fastcall SetSpeedCounters();
-  void __fastcall SetTransferingFile(bool ATransferingFile);
+  void __fastcall SetTransferringFile(bool ATransferringFile);
   void __fastcall SetCancel(TCancelStatus ACancel);
   void __fastcall SetCancelAtLeast(TCancelStatus ACancel);
   bool __fastcall ClearCancelFile();

+ 1 - 1
source/core/Queue.cpp

@@ -1513,7 +1513,7 @@ void __fastcall TTerminalItem::OperationProgress(
 
   if (FTerminated || FCancel)
   {
-    if (ProgressData.TransferingFile)
+    if (ProgressData.TransferringFile)
     {
       ProgressData.SetCancel(csCancelTransfer);
     }

+ 11 - 11
source/core/ScpFileSystem.cpp

@@ -1746,7 +1746,7 @@ void __fastcall TSCPFileSystem::SCPSource(const UnicodeString FileName,
       // Suppose same data size to transfer as to read
       // (not true with ASCII transfer)
       OperationProgress->SetTransferSize(OperationProgress->LocalSize);
-      OperationProgress->SetTransferingFile(false);
+      OperationProgress->SetTransferringFile(false);
 
       TDateTime Modification = UnixToDateTime(MTime, FTerminal->SessionData->DSTMode);
 
@@ -1786,7 +1786,7 @@ void __fastcall TSCPFileSystem::SCPSource(const UnicodeString FileName,
           }
           FILE_OPERATION_LOOP_END_EX(
             FMTLOAD(READ_ERROR, (FileName)),
-            !OperationProgress->TransferingFile);
+            !OperationProgress->TransferringFile);
 
           OperationProgress->AddLocallyUsed(BlockBuf.Size);
 
@@ -1828,7 +1828,7 @@ void __fastcall TSCPFileSystem::SCPSource(const UnicodeString FileName,
           // we will be able to read whole, so we send file info to remote side
           // This is done, because when reading fails we can't interrupt sending
           // (don't know how to tell other side that it failed)
-          if (!OperationProgress->TransferingFile &&
+          if (!OperationProgress->TransferringFile &&
               (!OperationProgress->AsciiTransfer || OperationProgress->IsLocallyDone()))
           {
             UnicodeString Buf;
@@ -1854,7 +1854,7 @@ void __fastcall TSCPFileSystem::SCPSource(const UnicodeString FileName,
             SCPResponse();
             // Indicate we started transferring file, we need to finish it
             // If not, it's fatal error
-            OperationProgress->SetTransferingFile(true);
+            OperationProgress->SetTransferringFile(true);
 
             // If we're doing ASCII transfer, this is last pass
             // so we send whole file
@@ -1898,7 +1898,7 @@ void __fastcall TSCPFileSystem::SCPSource(const UnicodeString FileName,
           }
 
           if ((OperationProgress->Cancel == csCancelTransfer) ||
-              (OperationProgress->Cancel == csCancel && !OperationProgress->TransferingFile))
+              (OperationProgress->Cancel == csCancel && !OperationProgress->TransferringFile))
           {
             throw Exception(MainInstructions(LoadStr(USER_TERMINATED)));
           }
@@ -1916,19 +1916,19 @@ void __fastcall TSCPFileSystem::SCPSource(const UnicodeString FileName,
         catch (EScp &E)
         {
           // SCP protocol fatal error
-          OperationProgress->SetTransferingFile(false);
+          OperationProgress->SetTransferringFile(false);
           throw;
         }
         catch (EScpFileSkipped &E)
         {
           // SCP protocol non-fatal error
-          OperationProgress->SetTransferingFile(false);
+          OperationProgress->SetTransferringFile(false);
           throw;
         }
 
         // We succeeded transferring file, from now we can handle exceptions
         // normally -> no fatal error
-        OperationProgress->SetTransferingFile(false);
+        OperationProgress->SetTransferringFile(false);
       }
       catch (Exception &E)
       {
@@ -1944,7 +1944,7 @@ void __fastcall TSCPFileSystem::SCPSource(const UnicodeString FileName,
         }
 
         // Every exception during file transfer is fatal
-        if (OperationProgress->TransferingFile)
+        if (OperationProgress->TransferringFile)
         {
           FTerminal->FatalError(&E, FMTLOAD(COPY_FATAL, (FileName)));
         }
@@ -2550,7 +2550,7 @@ void __fastcall TSCPFileSystem::SCPSink(const UnicodeString TargetDir,
               // We succeeded, so we confirm transfer to remote side
               FSecureShell->SendNull();
               // From now we need to finish file transfer, if not it's fatal error
-              OperationProgress->SetTransferingFile(true);
+              OperationProgress->SetTransferringFile(true);
 
               // Suppose same data size to transfer as to write
               // (not true with ASCII transfer)
@@ -2610,7 +2610,7 @@ void __fastcall TSCPFileSystem::SCPSink(const UnicodeString TargetDir,
                   FMTLOAD(COPY_FATAL, (OperationProgress->FileName)));
               }
 
-              OperationProgress->SetTransferingFile(false);
+              OperationProgress->SetTransferringFile(false);
 
               try
               {

+ 1 - 1
source/forms/Progress.cpp

@@ -473,7 +473,7 @@ void __fastcall TProgressForm::CancelOperation()
     try
     {
       TCancelStatus ACancel;
-      if (FData.TransferingFile &&
+      if (FData.TransferringFile &&
           (FData.TimeExpected() > GUIConfiguration->IgnoreCancelBeforeFinish))
       {
         int Result = MessageDialog(LoadStr(CANCEL_OPERATION_FATAL2), qtWarning,