Removing NO_RESOURCES conditional block

(used for Salamander only)

Source commit: 84fceaacd30a1740e2d6bba49b9e9f2fc57574f4

source/forms/About.cpp

@@ -28,9 +28,7 @@
 #include <S3FileSystem.h>
 //---------------------------------------------------------------------
 #pragma link "SHDocVw_OCX"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 static void __fastcall DoAboutDialog(TConfiguration * Configuration,
   bool AllowLicense, TRegistration * Registration, bool LoadThirdParty)

source/forms/Animations120.cpp

@@ -6,9 +6,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "PngImageList"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TAnimations120Module::TAnimations120Module(TComponent * Owner)
   : TDataModule(Owner)

source/forms/Animations144.cpp

@@ -6,9 +6,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "PngImageList"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TAnimations144Module::TAnimations144Module(TComponent * Owner)
   : TDataModule(Owner)

source/forms/Animations192.cpp

@@ -6,9 +6,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "PngImageList"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TAnimations192Module::TAnimations192Module(TComponent * Owner)
   : TDataModule(Owner)

source/forms/Animations96.cpp

@@ -6,9 +6,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "PngImageList"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TAnimations96Module::TAnimations96Module(TComponent * Owner)
   : TDataModule(Owner)

source/forms/Authenticate.cpp

@@ -15,9 +15,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "PasswordEdit"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TAuthenticateForm::TAuthenticateForm(TComponent * Owner)
   : TForm(Owner), FSessionData(NULL), FTerminal(NULL)

source/forms/Cleanup.cpp

@@ -11,9 +11,7 @@
 #include <PuttyTools.h>
 #include "Cleanup.h"
 //---------------------------------------------------------------------
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 bool __fastcall DoCleanupDialog()
 {

source/forms/Console.cpp

@@ -17,9 +17,7 @@
 #pragma link "HistoryComboBox"
 #pragma link "PathLabel"
 #pragma link "PngImageList"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 void __fastcall DoConsoleDialog(TTerminal * Terminal, const UnicodeString Command,
   const TStrings * Log)

source/forms/Copy.cpp

@@ -17,9 +17,7 @@
 #pragma link "Rights"
 #pragma link "CopyParams"
 #pragma link "HistoryComboBox"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 bool __fastcall DoCopyDialog(
   bool ToRemote, bool Move, TStrings * FileList, UnicodeString & TargetDirectory,

source/forms/CopyParamCustom.cpp

@@ -12,9 +12,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "CopyParams"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 bool __fastcall DoCopyParamCustomDialog(TCopyParamType & CopyParam,
   int CopyParamAttrs)

source/forms/CopyParamPreset.cpp

@@ -12,9 +12,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "CopyParams"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 bool __fastcall DoCopyParamPresetDialog(TCopyParamList * CopyParamList,
   int & Index, TCopyParamPresetMode Mode, TCopyParamRuleData * CurrentRuleData,

source/forms/CopyParams.cpp

@@ -16,9 +16,7 @@
 #pragma link "Rights"
 #pragma link "HistoryComboBox"
 #pragma link "ComboEdit"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TCopyParamsFrame::TCopyParamsFrame(TComponent* Owner)
         : TFrame(Owner)

source/forms/CreateDirectory.cpp

@@ -14,9 +14,7 @@
 #include "CreateDirectory.h"
 //---------------------------------------------------------------------
 #pragma link "Rights"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 bool __fastcall DoCreateDirectoryDialog(UnicodeString & Directory,
   TRemoteProperties * Properties, int AllowedChanges, bool & SaveSettings)

source/forms/Custom.cpp

@@ -21,9 +21,7 @@
 #include "Custom.h"
 //---------------------------------------------------------------------
 #pragma link "PasswordEdit"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 __fastcall TCustomDialog::TCustomDialog(UnicodeString AHelpKeyword)
   : TForm(GetFormOwner())

source/forms/CustomCommand.cpp

