Few more identifier renames now that a session is not always a remote session

Source commit: a273a0b9be9bbe9738a173ec23cc7b98d796d02c

source/forms/CustomScpExplorer.cpp

@@ -516,7 +516,7 @@ bool __fastcall TCustomScpExplorerForm::CommandLineFromAnotherInstance(
       if (DataList->Count > 0)
       {
         TTerminalManager * Manager = TTerminalManager::Instance();
-        Manager->ActiveSession = Manager->NewTerminals(DataList.get());
+        Manager->ActiveSession = Manager->NewSessions(DataList.get());
       }
     }
     __finally
@@ -4988,14 +4988,14 @@ void __fastcall TCustomScpExplorerForm::DoOpenFolderOrWorkspace(const UnicodeStr
   TTerminalManager * Manager = TTerminalManager::Instance();
   std::unique_ptr<TObjectList> DataList(new TObjectList());
   StoredSessions->GetFolderOrWorkspace(Name, DataList.get());
-  TManagedTerminal * FirstTerminal = Manager->NewTerminals(DataList.get());
-  // FirstTerminal can be null, if some of the
-  if (!ConnectFirstTerminal && (FirstTerminal != NULL))
+  TManagedTerminal * FirstSession = Manager->NewSessions(DataList.get());
+  // FirstSession can be null, if some of the
+  if (!ConnectFirstTerminal && (FirstSession != NULL))
   {
-    FirstTerminal->Disconnected = true;
-    FirstTerminal->DisconnectedTemporarily = true;
+    FirstSession->Disconnected = true;
+    FirstSession->DisconnectedTemporarily = true;
   }
-  Manager->ActiveSession = FirstTerminal;
+  Manager->ActiveSession = FirstSession;
 }
 //---------------------------------------------------------------------------
 void __fastcall TCustomScpExplorerForm::OpenFolderOrWorkspace(const UnicodeString & Name)

source/windows/TerminalManager.cpp

@@ -176,31 +176,31 @@ void __fastcall TTerminalManager::SetupTerminal(TTerminal * Terminal)
   Terminal->OnCustomCommand = TerminalCustomCommand;
 }
 //---------------------------------------------------------------------------
-TManagedTerminal * __fastcall TTerminalManager::DoNewTerminal(TSessionData * Data)
+TManagedTerminal * __fastcall TTerminalManager::DoNewSession(TSessionData * Data)
 {
-  TManagedTerminal * Terminal = DebugNotNull(dynamic_cast<TManagedTerminal *>(TTerminalList::NewTerminal(Data)));
+  TManagedTerminal * Session = DebugNotNull(dynamic_cast<TManagedTerminal *>(TTerminalList::NewTerminal(Data)));
   try
   {
-    FQueues->Add(NewQueue(Terminal));
+    FQueues->Add(NewQueue(Session));
     FTerminationMessages->Add(L"");
 
-    SetupTerminal(Terminal);
+    SetupTerminal(Session);
   }
   catch(...)
   {
-    if (Terminal != NULL)
+    if (Session != NULL)
     {
-      FreeTerminal(Terminal);
+      FreeTerminal(Session);
     }
     throw;
   }
 
-  return Terminal;
+  return Session;
 }
 //---------------------------------------------------------------------------
 TTerminal * __fastcall TTerminalManager::NewTerminal(TSessionData * Data)
 {
-  TTerminal * Terminal = DoNewTerminal(Data);
+  TTerminal * Terminal = DoNewSession(Data);
   DoSessionListChanged();
   return Terminal;
 }
@@ -218,13 +218,13 @@ TManagedTerminal * __fastcall TTerminalManager::NewManagedTerminal(TSessionData
   return DebugNotNull(dynamic_cast<TManagedTerminal *>(NewTerminal(Data)));
 }
 //---------------------------------------------------------------------------
