refactoring: nullptr
Merge branch 'master' into far3

* master:
  refactoring: nullptr
refactoring: nullptr
minor code style
code style: global functions
code style
code style
TWinSCPFileSystem::TransferFiles: improvement: in "Move file to remote directory" dialog (Shift-F6) use current file name
refactoring: TWinSCPFileSystem::TransferFiles
rtti.cpp: refactoring
version info: update
mfc: cleanup
Merge branch 'master' into far3

* master:
  mfc: cleanup
  version info: update
  rtti.cpp: refactoring
  refactoring: TWinSCPFileSystem::TransferFiles
  TWinSCPFileSystem::TransferFiles: improvement: in "Move file to remote directory" dialog (Shift-F6) use current file name
  code style
  code style
  code style: global functions
  minor code style

Conflicts:
	src/NetBox/WinSCPFileSystem.cpp