Change namespace from TrueCrypt to VeraCrypt. Rename method from Resources Resources::GetTrueCryptIcon to Resources::GetVeraCryptIcon.

src/Main/Forms/AboutDialog.cpp

@@ -13,7 +13,7 @@
 #include "Main/Resources.h"
 #include "AboutDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	AboutDialog::AboutDialog (wxWindow* parent) : AboutDialogBase (parent)
 	{

src/Main/Forms/AboutDialog.h

@@ -11,7 +11,7 @@
 
 #include "Forms.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class AboutDialog : public AboutDialogBase
 	{

src/Main/Forms/BenchmarkDialog.cpp

@@ -11,7 +11,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "BenchmarkDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	BenchmarkDialog::BenchmarkDialog (wxWindow *parent)
 		: BenchmarkDialogBase (parent)

src/Main/Forms/BenchmarkDialog.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class BenchmarkDialog : public BenchmarkDialogBase
 	{

src/Main/Forms/ChangePasswordDialog.cpp

@@ -11,7 +11,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "ChangePasswordDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	ChangePasswordDialog::ChangePasswordDialog (wxWindow* parent, shared_ptr <VolumePath> volumePath, Mode::Enum mode, shared_ptr <VolumePassword> password, shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> newPassword, shared_ptr <KeyfileList> newKeyfiles)
 		: ChangePasswordDialogBase (parent), DialogMode (mode), Path (volumePath)

src/Main/Forms/ChangePasswordDialog.h

@@ -13,7 +13,7 @@
 #include "Main/Main.h"
 #include "VolumePasswordPanel.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class ChangePasswordDialog : public ChangePasswordDialogBase
 	{

src/Main/Forms/DeviceSelectionDialog.cpp

@@ -11,7 +11,7 @@
 #include "Main/Resources.h"
 #include "DeviceSelectionDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	DeviceSelectionDialog::DeviceSelectionDialog (wxWindow* parent)
 		: DeviceSelectionDialogBase (parent)

src/Main/Forms/DeviceSelectionDialog.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class DeviceSelectionDialog : public DeviceSelectionDialogBase
 	{

src/Main/Forms/EncryptionOptionsWizardPage.cpp

@@ -14,7 +14,7 @@
 #include "EncryptionOptionsWizardPage.h"
 #include "EncryptionTestDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	EncryptionOptionsWizardPage::EncryptionOptionsWizardPage (wxPanel* parent)
 		: EncryptionOptionsWizardPageBase (parent)

src/Main/Forms/EncryptionOptionsWizardPage.h

@@ -11,7 +11,7 @@
 
 #include "Forms.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class EncryptionOptionsWizardPage : public EncryptionOptionsWizardPageBase
 	{

src/Main/Forms/EncryptionTestDialog.cpp

@@ -12,7 +12,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "EncryptionTestDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	EncryptionTestDialog::EncryptionTestDialog (wxWindow* parent)
 		: EncryptionTestDialogBase (parent)

src/Main/Forms/EncryptionTestDialog.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class EncryptionTestDialog : public EncryptionTestDialogBase
 	{

src/Main/Forms/FavoriteVolumesDialog.cpp

@@ -10,7 +10,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "FavoriteVolumesDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	FavoriteVolumesDialog::FavoriteVolumesDialog (wxWindow* parent, const FavoriteVolumeList &favorites, size_t newItemCount)
 		: FavoriteVolumesDialogBase (parent), Favorites (favorites)

src/Main/Forms/FavoriteVolumesDialog.h

@@ -13,7 +13,7 @@
 #include "Main/Main.h"
 #include "Main/FavoriteVolume.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class FavoriteVolumesDialog : public FavoriteVolumesDialogBase
 	{

src/Main/Forms/InfoWizardPage.cpp

@@ -9,7 +9,7 @@
 #include "System.h"
 #include "InfoWizardPage.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	InfoWizardPage::InfoWizardPage (wxPanel *parent, const wxString &actionButtonText, shared_ptr <Functor> actionFunctor)
 		: InfoWizardPageBase (parent)

src/Main/Forms/InfoWizardPage.h

@@ -11,7 +11,7 @@
 
 #include "Forms.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class InfoWizardPage : public InfoWizardPageBase
 	{

src/Main/Forms/KeyfileGeneratorDialog.cpp

@@ -11,7 +11,7 @@
 #include "Volume/Hash.h"
 #include "KeyfileGeneratorDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	KeyfileGeneratorDialog::KeyfileGeneratorDialog (wxWindow* parent) : KeyfileGeneratorDialogBase (parent) 
 	{

src/Main/Forms/KeyfileGeneratorDialog.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class KeyfileGeneratorDialog : public KeyfileGeneratorDialogBase
 	{

src/Main/Forms/KeyfilesDialog.cpp

@@ -10,7 +10,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "KeyfilesDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	KeyfilesDialog::KeyfilesDialog (wxWindow* parent, shared_ptr <KeyfileList> keyfiles)
 		: KeyfilesDialogBase (parent), Keyfiles (keyfiles)

src/Main/Forms/KeyfilesDialog.h

@@ -13,7 +13,7 @@
 #include "Main/Main.h"
 #include "KeyfilesPanel.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class KeyfilesDialog : public KeyfilesDialogBase
 	{

src/Main/Forms/KeyfilesPanel.cpp

@@ -11,7 +11,7 @@
 #include "KeyfilesPanel.h"
 #include "SecurityTokenKeyfilesDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	KeyfilesPanel::KeyfilesPanel (wxWindow* parent, shared_ptr <KeyfileList> keyfiles)
 		: KeyfilesPanelBase (parent)

src/Main/Forms/KeyfilesPanel.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class KeyfilesPanel : public KeyfilesPanelBase
 	{

src/Main/Forms/LegalNoticesDialog.cpp

@@ -11,7 +11,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "Main/Resources.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	LegalNoticesDialog::LegalNoticesDialog (wxWindow* parent) : LegalNoticesDialogBase (parent)
 	{

src/Main/Forms/LegalNoticesDialog.h

@@ -11,7 +11,7 @@
 
 #include "Forms.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class LegalNoticesDialog : public LegalNoticesDialogBase
 	{

src/Main/Forms/MainFrame.cpp

@@ -34,7 +34,7 @@
 #include "VolumeCreationWizard.h"
 #include "VolumePropertiesDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	MainFrame::MainFrame (wxWindow* parent) : MainFrameBase (parent),
 		ListItemRightClickEventPending (false),
@@ -46,7 +46,7 @@ namespace TrueCrypt
 
 		SetName (Application::GetName());
 		SetTitle (Application::GetName());
-		SetIcon (Resources::GetTrueCryptIcon());
+		SetIcon (Resources::GetVeraCryptIcon());
 
 #if defined(TC_UNIX) && !defined(TC_MACOSX)
 		try
@@ -1420,7 +1420,7 @@ namespace TrueCrypt
 		else if (show && !mTaskBarIcon->IsIconInstalled())
 		{
 #ifndef TC_MACOSX
-			mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"VeraCrypt");
+			mTaskBarIcon->SetIcon (Resources::GetVeraCryptIcon(), L"VeraCrypt");
 #endif
 		}
 	}

src/Main/Forms/MainFrame.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "ChangePasswordDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct FavoriteVolume;
 

src/Main/Forms/MountOptionsDialog.cpp

@@ -11,7 +11,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "MountOptionsDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	MountOptionsDialog::MountOptionsDialog (wxWindow *parent, MountOptions &options, const wxString &title, bool disableMountOptions)
 		: MountOptionsDialogBase (parent, wxID_ANY, wxString()

src/Main/Forms/MountOptionsDialog.h

@@ -13,7 +13,7 @@
 #include "Main/Main.h"
 #include "VolumePasswordPanel.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class MountOptionsDialog : public MountOptionsDialogBase
 	{

src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp

@@ -10,7 +10,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "NewSecurityTokenKeyfileDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	NewSecurityTokenKeyfileDialog::NewSecurityTokenKeyfileDialog (wxWindow* parent, const wstring &keyfileName) : NewSecurityTokenKeyfileDialogBase (parent)
 	{

src/Main/Forms/NewSecurityTokenKeyfileDialog.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Common/SecurityToken.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class NewSecurityTokenKeyfileDialog : public NewSecurityTokenKeyfileDialogBase
 	{

src/Main/Forms/PreferencesDialog.cpp

@@ -18,7 +18,7 @@
 #include "Volume/Cipher.h"
 #include "PreferencesDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	PreferencesDialog::PreferencesDialog (wxWindow* parent)
 		: PreferencesDialogBase (parent),

src/Main/Forms/PreferencesDialog.h

@@ -13,7 +13,7 @@
 #include "Main/Main.h"
 #include "KeyfilesPanel.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class PreferencesDialog : public PreferencesDialogBase
 	{

src/Main/Forms/ProgressWizardPage.cpp

@@ -10,7 +10,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "ProgressWizardPage.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	ProgressWizardPage::ProgressWizardPage (wxPanel* parent, bool enableAbort)
 		: ProgressWizardPageBase (parent),

src/Main/Forms/ProgressWizardPage.h

@@ -11,7 +11,7 @@
 
 #include "Forms.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class ProgressWizardPage : public ProgressWizardPageBase
 	{

src/Main/Forms/RandomPoolEnrichmentDialog.cpp

@@ -11,7 +11,7 @@
 #include "Volume/Hash.h"
 #include "RandomPoolEnrichmentDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	RandomPoolEnrichmentDialog::RandomPoolEnrichmentDialog (wxWindow* parent) : RandomPoolEnrichmentDialogBase (parent) 
 	{

src/Main/Forms/RandomPoolEnrichmentDialog.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class RandomPoolEnrichmentDialog : public RandomPoolEnrichmentDialogBase
 	{

src/Main/Forms/SecurityTokenKeyfilesDialog.cpp

@@ -12,7 +12,7 @@
 #include "NewSecurityTokenKeyfileDialog.h"
 #include "SecurityTokenKeyfilesDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	SecurityTokenKeyfilesDialog::SecurityTokenKeyfilesDialog (wxWindow* parent, bool selectionMode)
 		: SecurityTokenKeyfilesDialogBase (parent)

src/Main/Forms/SecurityTokenKeyfilesDialog.h

@@ -13,7 +13,7 @@
 #include "Common/SecurityToken.h"
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class SecurityTokenKeyfilesDialog : public SecurityTokenKeyfilesDialogBase
 	{

src/Main/Forms/SelectDirectoryWizardPage.cpp

@@ -10,7 +10,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "SelectDirectoryWizardPage.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	bool SelectDirectoryWizardPage::IsValid ()
 	{

src/Main/Forms/SelectDirectoryWizardPage.h

@@ -11,7 +11,7 @@
 
 #include "Forms.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class SelectDirectoryWizardPage : public SelectDirectoryWizardPageBase
 	{

src/Main/Forms/SingleChoiceWizardPage.h

@@ -11,7 +11,7 @@
 
 #include "Forms.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	template <class ChoiceType>
 	class SingleChoiceWizardPage : public SingleChoiceWizardPageBase

src/Main/Forms/VolumeCreationProgressWizardPage.cpp

@@ -10,7 +10,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "VolumeCreationProgressWizardPage.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	VolumeCreationProgressWizardPage::VolumeCreationProgressWizardPage (wxPanel* parent, bool displayKeyInfo)
 		: VolumeCreationProgressWizardPageBase (parent),

src/Main/Forms/VolumeCreationProgressWizardPage.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Core/VolumeCreator.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class VolumeCreationProgressWizardPage : public VolumeCreationProgressWizardPageBase
 	{

src/Main/Forms/VolumeCreationWizard.cpp

@@ -28,7 +28,7 @@
 #include "VolumePasswordWizardPage.h"
 #include "VolumeSizeWizardPage.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	VolumeCreationWizard::VolumeCreationWizard (wxWindow* parent)
 		: WizardFrame (parent),

src/Main/Forms/VolumeCreationWizard.h

@@ -12,7 +12,7 @@
 #include "WizardFrame.h"
 #include "Core/VolumeCreator.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class VolumeCreationWizard : public WizardFrame
 	{

src/Main/Forms/VolumeFormatOptionsWizardPage.cpp

@@ -10,7 +10,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "VolumeFormatOptionsWizardPage.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	VolumeFormatOptionsWizardPage::VolumeFormatOptionsWizardPage (wxPanel* parent, uint64 volumeSize, uint32 sectorSize, bool enableQuickFormatButton, bool disableNoneFilesystem, bool disable32bitFilesystems)
 		: VolumeFormatOptionsWizardPageBase (parent)

src/Main/Forms/VolumeFormatOptionsWizardPage.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Core/VolumeCreator.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class VolumeFormatOptionsWizardPage : public VolumeFormatOptionsWizardPageBase
 	{

src/Main/Forms/VolumeLocationWizardPage.cpp

@@ -11,7 +11,7 @@
 #include "Main/VolumeHistory.h"
 #include "VolumeLocationWizardPage.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	VolumeLocationWizardPage::VolumeLocationWizardPage (wxPanel* parent, VolumeHostType::Enum hostType, bool selectExisting)
 		: VolumeLocationWizardPageBase (parent),

src/Main/Forms/VolumeLocationWizardPage.h

@@ -11,7 +11,7 @@
 
 #include "Forms.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class VolumeLocationWizardPage : public VolumeLocationWizardPageBase
 	{

src/Main/Forms/VolumePasswordPanel.cpp

@@ -12,7 +12,7 @@
 #include "VolumePasswordPanel.h"
 #include "SecurityTokenKeyfilesDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	VolumePasswordPanel::VolumePasswordPanel (wxWindow* parent, shared_ptr <VolumePassword> password, shared_ptr <KeyfileList> keyfiles, bool enableCache, bool enablePassword, bool enableKeyfiles, bool enableConfirmation, bool enablePkcs5Prf, const wxString &passwordLabel)
 		: VolumePasswordPanelBase (parent), Keyfiles (new KeyfileList)

src/Main/Forms/VolumePasswordPanel.h

@@ -13,7 +13,7 @@
 #include "Platform/Functor.h"
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class VolumePasswordPanel : public VolumePasswordPanelBase
 	{

src/Main/Forms/VolumePasswordWizardPage.cpp

@@ -10,7 +10,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "VolumePasswordWizardPage.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	VolumePasswordWizardPage::VolumePasswordWizardPage (wxPanel* parent, shared_ptr <VolumePassword> password, shared_ptr <KeyfileList> keyfiles, bool enableConfirmation)
 		: VolumePasswordWizardPageBase (parent), ConfirmationMode (enableConfirmation)

src/Main/Forms/VolumePasswordWizardPage.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "VolumePasswordPanel.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class VolumePasswordWizardPage : public VolumePasswordWizardPageBase
 	{

src/Main/Forms/VolumePropertiesDialog.cpp

@@ -11,7 +11,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "VolumePropertiesDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	VolumePropertiesDialog::VolumePropertiesDialog (wxWindow* parent, const VolumeInfo &volumeInfo)
 		: VolumePropertiesDialogBase (parent)

src/Main/Forms/VolumePropertiesDialog.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class VolumePropertiesDialog : public VolumePropertiesDialogBase
 	{

src/Main/Forms/VolumeSizeWizardPage.cpp

@@ -10,7 +10,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "VolumeSizeWizardPage.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	VolumeSizeWizardPage::VolumeSizeWizardPage (wxPanel* parent, const VolumePath &volumePath, uint32 sectorSize, const wxString &freeSpaceText)
 		: VolumeSizeWizardPageBase (parent),

src/Main/Forms/VolumeSizeWizardPage.h

@@ -11,7 +11,7 @@
 
 #include "Forms.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class VolumeSizeWizardPage : public VolumeSizeWizardPageBase
 	{

src/Main/Forms/WizardFrame.cpp

@@ -11,7 +11,7 @@
 #include "Main/Resources.h"
 #include "WizardFrame.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	WizardFrame::WizardFrame (wxWindow* parent)
 		: WizardFrameBase (parent),
@@ -20,7 +20,7 @@ namespace TrueCrypt
 		MaxStaticTextWidth (-1),
 		WorkInProgress (false)
 	{
-		SetIcon (Resources::GetTrueCryptIcon());
+		SetIcon (Resources::GetVeraCryptIcon());
 
 		PageTitleStaticText->SetFont (wxFont (
 #ifdef TC_WINDOWS

src/Main/Forms/WizardFrame.h

@@ -12,7 +12,7 @@
 #include "Forms.h"
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class WizardFrame : public WizardFrameBase
 	{

src/Main/Forms/WizardPage.h

@@ -11,7 +11,7 @@
 
 #include "Main/Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class WizardPage : public wxPanel
 	{