-TManagedTerminal * __fastcall TTerminalManager::NewTerminals(TList * DataList)
+TManagedTerminal * __fastcall TTerminalManager::NewSessions(TList * DataList)
 {
   TManagedTerminal * Result = NULL;
   for (int Index = 0; Index < DataList->Count; Index++)
   {
     TSessionData * Data = reinterpret_cast<TSessionData *>(DataList->Items[Index]);
-    TManagedTerminal * Terminal = DoNewTerminal(Data);
+    TManagedTerminal * Session = DoNewSession(Data);
     // When opening workspace/folder, keep the sessions open, even if they fail to connect.
     // We cannot detect a folder here, so we "guess" it by a session set size.
     // After all, no one will have a folder with a one session only (while a workspace with one session is likely).
@@ -232,10 +232,10 @@ TManagedTerminal * __fastcall TTerminalManager::NewTerminals(TList * DataList)
     // as when opening the session only.
     // Also closing a workspace session will remove the session from the workspace.
     // While closing a folder session won't remove the session from the folder.
-    Terminal->Permanent = Data->IsWorkspace || (DataList->Count > 1);
+    Session->Permanent = Data->IsWorkspace || (DataList->Count > 1);
     if (Index == 0)
     {
-      Result = Terminal;
+      Result = Session;
     }
   }
   DoSessionListChanged();
@@ -1604,7 +1604,7 @@ void __fastcall TTerminalManager::NewSession(
         TAutoNestingCounter UpdatingCounter(FUpdating); // prevent tab flicker
         FreeAll();
       }
-      TManagedTerminal * ANewSession = NewTerminals(DataList.get());
+      TManagedTerminal * ANewSession = NewSessions(DataList.get());
       bool AdHoc = (DataList->Count == 1) && (StoredSessions->FindSame(reinterpret_cast<TSessionData *>(DataList->Items[0])) == NULL);
       bool CanRetry = SessionUrl.IsEmpty() && AdHoc;
       bool ShowLoginWhenNoSession = WinConfiguration->ShowLoginWhenNoSession;

source/windows/TerminalManager.h

@@ -50,7 +50,7 @@ public:
 
   TManagedTerminal * __fastcall NewManagedTerminal(TSessionData * Data);
   TManagedTerminal * __fastcall NewLocalBrowser();
-  TManagedTerminal * __fastcall NewTerminals(TList * DataList);
+  TManagedTerminal * __fastcall NewSessions(TList * DataList);
   virtual void __fastcall FreeTerminal(TTerminal * Terminal);
   void __fastcall Move(TTerminal * Source, TTerminal * Target);
   void __fastcall DisconnectActiveTerminalIfPermanentFreeOtherwise();
@@ -175,7 +175,7 @@ private:
   void __fastcall UpdateTaskbarList();
   void __fastcall AuthenticateFormCancel(TObject * Sender);
   void __fastcall DoSessionListChanged();
-  TManagedTerminal * __fastcall DoNewTerminal(TSessionData * Data);
+  TManagedTerminal * __fastcall DoNewSession(TSessionData * Data);
   static void __fastcall TerminalThreadIdle(void * Data, TObject * Sender);
   void __fastcall SetQueueConfiguration(TTerminalQueue * Queue);
   void __fastcall ApplicationModalBegin(TObject * Sender);

source/windows/WinMain.cpp

@@ -1157,7 +1157,7 @@ int __fastcall Execute()
               bool Browse = false;
               if (DataList->Count > 0)
               {
-                TManagedTerminal * Terminal = TerminalManager->NewTerminals(DataList.get());
+                TManagedTerminal * Session = TerminalManager->NewSessions(DataList.get());
                 UnicodeString BrowseFile;
                 if (Params->FindSwitch(BROWSE_SWITCH, BrowseFile) &&
                     (!BrowseFile.IsEmpty() || !DownloadFile.IsEmpty()))
@@ -1166,21 +1166,21 @@ int __fastcall Execute()
                   {
                     BrowseFile = DownloadFile;
                   }
-                  DebugAssert(Terminal->RemoteExplorerState == NULL);
-                  Terminal->RemoteExplorerState = CreateDirViewStateForFocusedItem(BrowseFile);
-                  DebugAssert(Terminal->LocalExplorerState == NULL);
-                  Terminal->LocalExplorerState = CreateDirViewStateForFocusedItem(BrowseFile);
+                  DebugAssert(Session->RemoteExplorerState == NULL);
+                  Session->RemoteExplorerState = CreateDirViewStateForFocusedItem(BrowseFile);
+                  DebugAssert(Session->LocalExplorerState == NULL);
+                  Session->LocalExplorerState = CreateDirViewStateForFocusedItem(BrowseFile);
                   DownloadFile = UnicodeString();
                   Browse = true;
                 }
                 if (!DownloadFile.IsEmpty())
                 {
-                  Terminal->AutoReadDirectory = false;
-                  DownloadFile = UnixIncludeTrailingBackslash(Terminal->SessionData->RemoteDirectory) + DownloadFile;
-                  Terminal->SessionData->RemoteDirectory = L"";
-                  Terminal->StateData->RemoteDirectory = Terminal->SessionData->RemoteDirectory;
+                  Session->AutoReadDirectory = false;
+                  DownloadFile = UnixIncludeTrailingBackslash(Session->SessionData->RemoteDirectory) + DownloadFile;
+                  Session->SessionData->RemoteDirectory = L"";
+                  Session->StateData->RemoteDirectory = Session->SessionData->RemoteDirectory;
                 }
-                TerminalManager->ActiveSession = Terminal;
+                TerminalManager->ActiveSession = Session;
                 CanStart = (TerminalManager->Count > 0);
               }
               else