From 41a22ca4e78df752d4ce143a692310ab9e48c686 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 22 Jun 2014 16:02:42 +0200 Subject: Change namespace from TrueCrypt to VeraCrypt. Rename method from Resources Resources::GetTrueCryptIcon to Resources::GetVeraCryptIcon. --- src/Main/Application.cpp | 2 +- src/Main/Application.h | 2 +- src/Main/CommandLineInterface.cpp | 2 +- src/Main/CommandLineInterface.h | 2 +- src/Main/FatalErrorHandler.cpp | 2 +- src/Main/FatalErrorHandler.h | 2 +- src/Main/FavoriteVolume.cpp | 2 +- src/Main/FavoriteVolume.h | 2 +- src/Main/Forms/AboutDialog.cpp | 2 +- src/Main/Forms/AboutDialog.h | 2 +- src/Main/Forms/BenchmarkDialog.cpp | 2 +- src/Main/Forms/BenchmarkDialog.h | 2 +- src/Main/Forms/ChangePasswordDialog.cpp | 2 +- src/Main/Forms/ChangePasswordDialog.h | 2 +- src/Main/Forms/DeviceSelectionDialog.cpp | 2 +- src/Main/Forms/DeviceSelectionDialog.h | 2 +- src/Main/Forms/EncryptionOptionsWizardPage.cpp | 2 +- src/Main/Forms/EncryptionOptionsWizardPage.h | 2 +- src/Main/Forms/EncryptionTestDialog.cpp | 2 +- src/Main/Forms/EncryptionTestDialog.h | 2 +- src/Main/Forms/FavoriteVolumesDialog.cpp | 2 +- src/Main/Forms/FavoriteVolumesDialog.h | 2 +- src/Main/Forms/InfoWizardPage.cpp | 2 +- src/Main/Forms/InfoWizardPage.h | 2 +- src/Main/Forms/KeyfileGeneratorDialog.cpp | 2 +- src/Main/Forms/KeyfileGeneratorDialog.h | 2 +- src/Main/Forms/KeyfilesDialog.cpp | 2 +- src/Main/Forms/KeyfilesDialog.h | 2 +- src/Main/Forms/KeyfilesPanel.cpp | 2 +- src/Main/Forms/KeyfilesPanel.h | 2 +- src/Main/Forms/LegalNoticesDialog.cpp | 2 +- src/Main/Forms/LegalNoticesDialog.h | 2 +- src/Main/Forms/MainFrame.cpp | 6 +++--- src/Main/Forms/MainFrame.h | 2 +- src/Main/Forms/MountOptionsDialog.cpp | 2 +- src/Main/Forms/MountOptionsDialog.h | 2 +- src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp | 2 +- src/Main/Forms/NewSecurityTokenKeyfileDialog.h | 2 +- src/Main/Forms/PreferencesDialog.cpp | 2 +- src/Main/Forms/PreferencesDialog.h | 2 +- src/Main/Forms/ProgressWizardPage.cpp | 2 +- src/Main/Forms/ProgressWizardPage.h | 2 +- src/Main/Forms/RandomPoolEnrichmentDialog.cpp | 2 +- src/Main/Forms/RandomPoolEnrichmentDialog.h | 2 +- src/Main/Forms/SecurityTokenKeyfilesDialog.cpp | 2 +- src/Main/Forms/SecurityTokenKeyfilesDialog.h | 2 +- src/Main/Forms/SelectDirectoryWizardPage.cpp | 2 +- src/Main/Forms/SelectDirectoryWizardPage.h | 2 +- src/Main/Forms/SingleChoiceWizardPage.h | 2 +- src/Main/Forms/VolumeCreationProgressWizardPage.cpp | 2 +- src/Main/Forms/VolumeCreationProgressWizardPage.h | 2 +- src/Main/Forms/VolumeCreationWizard.cpp | 2 +- src/Main/Forms/VolumeCreationWizard.h | 2 +- src/Main/Forms/VolumeFormatOptionsWizardPage.cpp | 2 +- src/Main/Forms/VolumeFormatOptionsWizardPage.h | 2 +- src/Main/Forms/VolumeLocationWizardPage.cpp | 2 +- src/Main/Forms/VolumeLocationWizardPage.h | 2 +- src/Main/Forms/VolumePasswordPanel.cpp | 2 +- src/Main/Forms/VolumePasswordPanel.h | 2 +- src/Main/Forms/VolumePasswordWizardPage.cpp | 2 +- src/Main/Forms/VolumePasswordWizardPage.h | 2 +- src/Main/Forms/VolumePropertiesDialog.cpp | 2 +- src/Main/Forms/VolumePropertiesDialog.h | 2 +- src/Main/Forms/VolumeSizeWizardPage.cpp | 2 +- src/Main/Forms/VolumeSizeWizardPage.h | 2 +- src/Main/Forms/WizardFrame.cpp | 4 ++-- src/Main/Forms/WizardFrame.h | 2 +- src/Main/Forms/WizardPage.h | 2 +- src/Main/GraphicUserInterface.cpp | 2 +- src/Main/GraphicUserInterface.h | 2 +- src/Main/Hotkey.cpp | 2 +- src/Main/Hotkey.h | 2 +- src/Main/LanguageStrings.cpp | 2 +- src/Main/LanguageStrings.h | 2 +- src/Main/Resources.cpp | 4 ++-- src/Main/Resources.h | 4 ++-- src/Main/StringFormatter.cpp | 2 +- src/Main/StringFormatter.h | 2 +- src/Main/TextUserInterface.cpp | 2 +- src/Main/TextUserInterface.h | 2 +- src/Main/Unix/Main.cpp | 2 +- src/Main/UserInterface.cpp | 2 +- src/Main/UserInterface.h | 2 +- src/Main/UserInterfaceException.h | 2 +- src/Main/UserInterfaceType.h | 2 +- src/Main/UserPreferences.cpp | 2 +- src/Main/UserPreferences.h | 2 +- src/Main/VolumeHistory.cpp | 2 +- src/Main/VolumeHistory.h | 2 +- src/Main/Xml.cpp | 2 +- src/Main/Xml.h | 2 +- 91 files changed, 96 insertions(+), 96 deletions(-) (limited to 'src/Main') diff --git a/src/Main/Application.cpp b/src/Main/Application.cpp index 2d491696..2d7db155 100644 --- a/src/Main/Application.cpp +++ b/src/Main/Application.cpp @@ -16,7 +16,7 @@ #endif #include "TextUserInterface.h" -namespace TrueCrypt +namespace VeraCrypt { wxApp* Application::CreateConsoleApp () { diff --git a/src/Main/Application.h b/src/Main/Application.h index 67493c13..31c9e0a9 100644 --- a/src/Main/Application.h +++ b/src/Main/Application.h @@ -13,7 +13,7 @@ #include "UserInterface.h" #include "UserInterfaceType.h" -namespace TrueCrypt +namespace VeraCrypt { class Application { diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp index 61cbd310..eed8cf22 100644 --- a/src/Main/CommandLineInterface.cpp +++ b/src/Main/CommandLineInterface.cpp @@ -15,7 +15,7 @@ #include "LanguageStrings.h" #include "UserInterfaceException.h" -namespace TrueCrypt +namespace VeraCrypt { CommandLineInterface::CommandLineInterface (wxCmdLineParser &parser, UserInterfaceType::Enum interfaceType) : ArgCommand (CommandId::None), diff --git a/src/Main/CommandLineInterface.h b/src/Main/CommandLineInterface.h index 50f98f6c..c674597a 100644 --- a/src/Main/CommandLineInterface.h +++ b/src/Main/CommandLineInterface.h @@ -17,7 +17,7 @@ #include "UserPreferences.h" #include "UserInterfaceType.h" -namespace TrueCrypt +namespace VeraCrypt { struct CommandId { diff --git a/src/Main/FatalErrorHandler.cpp b/src/Main/FatalErrorHandler.cpp index dd9b2838..724b6dcc 100644 --- a/src/Main/FatalErrorHandler.cpp +++ b/src/Main/FatalErrorHandler.cpp @@ -31,7 +31,7 @@ #include "FatalErrorHandler.h" -namespace TrueCrypt +namespace VeraCrypt { static terminate_handler DefaultTerminateHandler; diff --git a/src/Main/FatalErrorHandler.h b/src/Main/FatalErrorHandler.h index 478b0ae8..aef68d76 100644 --- a/src/Main/FatalErrorHandler.h +++ b/src/Main/FatalErrorHandler.h @@ -11,7 +11,7 @@ #include "System.h" -namespace TrueCrypt +namespace VeraCrypt { class FatalErrorHandler { diff --git a/src/Main/FavoriteVolume.cpp b/src/Main/FavoriteVolume.cpp index 06831791..2c9f39b6 100644 --- a/src/Main/FavoriteVolume.cpp +++ b/src/Main/FavoriteVolume.cpp @@ -11,7 +11,7 @@ #include "FavoriteVolume.h" #include "Xml.h" -namespace TrueCrypt +namespace VeraCrypt { FavoriteVolumeList FavoriteVolume::LoadList () { diff --git a/src/Main/FavoriteVolume.h b/src/Main/FavoriteVolume.h index f16ca5b9..2d8f306d 100644 --- a/src/Main/FavoriteVolume.h +++ b/src/Main/FavoriteVolume.h @@ -12,7 +12,7 @@ #include "System.h" #include "Main.h" -namespace TrueCrypt +namespace VeraCrypt { struct FavoriteVolume; typedef list < shared_ptr > FavoriteVolumeList; diff --git a/src/Main/Forms/AboutDialog.cpp b/src/Main/Forms/AboutDialog.cpp index c8384457..9eaa4eb1 100644 --- a/src/Main/Forms/AboutDialog.cpp +++ b/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) { diff --git a/src/Main/Forms/AboutDialog.h b/src/Main/Forms/AboutDialog.h index 94cca8bb..658e777b 100644 --- a/src/Main/Forms/AboutDialog.h +++ b/src/Main/Forms/AboutDialog.h @@ -11,7 +11,7 @@ #include "Forms.h" -namespace TrueCrypt +namespace VeraCrypt { class AboutDialog : public AboutDialogBase { diff --git a/src/Main/Forms/BenchmarkDialog.cpp b/src/Main/Forms/BenchmarkDialog.cpp index a2c1418d..fd51aa65 100644 --- a/src/Main/Forms/BenchmarkDialog.cpp +++ b/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) diff --git a/src/Main/Forms/BenchmarkDialog.h b/src/Main/Forms/BenchmarkDialog.h index 3cd61511..b127295f 100644 --- a/src/Main/Forms/BenchmarkDialog.h +++ b/src/Main/Forms/BenchmarkDialog.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Main/Main.h" -namespace TrueCrypt +namespace VeraCrypt { class BenchmarkDialog : public BenchmarkDialogBase { diff --git a/src/Main/Forms/ChangePasswordDialog.cpp b/src/Main/Forms/ChangePasswordDialog.cpp index 05d0143c..2a46f1ab 100644 --- a/src/Main/Forms/ChangePasswordDialog.cpp +++ b/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, Mode::Enum mode, shared_ptr password, shared_ptr keyfiles, shared_ptr newPassword, shared_ptr newKeyfiles) : ChangePasswordDialogBase (parent), DialogMode (mode), Path (volumePath) diff --git a/src/Main/Forms/ChangePasswordDialog.h b/src/Main/Forms/ChangePasswordDialog.h index cc147602..fd46181d 100644 --- a/src/Main/Forms/ChangePasswordDialog.h +++ b/src/Main/Forms/ChangePasswordDialog.h @@ -13,7 +13,7 @@ #include "Main/Main.h" #include "VolumePasswordPanel.h" -namespace TrueCrypt +namespace VeraCrypt { class ChangePasswordDialog : public ChangePasswordDialogBase { diff --git a/src/Main/Forms/DeviceSelectionDialog.cpp b/src/Main/Forms/DeviceSelectionDialog.cpp index 86db68a1..4c5173c1 100644 --- a/src/Main/Forms/DeviceSelectionDialog.cpp +++ b/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) diff --git a/src/Main/Forms/DeviceSelectionDialog.h b/src/Main/Forms/DeviceSelectionDialog.h index df0b6184..69aba123 100644 --- a/src/Main/Forms/DeviceSelectionDialog.h +++ b/src/Main/Forms/DeviceSelectionDialog.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Main/Main.h" -namespace TrueCrypt +namespace VeraCrypt { class DeviceSelectionDialog : public DeviceSelectionDialogBase { diff --git a/src/Main/Forms/EncryptionOptionsWizardPage.cpp b/src/Main/Forms/EncryptionOptionsWizardPage.cpp index d321add2..c05ee5b2 100644 --- a/src/Main/Forms/EncryptionOptionsWizardPage.cpp +++ b/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) diff --git a/src/Main/Forms/EncryptionOptionsWizardPage.h b/src/Main/Forms/EncryptionOptionsWizardPage.h index 1c8b0d95..cc60cba7 100644 --- a/src/Main/Forms/EncryptionOptionsWizardPage.h +++ b/src/Main/Forms/EncryptionOptionsWizardPage.h @@ -11,7 +11,7 @@ #include "Forms.h" -namespace TrueCrypt +namespace VeraCrypt { class EncryptionOptionsWizardPage : public EncryptionOptionsWizardPageBase { diff --git a/src/Main/Forms/EncryptionTestDialog.cpp b/src/Main/Forms/EncryptionTestDialog.cpp index 3e6fa6cc..ab27826d 100644 --- a/src/Main/Forms/EncryptionTestDialog.cpp +++ b/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) diff --git a/src/Main/Forms/EncryptionTestDialog.h b/src/Main/Forms/EncryptionTestDialog.h index 3466ac98..0333926e 100644 --- a/src/Main/Forms/EncryptionTestDialog.h +++ b/src/Main/Forms/EncryptionTestDialog.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Main/Main.h" -namespace TrueCrypt +namespace VeraCrypt { class EncryptionTestDialog : public EncryptionTestDialogBase { diff --git a/src/Main/Forms/FavoriteVolumesDialog.cpp b/src/Main/Forms/FavoriteVolumesDialog.cpp index 7592b3c9..b31f68ec 100644 --- a/src/Main/Forms/FavoriteVolumesDialog.cpp +++ b/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) diff --git a/src/Main/Forms/FavoriteVolumesDialog.h b/src/Main/Forms/FavoriteVolumesDialog.h index 7ab940a6..85b67bb7 100644 --- a/src/Main/Forms/FavoriteVolumesDialog.h +++ b/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 { diff --git a/src/Main/Forms/InfoWizardPage.cpp b/src/Main/Forms/InfoWizardPage.cpp index 286ba476..5ce0e110 100644 --- a/src/Main/Forms/InfoWizardPage.cpp +++ b/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 actionFunctor) : InfoWizardPageBase (parent) diff --git a/src/Main/Forms/InfoWizardPage.h b/src/Main/Forms/InfoWizardPage.h index a3938b03..e27ffc4d 100644 --- a/src/Main/Forms/InfoWizardPage.h +++ b/src/Main/Forms/InfoWizardPage.h @@ -11,7 +11,7 @@ #include "Forms.h" -namespace TrueCrypt +namespace VeraCrypt { class InfoWizardPage : public InfoWizardPageBase { diff --git a/src/Main/Forms/KeyfileGeneratorDialog.cpp b/src/Main/Forms/KeyfileGeneratorDialog.cpp index c217d40a..ce88ab09 100644 --- a/src/Main/Forms/KeyfileGeneratorDialog.cpp +++ b/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) { diff --git a/src/Main/Forms/KeyfileGeneratorDialog.h b/src/Main/Forms/KeyfileGeneratorDialog.h index bc4748f2..4f184909 100644 --- a/src/Main/Forms/KeyfileGeneratorDialog.h +++ b/src/Main/Forms/KeyfileGeneratorDialog.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Main/Main.h" -namespace TrueCrypt +namespace VeraCrypt { class KeyfileGeneratorDialog : public KeyfileGeneratorDialogBase { diff --git a/src/Main/Forms/KeyfilesDialog.cpp b/src/Main/Forms/KeyfilesDialog.cpp index 267f8554..2bcdf2f9 100644 --- a/src/Main/Forms/KeyfilesDialog.cpp +++ b/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 keyfiles) : KeyfilesDialogBase (parent), Keyfiles (keyfiles) diff --git a/src/Main/Forms/KeyfilesDialog.h b/src/Main/Forms/KeyfilesDialog.h index 722cc8ba..753c7579 100644 --- a/src/Main/Forms/KeyfilesDialog.h +++ b/src/Main/Forms/KeyfilesDialog.h @@ -13,7 +13,7 @@ #include "Main/Main.h" #include "KeyfilesPanel.h" -namespace TrueCrypt +namespace VeraCrypt { class KeyfilesDialog : public KeyfilesDialogBase { diff --git a/src/Main/Forms/KeyfilesPanel.cpp b/src/Main/Forms/KeyfilesPanel.cpp index 506e008a..4f329d2f 100644 --- a/src/Main/Forms/KeyfilesPanel.cpp +++ b/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 keyfiles) : KeyfilesPanelBase (parent) diff --git a/src/Main/Forms/KeyfilesPanel.h b/src/Main/Forms/KeyfilesPanel.h index c7617453..f2b8af6e 100644 --- a/src/Main/Forms/KeyfilesPanel.h +++ b/src/Main/Forms/KeyfilesPanel.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Main/Main.h" -namespace TrueCrypt +namespace VeraCrypt { class KeyfilesPanel : public KeyfilesPanelBase { diff --git a/src/Main/Forms/LegalNoticesDialog.cpp b/src/Main/Forms/LegalNoticesDialog.cpp index 8029965d..c17e8194 100644 --- a/src/Main/Forms/LegalNoticesDialog.cpp +++ b/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) { diff --git a/src/Main/Forms/LegalNoticesDialog.h b/src/Main/Forms/LegalNoticesDialog.h index 609ed83a..03a475a8 100644 --- a/src/Main/Forms/LegalNoticesDialog.h +++ b/src/Main/Forms/LegalNoticesDialog.h @@ -11,7 +11,7 @@ #include "Forms.h" -namespace TrueCrypt +namespace VeraCrypt { class LegalNoticesDialog : public LegalNoticesDialogBase { diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp index 3443ea3b..7c329292 100644 --- a/src/Main/Forms/MainFrame.cpp +++ b/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 } } diff --git a/src/Main/Forms/MainFrame.h b/src/Main/Forms/MainFrame.h index 5b775abc..e4c308e6 100644 --- a/src/Main/Forms/MainFrame.h +++ b/src/Main/Forms/MainFrame.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "ChangePasswordDialog.h" -namespace TrueCrypt +namespace VeraCrypt { struct FavoriteVolume; diff --git a/src/Main/Forms/MountOptionsDialog.cpp b/src/Main/Forms/MountOptionsDialog.cpp index f4fea7a6..69d821c2 100644 --- a/src/Main/Forms/MountOptionsDialog.cpp +++ b/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() diff --git a/src/Main/Forms/MountOptionsDialog.h b/src/Main/Forms/MountOptionsDialog.h index c5ef8097..9adb5412 100644 --- a/src/Main/Forms/MountOptionsDialog.h +++ b/src/Main/Forms/MountOptionsDialog.h @@ -13,7 +13,7 @@ #include "Main/Main.h" #include "VolumePasswordPanel.h" -namespace TrueCrypt +namespace VeraCrypt { class MountOptionsDialog : public MountOptionsDialogBase { diff --git a/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp b/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp index ed728254..cc6e20e6 100644 --- a/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp +++ b/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) { diff --git a/src/Main/Forms/NewSecurityTokenKeyfileDialog.h b/src/Main/Forms/NewSecurityTokenKeyfileDialog.h index 11891dbb..e240db6b 100644 --- a/src/Main/Forms/NewSecurityTokenKeyfileDialog.h +++ b/src/Main/Forms/NewSecurityTokenKeyfileDialog.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Common/SecurityToken.h" -namespace TrueCrypt +namespace VeraCrypt { class NewSecurityTokenKeyfileDialog : public NewSecurityTokenKeyfileDialogBase { diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp index 163a06fb..50c9c300 100644 --- a/src/Main/Forms/PreferencesDialog.cpp +++ b/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), diff --git a/src/Main/Forms/PreferencesDialog.h b/src/Main/Forms/PreferencesDialog.h index 412d7c44..d094203c 100644 --- a/src/Main/Forms/PreferencesDialog.h +++ b/src/Main/Forms/PreferencesDialog.h @@ -13,7 +13,7 @@ #include "Main/Main.h" #include "KeyfilesPanel.h" -namespace TrueCrypt +namespace VeraCrypt { class PreferencesDialog : public PreferencesDialogBase { diff --git a/src/Main/Forms/ProgressWizardPage.cpp b/src/Main/Forms/ProgressWizardPage.cpp index 113d9872..2bd24c60 100644 --- a/src/Main/Forms/ProgressWizardPage.cpp +++ b/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), diff --git a/src/Main/Forms/ProgressWizardPage.h b/src/Main/Forms/ProgressWizardPage.h index 541edd66..bd410462 100644 --- a/src/Main/Forms/ProgressWizardPage.h +++ b/src/Main/Forms/ProgressWizardPage.h @@ -11,7 +11,7 @@ #include "Forms.h" -namespace TrueCrypt +namespace VeraCrypt { class ProgressWizardPage : public ProgressWizardPageBase { diff --git a/src/Main/Forms/RandomPoolEnrichmentDialog.cpp b/src/Main/Forms/RandomPoolEnrichmentDialog.cpp index 44e45db8..a17afbfc 100644 --- a/src/Main/Forms/RandomPoolEnrichmentDialog.cpp +++ b/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) { diff --git a/src/Main/Forms/RandomPoolEnrichmentDialog.h b/src/Main/Forms/RandomPoolEnrichmentDialog.h index 8a951bcb..a77ba0ff 100644 --- a/src/Main/Forms/RandomPoolEnrichmentDialog.h +++ b/src/Main/Forms/RandomPoolEnrichmentDialog.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Main/Main.h" -namespace TrueCrypt +namespace VeraCrypt { class RandomPoolEnrichmentDialog : public RandomPoolEnrichmentDialogBase { diff --git a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp index 5978b0b1..a0930726 100644 --- a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp +++ b/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) diff --git a/src/Main/Forms/SecurityTokenKeyfilesDialog.h b/src/Main/Forms/SecurityTokenKeyfilesDialog.h index 2fd78349..6070aae2 100644 --- a/src/Main/Forms/SecurityTokenKeyfilesDialog.h +++ b/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 { diff --git a/src/Main/Forms/SelectDirectoryWizardPage.cpp b/src/Main/Forms/SelectDirectoryWizardPage.cpp index 1299e22b..a96d5038 100644 --- a/src/Main/Forms/SelectDirectoryWizardPage.cpp +++ b/src/Main/Forms/SelectDirectoryWizardPage.cpp @@ -10,7 +10,7 @@ #include "Main/GraphicUserInterface.h" #include "SelectDirectoryWizardPage.h" -namespace TrueCrypt +namespace VeraCrypt { bool SelectDirectoryWizardPage::IsValid () { diff --git a/src/Main/Forms/SelectDirectoryWizardPage.h b/src/Main/Forms/SelectDirectoryWizardPage.h index 2ea8b0dc..a8337739 100644 --- a/src/Main/Forms/SelectDirectoryWizardPage.h +++ b/src/Main/Forms/SelectDirectoryWizardPage.h @@ -11,7 +11,7 @@ #include "Forms.h" -namespace TrueCrypt +namespace VeraCrypt { class SelectDirectoryWizardPage : public SelectDirectoryWizardPageBase { diff --git a/src/Main/Forms/SingleChoiceWizardPage.h b/src/Main/Forms/SingleChoiceWizardPage.h index 43536eca..750ef801 100644 --- a/src/Main/Forms/SingleChoiceWizardPage.h +++ b/src/Main/Forms/SingleChoiceWizardPage.h @@ -11,7 +11,7 @@ #include "Forms.h" -namespace TrueCrypt +namespace VeraCrypt { template class SingleChoiceWizardPage : public SingleChoiceWizardPageBase diff --git a/src/Main/Forms/VolumeCreationProgressWizardPage.cpp b/src/Main/Forms/VolumeCreationProgressWizardPage.cpp index 12b11591..e80292e2 100644 --- a/src/Main/Forms/VolumeCreationProgressWizardPage.cpp +++ b/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), diff --git a/src/Main/Forms/VolumeCreationProgressWizardPage.h b/src/Main/Forms/VolumeCreationProgressWizardPage.h index a33b3623..449da6c8 100644 --- a/src/Main/Forms/VolumeCreationProgressWizardPage.h +++ b/src/Main/Forms/VolumeCreationProgressWizardPage.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Core/VolumeCreator.h" -namespace TrueCrypt +namespace VeraCrypt { class VolumeCreationProgressWizardPage : public VolumeCreationProgressWizardPageBase { diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp index 127880a1..bd3fa7ea 100644 --- a/src/Main/Forms/VolumeCreationWizard.cpp +++ b/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), diff --git a/src/Main/Forms/VolumeCreationWizard.h b/src/Main/Forms/VolumeCreationWizard.h index fb2a8ddd..abbf64cb 100644 --- a/src/Main/Forms/VolumeCreationWizard.h +++ b/src/Main/Forms/VolumeCreationWizard.h @@ -12,7 +12,7 @@ #include "WizardFrame.h" #include "Core/VolumeCreator.h" -namespace TrueCrypt +namespace VeraCrypt { class VolumeCreationWizard : public WizardFrame { diff --git a/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp b/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp index 656c7626..89069078 100644 --- a/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp +++ b/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) diff --git a/src/Main/Forms/VolumeFormatOptionsWizardPage.h b/src/Main/Forms/VolumeFormatOptionsWizardPage.h index ae724c66..0937135d 100644 --- a/src/Main/Forms/VolumeFormatOptionsWizardPage.h +++ b/src/Main/Forms/VolumeFormatOptionsWizardPage.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Core/VolumeCreator.h" -namespace TrueCrypt +namespace VeraCrypt { class VolumeFormatOptionsWizardPage : public VolumeFormatOptionsWizardPageBase { diff --git a/src/Main/Forms/VolumeLocationWizardPage.cpp b/src/Main/Forms/VolumeLocationWizardPage.cpp index c3992827..07748f77 100644 --- a/src/Main/Forms/VolumeLocationWizardPage.cpp +++ b/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), diff --git a/src/Main/Forms/VolumeLocationWizardPage.h b/src/Main/Forms/VolumeLocationWizardPage.h index 8634f239..34e115ab 100644 --- a/src/Main/Forms/VolumeLocationWizardPage.h +++ b/src/Main/Forms/VolumeLocationWizardPage.h @@ -11,7 +11,7 @@ #include "Forms.h" -namespace TrueCrypt +namespace VeraCrypt { class VolumeLocationWizardPage : public VolumeLocationWizardPageBase { diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp index 25767f96..54bef90f 100644 --- a/src/Main/Forms/VolumePasswordPanel.cpp +++ b/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 password, shared_ptr keyfiles, bool enableCache, bool enablePassword, bool enableKeyfiles, bool enableConfirmation, bool enablePkcs5Prf, const wxString &passwordLabel) : VolumePasswordPanelBase (parent), Keyfiles (new KeyfileList) diff --git a/src/Main/Forms/VolumePasswordPanel.h b/src/Main/Forms/VolumePasswordPanel.h index 8488cbd1..3ab7f95a 100644 --- a/src/Main/Forms/VolumePasswordPanel.h +++ b/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 { diff --git a/src/Main/Forms/VolumePasswordWizardPage.cpp b/src/Main/Forms/VolumePasswordWizardPage.cpp index fd4eaf2c..1034c220 100644 --- a/src/Main/Forms/VolumePasswordWizardPage.cpp +++ b/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 password, shared_ptr keyfiles, bool enableConfirmation) : VolumePasswordWizardPageBase (parent), ConfirmationMode (enableConfirmation) diff --git a/src/Main/Forms/VolumePasswordWizardPage.h b/src/Main/Forms/VolumePasswordWizardPage.h index d26cc010..8aaf30d6 100644 --- a/src/Main/Forms/VolumePasswordWizardPage.h +++ b/src/Main/Forms/VolumePasswordWizardPage.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "VolumePasswordPanel.h" -namespace TrueCrypt +namespace VeraCrypt { class VolumePasswordWizardPage : public VolumePasswordWizardPageBase { diff --git a/src/Main/Forms/VolumePropertiesDialog.cpp b/src/Main/Forms/VolumePropertiesDialog.cpp index c5fa2dd8..c9956187 100644 --- a/src/Main/Forms/VolumePropertiesDialog.cpp +++ b/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) diff --git a/src/Main/Forms/VolumePropertiesDialog.h b/src/Main/Forms/VolumePropertiesDialog.h index d651b6b5..ff9ac3e6 100644 --- a/src/Main/Forms/VolumePropertiesDialog.h +++ b/src/Main/Forms/VolumePropertiesDialog.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Main/Main.h" -namespace TrueCrypt +namespace VeraCrypt { class VolumePropertiesDialog : public VolumePropertiesDialogBase { diff --git a/src/Main/Forms/VolumeSizeWizardPage.cpp b/src/Main/Forms/VolumeSizeWizardPage.cpp index 42abfbe6..ffd26f66 100644 --- a/src/Main/Forms/VolumeSizeWizardPage.cpp +++ b/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), diff --git a/src/Main/Forms/VolumeSizeWizardPage.h b/src/Main/Forms/VolumeSizeWizardPage.h index d6f19428..515dbc73 100644 --- a/src/Main/Forms/VolumeSizeWizardPage.h +++ b/src/Main/Forms/VolumeSizeWizardPage.h @@ -11,7 +11,7 @@ #include "Forms.h" -namespace TrueCrypt +namespace VeraCrypt { class VolumeSizeWizardPage : public VolumeSizeWizardPageBase { diff --git a/src/Main/Forms/WizardFrame.cpp b/src/Main/Forms/WizardFrame.cpp index 9941be81..ecc1aba8 100644 --- a/src/Main/Forms/WizardFrame.cpp +++ b/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 diff --git a/src/Main/Forms/WizardFrame.h b/src/Main/Forms/WizardFrame.h index d9f9ceb0..726f5cd3 100644 --- a/src/Main/Forms/WizardFrame.h +++ b/src/Main/Forms/WizardFrame.h @@ -12,7 +12,7 @@ #include "Forms.h" #include "Main/Main.h" -namespace TrueCrypt +namespace VeraCrypt { class WizardFrame : public WizardFrameBase { diff --git a/src/Main/Forms/WizardPage.h b/src/Main/Forms/WizardPage.h index e00b8605..ef34154f 100644 --- a/src/Main/Forms/WizardPage.h +++ b/src/Main/Forms/WizardPage.h @@ -11,7 +11,7 @@ #include "Main/Main.h" -namespace TrueCrypt +namespace VeraCrypt { class WizardPage : public wxPanel { diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index dce1a203..642a572c 100644 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -31,7 +31,7 @@ #include "Forms/RandomPoolEnrichmentDialog.h" #include "Forms/SecurityTokenKeyfilesDialog.h" -namespace TrueCrypt +namespace VeraCrypt { GraphicUserInterface::GraphicUserInterface () : ActiveFrame (nullptr), diff --git a/src/Main/GraphicUserInterface.h b/src/Main/GraphicUserInterface.h index f22b0af3..6fa51c4d 100644 --- a/src/Main/GraphicUserInterface.h +++ b/src/Main/GraphicUserInterface.h @@ -14,7 +14,7 @@ #include "Main.h" #include "UserInterface.h" -namespace TrueCrypt +namespace VeraCrypt { class GraphicUserInterface : public UserInterface { diff --git a/src/Main/Hotkey.cpp b/src/Main/Hotkey.cpp index 95e7fa07..8abfd532 100644 --- a/src/Main/Hotkey.cpp +++ b/src/Main/Hotkey.cpp @@ -13,7 +13,7 @@ #include "Hotkey.h" #include "Xml.h" -namespace TrueCrypt +namespace VeraCrypt { HotkeyList Hotkey::GetAvailableHotkeys () { diff --git a/src/Main/Hotkey.h b/src/Main/Hotkey.h index be8603a3..a2bb9368 100644 --- a/src/Main/Hotkey.h +++ b/src/Main/Hotkey.h @@ -12,7 +12,7 @@ #include "System.h" #include "Main.h" -namespace TrueCrypt +namespace VeraCrypt { struct Hotkey; typedef list < shared_ptr > HotkeyList; diff --git a/src/Main/LanguageStrings.cpp b/src/Main/LanguageStrings.cpp index f6b76fe9..e4c0163e 100644 --- a/src/Main/LanguageStrings.cpp +++ b/src/Main/LanguageStrings.cpp @@ -11,7 +11,7 @@ #include "LanguageStrings.h" #include "Xml.h" -namespace TrueCrypt +namespace VeraCrypt { LanguageStrings::LanguageStrings () { diff --git a/src/Main/LanguageStrings.h b/src/Main/LanguageStrings.h index fa94a091..969bcbb8 100644 --- a/src/Main/LanguageStrings.h +++ b/src/Main/LanguageStrings.h @@ -12,7 +12,7 @@ #include "System.h" #include "Main.h" -namespace TrueCrypt +namespace VeraCrypt { class LanguageStrings { diff --git a/src/Main/Resources.cpp b/src/Main/Resources.cpp index c9187d72..d56ad13e 100644 --- a/src/Main/Resources.cpp +++ b/src/Main/Resources.cpp @@ -14,7 +14,7 @@ #include "Main/resource.h" #endif -namespace TrueCrypt +namespace VeraCrypt { #ifdef TC_WINDOWS @@ -146,7 +146,7 @@ namespace TrueCrypt #endif } - wxIcon Resources::GetTrueCryptIcon () + wxIcon Resources::GetVeraCryptIcon () { #ifdef TC_WINDOWS return wxIcon (L"IDI_TRUECRYPT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16); diff --git a/src/Main/Resources.h b/src/Main/Resources.h index a071253f..517d4df9 100644 --- a/src/Main/Resources.h +++ b/src/Main/Resources.h @@ -12,7 +12,7 @@ #include "System.h" #include "Platform/Platform.h" -namespace TrueCrypt +namespace VeraCrypt { class Resources { @@ -24,7 +24,7 @@ namespace TrueCrypt static wxBitmap GetDriveIconMaskBitmap (); static wxBitmap GetLogoBitmap (); static wxBitmap GetTextualLogoBitmap (); - static wxIcon GetTrueCryptIcon (); + static wxIcon GetVeraCryptIcon (); static wxBitmap GetVolumeCreationWizardBitmap (int height = -1); #endif }; diff --git a/src/Main/StringFormatter.cpp b/src/Main/StringFormatter.cpp index 5adb4c63..7478f37a 100644 --- a/src/Main/StringFormatter.cpp +++ b/src/Main/StringFormatter.cpp @@ -10,7 +10,7 @@ #include "StringFormatter.h" #include "UserInterfaceException.h" -namespace TrueCrypt +namespace VeraCrypt { StringFormatter::StringFormatter (const wxString &format, StringFormatterArg arg0, StringFormatterArg arg1, StringFormatterArg arg2, StringFormatterArg arg3, StringFormatterArg arg4, StringFormatterArg arg5, StringFormatterArg arg6, StringFormatterArg arg7, StringFormatterArg arg8, StringFormatterArg arg9) { diff --git a/src/Main/StringFormatter.h b/src/Main/StringFormatter.h index aa09131f..9f67c2bc 100644 --- a/src/Main/StringFormatter.h +++ b/src/Main/StringFormatter.h @@ -12,7 +12,7 @@ #include "System.h" #include "Main.h" -namespace TrueCrypt +namespace VeraCrypt { class StringFormatterArg { diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp index c7af0990..d4189a43 100644 --- a/src/Main/TextUserInterface.cpp +++ b/src/Main/TextUserInterface.cpp @@ -21,7 +21,7 @@ #include "Application.h" #include "TextUserInterface.h" -namespace TrueCrypt +namespace VeraCrypt { TextUserInterface::TextUserInterface () { diff --git a/src/Main/TextUserInterface.h b/src/Main/TextUserInterface.h index 942c45fd..8721395f 100644 --- a/src/Main/TextUserInterface.h +++ b/src/Main/TextUserInterface.h @@ -13,7 +13,7 @@ #include "Main.h" #include "UserInterface.h" -namespace TrueCrypt +namespace VeraCrypt { class TextUserInterface : public UserInterface { diff --git a/src/Main/Unix/Main.cpp b/src/Main/Unix/Main.cpp index 382fdaf6..5372fd31 100644 --- a/src/Main/Unix/Main.cpp +++ b/src/Main/Unix/Main.cpp @@ -21,7 +21,7 @@ #include #endif -using namespace TrueCrypt; +using namespace VeraCrypt; int main (int argc, char **argv) { diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp index 2637d6e6..618407f7 100644 --- a/src/Main/UserInterface.cpp +++ b/src/Main/UserInterface.cpp @@ -23,7 +23,7 @@ #include "FavoriteVolume.h" #include "UserInterface.h" -namespace TrueCrypt +namespace VeraCrypt { UserInterface::UserInterface () { diff --git a/src/Main/UserInterface.h b/src/Main/UserInterface.h index ca33def2..f7ebee0d 100644 --- a/src/Main/UserInterface.h +++ b/src/Main/UserInterface.h @@ -19,7 +19,7 @@ #include "UserInterfaceException.h" #include "UserInterfaceType.h" -namespace TrueCrypt +namespace VeraCrypt { class UserInterface : public wxApp { diff --git a/src/Main/UserInterfaceException.h b/src/Main/UserInterfaceException.h index 625fc37d..49b95fb1 100644 --- a/src/Main/UserInterfaceException.h +++ b/src/Main/UserInterfaceException.h @@ -11,7 +11,7 @@ #include "Platform/Platform.h" -namespace TrueCrypt +namespace VeraCrypt { TC_EXCEPTION_DECL (UserInterfaceException, Exception); TC_EXCEPTION_DECL (MissingArgument, UserInterfaceException); diff --git a/src/Main/UserInterfaceType.h b/src/Main/UserInterfaceType.h index fe1571d1..ccf80052 100644 --- a/src/Main/UserInterfaceType.h +++ b/src/Main/UserInterfaceType.h @@ -9,7 +9,7 @@ #ifndef TC_HEADER_Main_UserInterfaceType #define TC_HEADER_Main_UserInterfaceType -namespace TrueCrypt +namespace VeraCrypt { struct UserInterfaceType { diff --git a/src/Main/UserPreferences.cpp b/src/Main/UserPreferences.cpp index 6608f795..b8a4d704 100644 --- a/src/Main/UserPreferences.cpp +++ b/src/Main/UserPreferences.cpp @@ -11,7 +11,7 @@ #include "UserPreferences.h" #include "Xml.h" -namespace TrueCrypt +namespace VeraCrypt { void UserPreferences::SetValue (const wxString &cfgText, bool &cfgVar) { diff --git a/src/Main/UserPreferences.h b/src/Main/UserPreferences.h index 0f862ce6..73da46eb 100644 --- a/src/Main/UserPreferences.h +++ b/src/Main/UserPreferences.h @@ -13,7 +13,7 @@ #include "Main.h" #include "Hotkey.h" -namespace TrueCrypt +namespace VeraCrypt { struct UserPreferences { diff --git a/src/Main/VolumeHistory.cpp b/src/Main/VolumeHistory.cpp index 5bdac903..8d7a1587 100644 --- a/src/Main/VolumeHistory.cpp +++ b/src/Main/VolumeHistory.cpp @@ -12,7 +12,7 @@ #include "Xml.h" #include "VolumeHistory.h" -namespace TrueCrypt +namespace VeraCrypt { VolumeHistory::VolumeHistory () { diff --git a/src/Main/VolumeHistory.h b/src/Main/VolumeHistory.h index d2fc3fc0..7865aafc 100644 --- a/src/Main/VolumeHistory.h +++ b/src/Main/VolumeHistory.h @@ -12,7 +12,7 @@ #include "System.h" #include "Main.h" -namespace TrueCrypt +namespace VeraCrypt { class VolumeHistory { diff --git a/src/Main/Xml.cpp b/src/Main/Xml.cpp index 027062cb..286b5d22 100644 --- a/src/Main/Xml.cpp +++ b/src/Main/Xml.cpp @@ -11,7 +11,7 @@ #include "Platform/FileStream.h" #include "Xml.h" -namespace TrueCrypt +namespace VeraCrypt { XmlParser::XmlParser (const FilePath &fileName) { diff --git a/src/Main/Xml.h b/src/Main/Xml.h index 9f615af2..e715db0a 100644 --- a/src/Main/Xml.h +++ b/src/Main/Xml.h @@ -12,7 +12,7 @@ #include "System.h" #include "Main.h" -namespace TrueCrypt +namespace VeraCrypt { struct XmlNode; typedef list XmlNodeList; -- cgit v1.2.3