@@ -14,9 +14,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "HistoryComboBox"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 bool __fastcall DoCustomCommandDialog(TCustomCommandType & Command,
   const TCustomCommandList * CustomCommandList,

source/forms/CustomScpExplorer.cpp

@@ -53,9 +53,7 @@
 #pragma link "TB2Toolbar"
 #pragma link "ThemePageControl"
 #pragma link "PathLabel"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 #define WM_COMPONENT_HIDE (WM_WINSCP_USER + 4)
 static const int SessionPanelCount = 4;

source/forms/EditMask.cpp

@@ -13,9 +13,7 @@
 #include "WinConfiguration.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 bool __fastcall DoEditMaskDialog(TFileMasks & Mask)
 {

source/forms/Editor.cpp

@@ -21,9 +21,7 @@
 #pragma link "TBXStatusBars"
 #pragma link "PngImageList"
 #pragma link "TBXExtItems"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 TForm * __fastcall ShowEditorForm(const UnicodeString FileName, TForm * ParentForm,
   TNotifyEvent OnFileChanged, TNotifyEvent OnFileReload, TFileClosedEvent OnClose,

source/forms/EditorPreferences.cpp

@@ -13,9 +13,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "HistoryComboBox"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 bool __fastcall DoEditorPreferencesDialog(TEditorData * Editor,
   bool & Remember, TEditorPreferencesMode Mode, bool MayRemote)

source/forms/FileFind.cpp

@@ -18,9 +18,7 @@
 #pragma link "IEListView"
 #pragma link "NortonLikeListView"
 #pragma link "PngImageList"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 TFileFindDialog * FileFindDialog = NULL;
 static const int NoSort = 1;

source/forms/FileSystemInfo.cpp

@@ -14,9 +14,7 @@
 #include <StrUtils.hpp>
 //---------------------------------------------------------------------
 #pragma link "HistoryComboBox"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 void __fastcall DoFileSystemInfoDialog(
   const TSessionInfo & SessionInfo, const TFileSystemInfo & FileSystemInfo,

source/forms/FullSynchronize.cpp

@@ -20,9 +20,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "HistoryComboBox"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 bool __fastcall DoFullSynchronizeDialog(TSynchronizeMode & Mode, int & Params,
   UnicodeString & LocalDirectory, UnicodeString & RemoteDirectory,

source/forms/GenerateUrl.cpp

@@ -14,9 +14,7 @@
 #include <GUITools.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 const UnicodeString AllFilesMask(L"*");
 const UnicodeString NoOpOperationMask(L"*");

source/forms/Glyphs.cpp

@@ -11,9 +11,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "PngImageList"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 TGlyphsModule * GlyphsModule;
 //---------------------------------------------------------------------------

source/forms/Glyphs120.cpp

@@ -5,10 +5,8 @@
 #include "Glyphs120.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#ifndef NO_RESOURCES
 #pragma link "PngImageList"
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TGlyphs120Module::TGlyphs120Module(TComponent * Owner)
   : TDataModule(Owner)

source/forms/Glyphs144.cpp

@@ -5,10 +5,8 @@
 #include "Glyphs144.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#ifndef NO_RESOURCES
 #pragma link "PngImageList"
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TGlyphs144Module::TGlyphs144Module(TComponent * Owner)
   : TDataModule(Owner)

source/forms/Glyphs192.cpp

@@ -5,10 +5,8 @@
 #include "Glyphs192.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#ifndef NO_RESOURCES
 #pragma link "PngImageList"
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TGlyphs192Module::TGlyphs192Module(TComponent * Owner)
   : TDataModule(Owner)

source/forms/ImportSessions.cpp

@@ -17,9 +17,7 @@
 #include <WinApi.h>
 #include <PasTools.hpp>
 //---------------------------------------------------------------------
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 const int KnownHostsIndex = 2;
 //---------------------------------------------------------------------

source/forms/License.cpp

@@ -11,9 +11,7 @@
 #include "Tools.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 UnicodeString LicenseStr[2] =
   { L"LICENSE", L"LICENSE_EXPAT" };

source/forms/LocationProfiles.cpp

@@ -18,9 +18,7 @@
 //---------------------------------------------------------------------
 #pragma link "HistoryComboBox"
 #pragma link "PngImageList"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 bool __fastcall LocationProfilesDialog(TOpenDirectoryMode Mode,
   TOperationSide Side, UnicodeString & LocalDirectory, UnicodeString & RemoteDirectory,

source/forms/Login.cpp

@@ -24,9 +24,7 @@
 #pragma link "ComboEdit"
 #pragma link "PasswordEdit"
 #pragma link "UpDownEdit"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 const int SiteImageIndex = 1;
 const int OpenFolderImageIndex = 2;

source/forms/MessageDlg.cpp

@@ -21,9 +21,7 @@
 #include <WinApi.h>
 #include "MessageDlg.h"
 //---------------------------------------------------------------------------
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 const UnicodeString MessagePanelName(L"Panel");
 const UnicodeString MainMessageLabelName(L"MainMessage");

source/forms/NonVisual.cpp

@@ -24,9 +24,7 @@
 #pragma link "TB2ExtItems"
 #pragma link "TBXExtItems"
 #pragma link "TBXToolPals"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 TNonVisualDataModule *NonVisualDataModule;
 //---------------------------------------------------------------------------
 #define SCPCOMMANDER ((TScpCommanderForm *)ScpExplorer)

source/forms/OpenDirectory.cpp

@@ -15,9 +15,7 @@
 #include "WinConfiguration.h"
 //---------------------------------------------------------------------
 #pragma link "HistoryComboBox"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 bool __fastcall DoOpenDirectoryDialog(TOpenDirectoryMode Mode, TOperationSide Side,
   UnicodeString & Directory, TStrings * Directories, TTerminal * Terminal,

source/forms/Preferences.cpp

@@ -31,9 +31,7 @@
 #pragma link "ComboEdit"
 #pragma link "HistoryComboBox"
 #pragma link "PathLabel"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 const int BelowNormalLogLevels = 1;
 //---------------------------------------------------------------------

source/forms/Progress.cpp

@@ -26,9 +26,7 @@
 #pragma link "TBX"
 #pragma link "TB2ExtItems"
 #pragma link "TBXExtItems"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 UnicodeString __fastcall TProgressForm::ProgressStr(
   const TSynchronizeProgress * SynchronizeProgress, const TFileOperationProgressType * ProgressData)

source/forms/Properties.cpp

@@ -16,9 +16,7 @@
 //---------------------------------------------------------------------
 #pragma link "PathLabel"
 #pragma link "Rights"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 bool __fastcall DoPropertiesDialog(TStrings * FileList,
   const UnicodeString Directory, const TRemoteTokenList * GroupList,

source/forms/RemoteTransfer.cpp

@@ -14,9 +14,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "HistoryComboBox"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 bool __fastcall DoRemoteCopyDialog(TStrings * Sessions, TStrings * Directories,
   TDirectRemoteCopy AllowDirectCopy, bool Multi, void *& Session, UnicodeString & Target, UnicodeString & FileMask,

source/forms/Rights.cpp

@@ -13,9 +13,7 @@
 #pragma package(smart_init)
 #pragma link "GrayedCheckBox"
 #pragma link "PngImageList"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TRightsFrame::TRightsFrame(TComponent* Owner)
         : TFrame(Owner)

source/forms/ScpCommander.cpp

@@ -45,9 +45,7 @@
 #pragma link "TBXStatusBars"
 #pragma link "TBXToolPals"
 #pragma link "ThemePageControl"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 class TSynchronizedBrowsingGuard
 {

source/forms/ScpExplorer.cpp

@@ -34,9 +34,7 @@
 #pragma link "TBXLists"
 #pragma link "ThemePageControl"
 #pragma link "PathLabel"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 __fastcall TScpExplorerForm::TScpExplorerForm(TComponent* Owner)
         : TCustomScpExplorerForm(Owner)

source/forms/SelectMask.cpp

@@ -15,9 +15,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "HistoryComboBox"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 bool __fastcall DoSelectMaskDialog(TControl * Parent, bool Select, TFileFilter & Filter)
 {

source/forms/SiteAdvanced.cpp

@@ -24,9 +24,7 @@
 #pragma link "ComboEdit"
 #pragma link "PasswordEdit"
 #pragma link "UpDownEdit"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 // Sheet tag:
 // 01 top, 02 indented

source/forms/Symlink.cpp

@@ -10,9 +10,7 @@
 #include <WinInterface.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 bool __fastcall DoSymlinkDialog(UnicodeString & FileName, UnicodeString & PointTo,
   TOperationSide Side, bool & SymbolicLink, bool Edit, bool AllowHardLink)

source/forms/Synchronize.cpp

@@ -22,9 +22,7 @@
 #pragma package(smart_init)
 #pragma link "HistoryComboBox"
 #pragma link "GrayedCheckBox"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 const int WM_USER_STOP = WM_WINSCP_USER + 2;
 //---------------------------------------------------------------------------

source/forms/SynchronizeChecklist.cpp

@@ -24,9 +24,7 @@
 #pragma link "IEListView"
 #pragma link "NortonLikeListView"
 #pragma link "PngImageList"
-#ifndef NO_RESOURCES
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------
 const int ImageColumnIndex = 4;
 //---------------------------------------------------------------------

source/forms/SynchronizeProgress.cpp

@@ -13,14 +13,12 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "PathLabel"
-#ifndef NO_RESOURCES
 #pragma link "PngImageList"
 #pragma link "TB2Dock"
 #pragma link "TB2Item"
 #pragma link "TB2Toolbar"
 #pragma link "TBX"
 #pragma resource "*.dfm"
-#endif
 //---------------------------------------------------------------------------
 // Used for comparing only
 __fastcall TSynchronizeProgressForm::TSynchronizeProgressForm(TComponent * Owner, bool AllowMinimize, int Files)