Removing obsolete NO_FILEZILLA directive

Source commit: b7f2319a1fc3cf46cd29226d8560de1beee42852

source/core/CoreMain.cpp

@@ -10,9 +10,7 @@
 #include "PuttyIntf.h"
 #include "Cryptography.h"
 #include <DateUtils.hpp>
-#ifndef NO_FILEZILLA
 #include "FileZillaIntf.h"
-#endif
 #include "WebDAVFileSystem.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
@@ -133,9 +131,7 @@ void CoreInitialize()
   Configuration = CreateConfiguration();
 
   PuttyInitialize();
-  #ifndef NO_FILEZILLA
   TFileZillaIntf::Initialize();
-  #endif
   NeonInitialize();
 
   CoreLoad();
@@ -153,9 +149,7 @@ void CoreFinalize()
   }
 
   NeonFinalize();
-  #ifndef NO_FILEZILLA
   TFileZillaIntf::Finalize();
-  #endif
   PuttyFinalize();
 
   delete StoredSessions;
@@ -168,11 +162,7 @@ void CoreFinalize()
 //---------------------------------------------------------------------------
 void CoreSetResourceModule(void * ResourceHandle)
 {
-  #ifndef NO_FILEZILLA
   TFileZillaIntf::SetResourceModule(ResourceHandle);
-  #else
-  DebugUsedParam(ResourceHandle);
-  #endif
 }
 //---------------------------------------------------------------------------
 void CoreMaintenanceTask()

source/core/FtpFileSystem.cpp

@@ -2,7 +2,6 @@
 #include <vcl.h>
 #pragma hdrstop
 
-#ifndef NO_FILEZILLA
 //---------------------------------------------------------------------------
 #include <list>
 #define MPEXT
@@ -5050,4 +5049,3 @@ UnicodeString __fastcall GetOpenSSLVersionText()
   return OPENSSL_VERSION_TEXT;
 }
 //---------------------------------------------------------------------------
-#endif NO_FILEZILLA

source/core/FtpFileSystem.h

@@ -2,7 +2,6 @@
 #ifndef FtpFileSystemH
 #define FtpFileSystemH
 
-#ifndef NO_FILEZILLA
 //---------------------------------------------------------------------------
 #include <time.h>
 #include <FileSystems.h>
@@ -298,6 +297,4 @@ private:
 //---------------------------------------------------------------------------
 UnicodeString __fastcall GetOpenSSLVersionText();
 //---------------------------------------------------------------------------
-#endif NO_FILEZILLA
-//---------------------------------------------------------------------------
 #endif // FtpFileSystemH

source/core/Terminal.cpp

@@ -17,9 +17,7 @@
 #include "SecureShell.h"
 #include "ScpFileSystem.h"
 #include "SftpFileSystem.h"
-#ifndef NO_FILEZILLA
 #include "FtpFileSystem.h"
-#endif
 #include "WebDAVFileSystem.h"
 #include "TextsCore.h"
 #include "HelpCore.h"
@@ -1296,16 +1294,11 @@ void __fastcall TTerminal::Open()
           {
             if (SessionData->FSProtocol == fsFTP)
             {
-              #ifdef NO_FILEZILLA
-              LogEvent(L"FTP protocol is not supported by this build.");
-              FatalError(NULL, LoadStr(FTP_UNSUPPORTED));
-              #else
               FFSProtocol = cfsFTP;
               FFileSystem = new TFTPFileSystem(this);
               FFileSystem->Open();
               Log->AddSeparator();
               LogEvent(L"Using FTP protocol.");
-              #endif
             }
             else if (SessionData->FSProtocol == fsWebDAV)
             {

source/forms/About.cpp

@@ -24,9 +24,7 @@
 #include <WebBrowserEx.hpp>
 #include <StrUtils.hpp>
 #include <Dialogs.hpp>
-#ifndef NO_FILEZILLA
 #include <FtpFileSystem.h>
-#endif
 //---------------------------------------------------------------------
 #pragma link "SHDocVw_OCX"
 #ifndef NO_RESOURCES
@@ -241,8 +239,6 @@ void __fastcall TAboutDialog::DoLoadThirdParty()
     CreateLink(LoadStr(PUTTY_LICENSE_URL), LoadStr(ABOUT_THIRDPARTY_LICENSE)) + Br +
     CreateLink(LoadStr(PUTTY_URL)));
 
-#ifndef NO_FILEZILLA
-
   UnicodeString OpenSSLVersionText = GetOpenSSLVersionText();
   CutToChar(OpenSSLVersionText, L' ', true); // "OpenSSL"
   UnicodeString OpenSSLVersion = CutToChar(OpenSSLVersionText, L' ', true);
@@ -260,8 +256,6 @@ void __fastcall TAboutDialog::DoLoadThirdParty()
     LoadStr(FILEZILLA_COPYRIGHT2) + Br +
     CreateLink(LoadStr(FILEZILLA_URL)));
 
-#endif
-
   AddPara(ThirdParty,
     FMTLOAD(NEON_BASED_ON, (NeonVersion())) + Br +
     LoadStr(NEON_COPYRIGHT) + Br +

source/forms/Login.cpp

@@ -201,11 +201,6 @@ void __fastcall TLoginDialog::Init()
 
   InitControls();
 
-  #ifdef NO_FILEZILLA
-  DebugAssert(TransferProtocolCombo->Items->Count == FSPROTOCOL_COUNT - 2 - 1);
-  TransferProtocolCombo->Items->Delete(TransferProtocolCombo->Items->Count - 1);
-  #endif
-
   ReadOnlyControl(ContentsNameEdit);
   ReadOnlyControl(ContentsMemo);
 

source/resource/TextsCore.h

@@ -183,7 +183,6 @@
 #define FTP_ACCESS_DENIED       256
 #define FTP_CREDENTIAL_PROMPT   257
 #define FTP_RESPONSE_ERROR      258
-#define FTP_UNSUPPORTED         259
 #define SCRIPT_UNKNOWN_SWITCH   260
 #define TRANSFER_ERROR          261
 #define EXECUTE_APP_ERROR       262

source/resource/TextsCore1.rc

@@ -153,7 +153,6 @@ BEGIN
   FTP_ACCESS_DENIED, "Access denied."
   FTP_CREDENTIAL_PROMPT, "Prompting for credentials..."
   FTP_RESPONSE_ERROR, "Invalid response to %s command '%s'."
-  FTP_UNSUPPORTED, "This version does not support FTP protocol."
   SCRIPT_UNKNOWN_SWITCH, "Unknown switch '%s'."
   TRANSFER_ERROR, "Error transferring file '%s'."
   EXECUTE_APP_ERROR, "Cannot execute '%s'."

source/windows/Windows.rc

@@ -1,6 +1,4 @@
-#ifndef NO_FILEZILLA
 #include "..\\resource\\TextsFileZilla.rc"
-#endif
 #include "..\\resource\\TextsCore1.rc"
 #include "..\\resource\\TextsCore2.rc"
 #include "..\\resource\\TextsWin1.rc"