Removing unused code

Source commit: b1af7321e2b2f498669dd0df309c1fb24a167d91

source/core/RemoteFiles.cpp

@@ -845,7 +845,6 @@ TRemoteFile * __fastcall TRemoteFile::Duplicate(bool Standalone) const
     COPY_FP(IsSymLink);
     COPY_FP(LinkTo);
     COPY_FP(Type);
-    COPY_FP(Selected);
     COPY_FP(CyclicLink);
     COPY_FP(HumanRights);
     #undef COPY_FP
@@ -1557,7 +1556,6 @@ TRemoteFile * __fastcall TRemoteFileList::FindFile(const UnicodeString &FileName
 __fastcall TRemoteDirectory::TRemoteDirectory(TTerminal * aTerminal, TRemoteDirectory * Template) :
   TRemoteFileList(), FTerminal(aTerminal)
 {
-  FSelectedFiles = NULL;
   FThisDirectory = NULL;
   FParentDirectory = NULL;
   if (Template == NULL)
@@ -1633,28 +1631,6 @@ bool __fastcall TRemoteDirectory::GetLoaded()
   return ((Terminal != NULL) && Terminal->Active && !Directory.IsEmpty());
 }
 //---------------------------------------------------------------------------
-TStrings * __fastcall TRemoteDirectory::GetSelectedFiles()
-{
-  if (!FSelectedFiles)
-  {
-    FSelectedFiles = new TStringList();
-  }
-  else
-  {
-    FSelectedFiles->Clear();
-  }
-
-  for (int Index = 0; Index < Count; Index ++)
-  {
-    if (Files[Index]->Selected)
-    {
-      FSelectedFiles->Add(Files[Index]->FullFileName);
-    }
-  }
-
-  return FSelectedFiles;
-}
-//---------------------------------------------------------------------------
 void __fastcall TRemoteDirectory::SetIncludeParentDirectory(Boolean value)
 {
   if (IncludeParentDirectory != value)

source/core/RemoteFiles.h

@@ -101,7 +101,6 @@ private:
   UnicodeString FHumanRights;
   TTerminal *FTerminal;
   wchar_t FType;
-  bool FSelected;
   bool FCyclicLink;
   UnicodeString FFullFileName;
   int FIsHidden;
@@ -173,7 +172,6 @@ public:
   __property UnicodeString HumanRights = { read = FHumanRights, write = FHumanRights };
   __property TTerminal * Terminal = { read = FTerminal, write = SetTerminal };
   __property wchar_t Type = { read = GetType, write = SetType };
-  __property bool Selected  = { read=FSelected, write=FSelected };
   __property UnicodeString FullFileName  = { read = GetFullFileName, write = FFullFileName };
   __property bool HaveFullFileName  = { read = GetHaveFullFileName };
   __property int IconIndex = { read = GetIconIndex };
@@ -239,11 +237,9 @@ private:
   Boolean FIncludeParentDirectory;
   Boolean FIncludeThisDirectory;
   TTerminal * FTerminal;
-  TStrings * FSelectedFiles;
   TRemoteFile * FParentDirectory;
   TRemoteFile * FThisDirectory;
   virtual void __fastcall SetDirectory(UnicodeString value);
-  TStrings * __fastcall GetSelectedFiles();
   Boolean __fastcall GetLoaded();
   void __fastcall SetIncludeParentDirectory(Boolean value);
   void __fastcall SetIncludeThisDirectory(Boolean value);
@@ -255,7 +251,6 @@ public:
   virtual void __fastcall DuplicateTo(TRemoteFileList * Copy);
   virtual void __fastcall Reset();
   __property TTerminal * Terminal = { read = FTerminal, write = FTerminal };
-  __property TStrings * SelectedFiles  = { read=GetSelectedFiles };
   __property Boolean IncludeParentDirectory = { read = FIncludeParentDirectory, write = SetIncludeParentDirectory };
   __property Boolean IncludeThisDirectory = { read = FIncludeThisDirectory, write = SetIncludeThisDirectory };
   __property Boolean Loaded = { read = GetLoaded };

source/core/Terminal.cpp

@@ -6136,118 +6136,104 @@ bool __fastcall TTerminal::CopyToLocal(TStrings * FilesToCopy,
   // see scp.c: sink(), tolocal()
 
   bool Result = false;
-  bool OwnsFileList = (FilesToCopy == NULL);
+  DebugAssert(FilesToCopy != NULL);
   TOnceDoneOperation OnceDoneOperation = odoIdle;
 
+  BeginTransaction();
   try
   {
-    if (OwnsFileList)
+    __int64 TotalSize;
+    bool TotalSizeKnown = false;
+    TFileOperationProgressType OperationProgress(&DoProgress, &DoFinished);
+
+    ExceptionOnFail = true;
+    try
+    {
+      // dirty trick: when moving, do not pass copy param to avoid exclude mask
+      if (CalculateFilesSize(
+           FilesToCopy, TotalSize, csIgnoreErrors,
+           (FLAGCLEAR(Params, cpDelete) ? CopyParam : NULL),
+           CopyParam->CalculateSize, NULL))
+      {
+        TotalSizeKnown = true;
+      }
+    }
+    __finally
     {
-      FilesToCopy = new TStringList();
-      FilesToCopy->Assign(Files->SelectedFiles);
+      ExceptionOnFail = false;
     }
 
-    BeginTransaction();
+    OperationProgress.Start((Params & cpDelete ? foMove : foCopy), osRemote,
+      FilesToCopy->Count, Params & cpTemporary, TargetDir, CopyParam->CPSLimit);
+
+    FOperationProgress = &OperationProgress;
+    bool CollectingUsage = false;
     try
     {
-      __int64 TotalSize;
-      bool TotalSizeKnown = false;
-      TFileOperationProgressType OperationProgress(&DoProgress, &DoFinished);
-
-      ExceptionOnFail = true;
-      try
+      if (TotalSizeKnown)
       {
-        // dirty trick: when moving, do not pass copy param to avoid exclude mask
-        if (CalculateFilesSize(
-             FilesToCopy, TotalSize, csIgnoreErrors,
-             (FLAGCLEAR(Params, cpDelete) ? CopyParam : NULL),
-             CopyParam->CalculateSize, NULL))
+        if (Configuration->Usage->Collect)
         {
-          TotalSizeKnown = true;
+          int CounterTotalSize = TUsage::CalculateCounterSize(TotalSize);
+          Configuration->Usage->Inc(L"Downloads");
+          Configuration->Usage->Inc(L"DownloadedBytes", CounterTotalSize);
+          Configuration->Usage->SetMax(L"MaxDownloadSize", CounterTotalSize);
+          CollectingUsage = true;
         }
-      }
-      __finally
-      {
-        ExceptionOnFail = false;
-      }
 
-      OperationProgress.Start((Params & cpDelete ? foMove : foCopy), osRemote,
-        FilesToCopy->Count, Params & cpTemporary, TargetDir, CopyParam->CPSLimit);
+        OperationProgress.SetTotalSize(TotalSize);
+      }
 
-      FOperationProgress = &OperationProgress;
-      bool CollectingUsage = false;
       try
       {
-        if (TotalSizeKnown)
+        try
         {
-          if (Configuration->Usage->Collect)
+          if (Log->Logging)
           {
-            int CounterTotalSize = TUsage::CalculateCounterSize(TotalSize);
-            Configuration->Usage->Inc(L"Downloads");
-            Configuration->Usage->Inc(L"DownloadedBytes", CounterTotalSize);
-            Configuration->Usage->SetMax(L"MaxDownloadSize", CounterTotalSize);
-            CollectingUsage = true;
+            LogEvent(FORMAT(L"Copying %d files/directories to local directory "
+              "\"%s\"", (FilesToCopy->Count, TargetDir)));
+            LogEvent(CopyParam->LogStr);
           }
 
-          OperationProgress.SetTotalSize(TotalSize);
+          FFileSystem->CopyToLocal(FilesToCopy, TargetDir, CopyParam, Params,
+            &OperationProgress, OnceDoneOperation);
         }
-
-        try
+        __finally
         {
-          try
+          if (Active)
           {
-            if (Log->Logging)
-            {
-              LogEvent(FORMAT(L"Copying %d files/directories to local directory "
-                "\"%s\"", (FilesToCopy->Count, TargetDir)));
-              LogEvent(CopyParam->LogStr);
-            }
-
-            FFileSystem->CopyToLocal(FilesToCopy, TargetDir, CopyParam, Params,
-              &OperationProgress, OnceDoneOperation);
-          }
-          __finally
-          {
-            if (Active)
-            {
-              ReactOnCommand(fsCopyToLocal);
-            }
+            ReactOnCommand(fsCopyToLocal);
           }
         }
-        catch (Exception &E)
-        {
-          CommandError(&E, MainInstructions(LoadStr(TOLOCAL_COPY_ERROR)));
-          OnceDoneOperation = odoIdle;
-        }
-
-        if (OperationProgress.Cancel == csContinue)
-        {
-          Result = true;
-        }
       }
-      __finally
+      catch (Exception &E)
       {
-        if (CollectingUsage)
-        {
-          int CounterTime = TimeToSeconds(OperationProgress.TimeElapsed());
-          Configuration->Usage->Inc(L"DownloadTime", CounterTime);
-          Configuration->Usage->SetMax(L"MaxDownloadTime", CounterTime);
-        }
-        FOperationProgress = NULL;
-        OperationProgress.Stop();
+        CommandError(&E, MainInstructions(LoadStr(TOLOCAL_COPY_ERROR)));
+        OnceDoneOperation = odoIdle;
+      }
+
+      if (OperationProgress.Cancel == csContinue)
+      {
+        Result = true;
       }
     }
     __finally
     {
-      // If session is still active (no fatal error) we reload directory
-      // by calling EndTransaction
-      EndTransaction();
+      if (CollectingUsage)
+      {
+        int CounterTime = TimeToSeconds(OperationProgress.TimeElapsed());
+        Configuration->Usage->Inc(L"DownloadTime", CounterTime);
+        Configuration->Usage->SetMax(L"MaxDownloadTime", CounterTime);
+      }
+      FOperationProgress = NULL;
+      OperationProgress.Stop();
     }
-
   }
   __finally
   {
-    if (OwnsFileList) delete FilesToCopy;
+    // If session is still active (no fatal error) we reload directory
+    // by calling EndTransaction
+    EndTransaction();
   }
 
   if (OnceDoneOperation != odoIdle)