VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Common/BaseCom.cpp2
-rw-r--r--src/Common/BootEncryption.cpp2
-rw-r--r--src/Common/BootEncryption.h2
-rw-r--r--src/Common/Dlgcode.c2
-rw-r--r--src/Common/Exception.h2
-rw-r--r--src/Common/Keyfiles.c2
-rw-r--r--src/Common/SecurityToken.cpp2
-rw-r--r--src/Common/SecurityToken.h2
-rw-r--r--src/Core/Core.h2
-rw-r--r--src/Core/CoreBase.cpp2
-rw-r--r--src/Core/CoreBase.h2
-rw-r--r--src/Core/CoreException.cpp2
-rw-r--r--src/Core/CoreException.h2
-rw-r--r--src/Core/FatFormatter.cpp2
-rw-r--r--src/Core/FatFormatter.h2
-rw-r--r--src/Core/HostDevice.cpp2
-rw-r--r--src/Core/HostDevice.h2
-rw-r--r--src/Core/MountOptions.cpp2
-rw-r--r--src/Core/MountOptions.h2
-rw-r--r--src/Core/RandomNumberGenerator.cpp2
-rw-r--r--src/Core/RandomNumberGenerator.h2
-rw-r--r--src/Core/Unix/CoreService.cpp2
-rw-r--r--src/Core/Unix/CoreService.h2
-rw-r--r--src/Core/Unix/CoreServiceProxy.h2
-rw-r--r--src/Core/Unix/CoreServiceRequest.cpp2
-rw-r--r--src/Core/Unix/CoreServiceRequest.h2
-rw-r--r--src/Core/Unix/CoreServiceResponse.cpp2
-rw-r--r--src/Core/Unix/CoreServiceResponse.h2
-rw-r--r--src/Core/Unix/CoreUnix.cpp2
-rw-r--r--src/Core/Unix/CoreUnix.h2
-rw-r--r--src/Core/Unix/FreeBSD/CoreFreeBSD.cpp2
-rw-r--r--src/Core/Unix/FreeBSD/CoreFreeBSD.h2
-rw-r--r--src/Core/Unix/Linux/CoreLinux.cpp2
-rw-r--r--src/Core/Unix/Linux/CoreLinux.h2
-rw-r--r--src/Core/Unix/MacOSX/CoreMacOSX.cpp2
-rw-r--r--src/Core/Unix/MacOSX/CoreMacOSX.h2
-rw-r--r--src/Core/Unix/MountedFilesystem.h2
-rw-r--r--src/Core/Unix/Solaris/CoreSolaris.cpp2
-rw-r--r--src/Core/Unix/Solaris/CoreSolaris.h2
-rw-r--r--src/Core/VolumeCreator.cpp2
-rw-r--r--src/Core/VolumeCreator.h2
-rw-r--r--src/Driver/Fuse/FuseService.cpp2
-rw-r--r--src/Driver/Fuse/FuseService.h2
-rw-r--r--src/Format/FormatCom.cpp2
-rw-r--r--src/Format/InPlace.c2
-rw-r--r--src/Format/Tcformat.c2
-rw-r--r--src/Main/Application.cpp2
-rw-r--r--src/Main/Application.h2
-rw-r--r--src/Main/CommandLineInterface.cpp2
-rw-r--r--src/Main/CommandLineInterface.h2
-rw-r--r--src/Main/FatalErrorHandler.cpp2
-rw-r--r--src/Main/FatalErrorHandler.h2
-rw-r--r--src/Main/FavoriteVolume.cpp2
-rw-r--r--src/Main/FavoriteVolume.h2
-rw-r--r--src/Main/Forms/AboutDialog.cpp2
-rw-r--r--src/Main/Forms/AboutDialog.h2
-rw-r--r--src/Main/Forms/BenchmarkDialog.cpp2
-rw-r--r--src/Main/Forms/BenchmarkDialog.h2
-rw-r--r--src/Main/Forms/ChangePasswordDialog.cpp2
-rw-r--r--src/Main/Forms/ChangePasswordDialog.h2
-rw-r--r--src/Main/Forms/DeviceSelectionDialog.cpp2
-rw-r--r--src/Main/Forms/DeviceSelectionDialog.h2
-rw-r--r--src/Main/Forms/EncryptionOptionsWizardPage.cpp2
-rw-r--r--src/Main/Forms/EncryptionOptionsWizardPage.h2
-rw-r--r--src/Main/Forms/EncryptionTestDialog.cpp2
-rw-r--r--src/Main/Forms/EncryptionTestDialog.h2
-rw-r--r--src/Main/Forms/FavoriteVolumesDialog.cpp2
-rw-r--r--src/Main/Forms/FavoriteVolumesDialog.h2
-rw-r--r--src/Main/Forms/InfoWizardPage.cpp2
-rw-r--r--src/Main/Forms/InfoWizardPage.h2
-rw-r--r--src/Main/Forms/KeyfileGeneratorDialog.cpp2
-rw-r--r--src/Main/Forms/KeyfileGeneratorDialog.h2
-rw-r--r--src/Main/Forms/KeyfilesDialog.cpp2
-rw-r--r--src/Main/Forms/KeyfilesDialog.h2
-rw-r--r--src/Main/Forms/KeyfilesPanel.cpp2
-rw-r--r--src/Main/Forms/KeyfilesPanel.h2
-rw-r--r--src/Main/Forms/LegalNoticesDialog.cpp2
-rw-r--r--src/Main/Forms/LegalNoticesDialog.h2
-rw-r--r--src/Main/Forms/MainFrame.cpp6
-rw-r--r--src/Main/Forms/MainFrame.h2
-rw-r--r--src/Main/Forms/MountOptionsDialog.cpp2
-rw-r--r--src/Main/Forms/MountOptionsDialog.h2
-rw-r--r--src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp2
-rw-r--r--src/Main/Forms/NewSecurityTokenKeyfileDialog.h2
-rw-r--r--src/Main/Forms/PreferencesDialog.cpp2
-rw-r--r--src/Main/Forms/PreferencesDialog.h2
-rw-r--r--src/Main/Forms/ProgressWizardPage.cpp2
-rw-r--r--src/Main/Forms/ProgressWizardPage.h2
-rw-r--r--src/Main/Forms/RandomPoolEnrichmentDialog.cpp2
-rw-r--r--src/Main/Forms/RandomPoolEnrichmentDialog.h2
-rw-r--r--src/Main/Forms/SecurityTokenKeyfilesDialog.cpp2
-rw-r--r--src/Main/Forms/SecurityTokenKeyfilesDialog.h2
-rw-r--r--src/Main/Forms/SelectDirectoryWizardPage.cpp2
-rw-r--r--src/Main/Forms/SelectDirectoryWizardPage.h2
-rw-r--r--src/Main/Forms/SingleChoiceWizardPage.h2
-rw-r--r--src/Main/Forms/VolumeCreationProgressWizardPage.cpp2
-rw-r--r--src/Main/Forms/VolumeCreationProgressWizardPage.h2
-rw-r--r--src/Main/Forms/VolumeCreationWizard.cpp2
-rw-r--r--src/Main/Forms/VolumeCreationWizard.h2
-rw-r--r--src/Main/Forms/VolumeFormatOptionsWizardPage.cpp2
-rw-r--r--src/Main/Forms/VolumeFormatOptionsWizardPage.h2
-rw-r--r--src/Main/Forms/VolumeLocationWizardPage.cpp2
-rw-r--r--src/Main/Forms/VolumeLocationWizardPage.h2
-rw-r--r--src/Main/Forms/VolumePasswordPanel.cpp2
-rw-r--r--src/Main/Forms/VolumePasswordPanel.h2
-rw-r--r--src/Main/Forms/VolumePasswordWizardPage.cpp2
-rw-r--r--src/Main/Forms/VolumePasswordWizardPage.h2
-rw-r--r--src/Main/Forms/VolumePropertiesDialog.cpp2
-rw-r--r--src/Main/Forms/VolumePropertiesDialog.h2
-rw-r--r--src/Main/Forms/VolumeSizeWizardPage.cpp2
-rw-r--r--src/Main/Forms/VolumeSizeWizardPage.h2
-rw-r--r--src/Main/Forms/WizardFrame.cpp4
-rw-r--r--src/Main/Forms/WizardFrame.h2
-rw-r--r--src/Main/Forms/WizardPage.h2
-rw-r--r--src/Main/GraphicUserInterface.cpp2
-rw-r--r--src/Main/GraphicUserInterface.h2
-rw-r--r--src/Main/Hotkey.cpp2
-rw-r--r--src/Main/Hotkey.h2
-rw-r--r--src/Main/LanguageStrings.cpp2
-rw-r--r--src/Main/LanguageStrings.h2
-rw-r--r--src/Main/Resources.cpp4
-rw-r--r--src/Main/Resources.h4
-rw-r--r--src/Main/StringFormatter.cpp2
-rw-r--r--src/Main/StringFormatter.h2
-rw-r--r--src/Main/TextUserInterface.cpp2
-rw-r--r--src/Main/TextUserInterface.h2
-rw-r--r--src/Main/Unix/Main.cpp2
-rw-r--r--src/Main/UserInterface.cpp2
-rw-r--r--src/Main/UserInterface.h2
-rw-r--r--src/Main/UserInterfaceException.h2
-rw-r--r--src/Main/UserInterfaceType.h2
-rw-r--r--src/Main/UserPreferences.cpp2
-rw-r--r--src/Main/UserPreferences.h2
-rw-r--r--src/Main/VolumeHistory.cpp2
-rw-r--r--src/Main/VolumeHistory.h2
-rw-r--r--src/Main/Xml.cpp2
-rw-r--r--src/Main/Xml.h2
-rw-r--r--src/Mount/Favorites.cpp2
-rw-r--r--src/Mount/Favorites.h2
-rw-r--r--src/Mount/MainCom.cpp2
-rw-r--r--src/Mount/Mount.c2
-rw-r--r--src/Mount/Mount.h2
-rw-r--r--src/Platform/Buffer.cpp2
-rw-r--r--src/Platform/Buffer.h2
-rw-r--r--src/Platform/Directory.h2
-rw-r--r--src/Platform/Event.cpp2
-rw-r--r--src/Platform/Event.h2
-rw-r--r--src/Platform/Exception.cpp2
-rw-r--r--src/Platform/Exception.h2
-rw-r--r--src/Platform/File.h2
-rw-r--r--src/Platform/FileCommon.cpp2
-rw-r--r--src/Platform/FileStream.h2
-rw-r--r--src/Platform/FilesystemPath.h2
-rw-r--r--src/Platform/ForEach.h2
-rw-r--r--src/Platform/Functor.h2
-rw-r--r--src/Platform/Memory.cpp2
-rw-r--r--src/Platform/Memory.h2
-rw-r--r--src/Platform/MemoryStream.cpp2
-rw-r--r--src/Platform/MemoryStream.h2
-rw-r--r--src/Platform/Mutex.h2
-rw-r--r--src/Platform/PlatformBase.h2
-rw-r--r--src/Platform/PlatformTest.cpp2
-rw-r--r--src/Platform/PlatformTest.h2
-rw-r--r--src/Platform/Serializable.cpp2
-rw-r--r--src/Platform/Serializable.h2
-rw-r--r--src/Platform/Serializer.cpp2
-rw-r--r--src/Platform/Serializer.h2
-rw-r--r--src/Platform/SerializerFactory.cpp2
-rw-r--r--src/Platform/SerializerFactory.h2
-rw-r--r--src/Platform/SharedPtr.h6
-rw-r--r--src/Platform/SharedVal.h2
-rw-r--r--src/Platform/Stream.h2
-rw-r--r--src/Platform/StringConverter.cpp2
-rw-r--r--src/Platform/StringConverter.h2
-rw-r--r--src/Platform/SyncEvent.h2
-rw-r--r--src/Platform/SystemException.h2
-rw-r--r--src/Platform/SystemInfo.h2
-rw-r--r--src/Platform/SystemLog.h2
-rw-r--r--src/Platform/TextReader.cpp2
-rw-r--r--src/Platform/TextReader.h2
-rw-r--r--src/Platform/Thread.h2
-rw-r--r--src/Platform/Time.h2
-rw-r--r--src/Platform/Unix/Directory.cpp2
-rw-r--r--src/Platform/Unix/File.cpp2
-rw-r--r--src/Platform/Unix/FilesystemPath.cpp2
-rw-r--r--src/Platform/Unix/Mutex.cpp2
-rw-r--r--src/Platform/Unix/Pipe.cpp2
-rw-r--r--src/Platform/Unix/Pipe.h2
-rw-r--r--src/Platform/Unix/Poller.cpp2
-rw-r--r--src/Platform/Unix/Poller.h2
-rw-r--r--src/Platform/Unix/Process.cpp2
-rw-r--r--src/Platform/Unix/Process.h2
-rw-r--r--src/Platform/Unix/SyncEvent.cpp2
-rw-r--r--src/Platform/Unix/SystemException.cpp2
-rw-r--r--src/Platform/Unix/SystemInfo.cpp2
-rw-r--r--src/Platform/Unix/SystemLog.cpp2
-rw-r--r--src/Platform/Unix/Thread.cpp2
-rw-r--r--src/Platform/Unix/Time.cpp2
-rw-r--r--src/Platform/User.h2
-rw-r--r--src/Setup/Setup.c2
-rw-r--r--src/Volume/Cipher.cpp2
-rw-r--r--src/Volume/Cipher.h2
-rw-r--r--src/Volume/Crc32.h2
-rw-r--r--src/Volume/EncryptionAlgorithm.cpp2
-rw-r--r--src/Volume/EncryptionAlgorithm.h2
-rw-r--r--src/Volume/EncryptionMode.cpp2
-rw-r--r--src/Volume/EncryptionMode.h2
-rw-r--r--src/Volume/EncryptionModeCBC.cpp2
-rw-r--r--src/Volume/EncryptionModeCBC.h2
-rw-r--r--src/Volume/EncryptionModeLRW.cpp2
-rw-r--r--src/Volume/EncryptionModeLRW.h2
-rw-r--r--src/Volume/EncryptionModeXTS.cpp2
-rw-r--r--src/Volume/EncryptionModeXTS.h2
-rw-r--r--src/Volume/EncryptionTest.cpp2
-rw-r--r--src/Volume/EncryptionTest.h2
-rw-r--r--src/Volume/EncryptionThreadPool.cpp2
-rw-r--r--src/Volume/EncryptionThreadPool.h2
-rw-r--r--src/Volume/Hash.cpp2
-rw-r--r--src/Volume/Hash.h2
-rw-r--r--src/Volume/Keyfile.cpp2
-rw-r--r--src/Volume/Keyfile.h2
-rw-r--r--src/Volume/Pkcs5Kdf.cpp2
-rw-r--r--src/Volume/Pkcs5Kdf.h2
-rw-r--r--src/Volume/Version.h2
-rw-r--r--src/Volume/Volume.cpp2
-rw-r--r--src/Volume/Volume.h2
-rw-r--r--src/Volume/VolumeException.cpp2
-rw-r--r--src/Volume/VolumeException.h2
-rw-r--r--src/Volume/VolumeHeader.cpp2
-rw-r--r--src/Volume/VolumeHeader.h2
-rw-r--r--src/Volume/VolumeInfo.cpp2
-rw-r--r--src/Volume/VolumeInfo.h2
-rw-r--r--src/Volume/VolumeLayout.cpp2
-rw-r--r--src/Volume/VolumeLayout.h2
-rw-r--r--src/Volume/VolumePassword.cpp2
-rw-r--r--src/Volume/VolumePassword.h2
-rw-r--r--src/Volume/VolumePasswordCache.cpp2
-rw-r--r--src/Volume/VolumePasswordCache.h2
-rw-r--r--src/Volume/VolumeSlot.h2
239 files changed, 246 insertions, 246 deletions
diff --git a/src/Common/BaseCom.cpp b/src/Common/BaseCom.cpp
index 409a653d..5771daaa 100644
--- a/src/Common/BaseCom.cpp
+++ b/src/Common/BaseCom.cpp
@@ -15,7 +15,7 @@
#include "Dlgcode.h"
#include "Registry.h"
-using namespace TrueCrypt;
+using namespace VeraCrypt;
HRESULT CreateElevatedComObject (HWND hwnd, REFGUID guid, REFIID iid, void **ppv)
{
diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp
index 3f90ad0a..29df5569 100644
--- a/src/Common/BootEncryption.cpp
+++ b/src/Common/BootEncryption.cpp
@@ -32,7 +32,7 @@
#include "Mount/MainCom.h"
#endif
-namespace TrueCrypt
+namespace VeraCrypt
{
#if !defined (SETUP)
diff --git a/src/Common/BootEncryption.h b/src/Common/BootEncryption.h
index febbdf5b..16e42e11 100644
--- a/src/Common/BootEncryption.h
+++ b/src/Common/BootEncryption.h
@@ -17,7 +17,7 @@
using namespace std;
-namespace TrueCrypt
+namespace VeraCrypt
{
class File
{
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index cadab148..ad8b4890 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -61,7 +61,7 @@
#include "Setup/Setup.h"
#endif
-using namespace TrueCrypt;
+using namespace VeraCrypt;
LONG DriverVersion;
diff --git a/src/Common/Exception.h b/src/Common/Exception.h
index c9985d04..5bf9395f 100644
--- a/src/Common/Exception.h
+++ b/src/Common/Exception.h
@@ -12,7 +12,7 @@
#include "Platform/PlatformBase.h"
#include "Dlgcode.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct Exception
{
diff --git a/src/Common/Keyfiles.c b/src/Common/Keyfiles.c
index d5ce556a..e7e55ca5 100644
--- a/src/Common/Keyfiles.c
+++ b/src/Common/Keyfiles.c
@@ -23,7 +23,7 @@
#include "Platform/Finally.h"
#include "Platform/ForEach.h"
-using namespace TrueCrypt;
+using namespace VeraCrypt;
#define stat _stat
#define S_IFDIR _S_IFDIR
diff --git a/src/Common/SecurityToken.cpp b/src/Common/SecurityToken.cpp
index 3a961fe5..061d96fe 100644
--- a/src/Common/SecurityToken.cpp
+++ b/src/Common/SecurityToken.cpp
@@ -30,7 +30,7 @@
using namespace std;
-namespace TrueCrypt
+namespace VeraCrypt
{
SecurityTokenKeyfile::SecurityTokenKeyfile (const SecurityTokenKeyfilePath &path)
{
diff --git a/src/Common/SecurityToken.h b/src/Common/SecurityToken.h
index 5620aa05..c83ed328 100644
--- a/src/Common/SecurityToken.h
+++ b/src/Common/SecurityToken.h
@@ -49,7 +49,7 @@
#define TC_SECURITY_TOKEN_KEYFILE_URL_SLOT L"slot"
#define TC_SECURITY_TOKEN_KEYFILE_URL_FILE L"file"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct SecurityTokenInfo
{
diff --git a/src/Core/Core.h b/src/Core/Core.h
index 37bbb986..5f218775 100644
--- a/src/Core/Core.h
+++ b/src/Core/Core.h
@@ -11,7 +11,7 @@
#include "CoreBase.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
extern auto_ptr <CoreBase> Core;
extern auto_ptr <CoreBase> CoreDirect;
diff --git a/src/Core/CoreBase.cpp b/src/Core/CoreBase.cpp
index b615b7ff..038640ca 100644
--- a/src/Core/CoreBase.cpp
+++ b/src/Core/CoreBase.cpp
@@ -12,7 +12,7 @@
#include "RandomNumberGenerator.h"
#include "Volume/Volume.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
CoreBase::CoreBase ()
: DeviceChangeInProgress (false)
diff --git a/src/Core/CoreBase.h b/src/Core/CoreBase.h
index d99420ab..90a52dbe 100644
--- a/src/Core/CoreBase.h
+++ b/src/Core/CoreBase.h
@@ -21,7 +21,7 @@
#include "HostDevice.h"
#include "MountOptions.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class CoreBase
{
diff --git a/src/Core/CoreException.cpp b/src/Core/CoreException.cpp
index da939a8d..328e88bc 100644
--- a/src/Core/CoreException.cpp
+++ b/src/Core/CoreException.cpp
@@ -9,7 +9,7 @@
#include "CoreException.h"
#include "Platform/SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void ElevationFailed::Deserialize (shared_ptr <Stream> stream)
{
diff --git a/src/Core/CoreException.h b/src/Core/CoreException.h
index 40ffbcea..e04bc4a6 100644
--- a/src/Core/CoreException.h
+++ b/src/Core/CoreException.h
@@ -11,7 +11,7 @@
#include "Platform/Platform.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct ElevationFailed : public ExecutedProcessFailed
{
diff --git a/src/Core/FatFormatter.cpp b/src/Core/FatFormatter.cpp
index ba69df61..8e17b166 100644
--- a/src/Core/FatFormatter.cpp
+++ b/src/Core/FatFormatter.cpp
@@ -15,7 +15,7 @@
#include "FatFormatter.h"
#include "RandomNumberGenerator.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct fatparams
{
diff --git a/src/Core/FatFormatter.h b/src/Core/FatFormatter.h
index 47702190..726e3c55 100644
--- a/src/Core/FatFormatter.h
+++ b/src/Core/FatFormatter.h
@@ -11,7 +11,7 @@
#include "Platform/Platform.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class FatFormatter
{
diff --git a/src/Core/HostDevice.cpp b/src/Core/HostDevice.cpp
index 0147d568..60fbcd31 100644
--- a/src/Core/HostDevice.cpp
+++ b/src/Core/HostDevice.cpp
@@ -9,7 +9,7 @@
#include "HostDevice.h"
#include "Platform/SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void HostDevice::Deserialize (shared_ptr <Stream> stream)
{
diff --git a/src/Core/HostDevice.h b/src/Core/HostDevice.h
index 227dc241..5cde6ec0 100644
--- a/src/Core/HostDevice.h
+++ b/src/Core/HostDevice.h
@@ -12,7 +12,7 @@
#include "Platform/Platform.h"
#include "Platform/Serializable.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct HostDevice;
typedef list < shared_ptr <HostDevice> > HostDeviceList;
diff --git a/src/Core/MountOptions.cpp b/src/Core/MountOptions.cpp
index 04187311..a09879d8 100644
--- a/src/Core/MountOptions.cpp
+++ b/src/Core/MountOptions.cpp
@@ -10,7 +10,7 @@
#include "Platform/MemoryStream.h"
#include "Platform/SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void MountOptions::CopyFrom (const MountOptions &other)
{
diff --git a/src/Core/MountOptions.h b/src/Core/MountOptions.h
index 23fc7ca2..12aa03d5 100644
--- a/src/Core/MountOptions.h
+++ b/src/Core/MountOptions.h
@@ -15,7 +15,7 @@
#include "Volume/VolumeSlot.h"
#include "Volume/VolumePassword.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct MountOptions : public Serializable
{
diff --git a/src/Core/RandomNumberGenerator.cpp b/src/Core/RandomNumberGenerator.cpp
index a010e7c6..ab3aad6b 100644
--- a/src/Core/RandomNumberGenerator.cpp
+++ b/src/Core/RandomNumberGenerator.cpp
@@ -15,7 +15,7 @@
#include "RandomNumberGenerator.h"
#include "Volume/Crc32.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void RandomNumberGenerator::AddSystemDataToPool (bool fast)
{
diff --git a/src/Core/RandomNumberGenerator.h b/src/Core/RandomNumberGenerator.h
index fb3a6917..2c7587c9 100644
--- a/src/Core/RandomNumberGenerator.h
+++ b/src/Core/RandomNumberGenerator.h
@@ -13,7 +13,7 @@
#include "Volume/Hash.h"
#include "Common/Random.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class RandomNumberGenerator
{
diff --git a/src/Core/Unix/CoreService.cpp b/src/Core/Unix/CoreService.cpp
index 9d2fd2a4..53592c0a 100644
--- a/src/Core/Unix/CoreService.cpp
+++ b/src/Core/Unix/CoreService.cpp
@@ -20,7 +20,7 @@
#include "CoreServiceRequest.h"
#include "CoreServiceResponse.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
template <class T>
auto_ptr <T> CoreService::GetResponse ()
diff --git a/src/Core/Unix/CoreService.h b/src/Core/Unix/CoreService.h
index 9702dc7e..f752fc94 100644
--- a/src/Core/Unix/CoreService.h
+++ b/src/Core/Unix/CoreService.h
@@ -14,7 +14,7 @@
#include "Platform/Unix/Pipe.h"
#include "Core/Core.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
// This service facilitates process forking and elevation of user privileges
class CoreService
diff --git a/src/Core/Unix/CoreServiceProxy.h b/src/Core/Unix/CoreServiceProxy.h
index 2a264617..3a65bc00 100644
--- a/src/Core/Unix/CoreServiceProxy.h
+++ b/src/Core/Unix/CoreServiceProxy.h
@@ -12,7 +12,7 @@
#include "CoreService.h"
#include "Volume/VolumePasswordCache.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
template <class T>
class CoreServiceProxy : public T
diff --git a/src/Core/Unix/CoreServiceRequest.cpp b/src/Core/Unix/CoreServiceRequest.cpp
index 49ee8418..15711055 100644
--- a/src/Core/Unix/CoreServiceRequest.cpp
+++ b/src/Core/Unix/CoreServiceRequest.cpp
@@ -10,7 +10,7 @@
#include "CoreServiceRequest.h"
#include "Platform/SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void CoreServiceRequest::Deserialize (shared_ptr <Stream> stream)
{
diff --git a/src/Core/Unix/CoreServiceRequest.h b/src/Core/Unix/CoreServiceRequest.h
index 030ac81b..583d1058 100644
--- a/src/Core/Unix/CoreServiceRequest.h
+++ b/src/Core/Unix/CoreServiceRequest.h
@@ -12,7 +12,7 @@
#include "Platform/Serializable.h"
#include "Core/Core.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct CoreServiceRequest : public Serializable
{
diff --git a/src/Core/Unix/CoreServiceResponse.cpp b/src/Core/Unix/CoreServiceResponse.cpp
index 7809b448..3f69c4bd 100644
--- a/src/Core/Unix/CoreServiceResponse.cpp
+++ b/src/Core/Unix/CoreServiceResponse.cpp
@@ -9,7 +9,7 @@
#include "CoreServiceResponse.h"
#include "Platform/SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
// CheckFilesystemResponse
void CheckFilesystemResponse::Deserialize (shared_ptr <Stream> stream)
diff --git a/src/Core/Unix/CoreServiceResponse.h b/src/Core/Unix/CoreServiceResponse.h
index 24c09b35..458b309f 100644
--- a/src/Core/Unix/CoreServiceResponse.h
+++ b/src/Core/Unix/CoreServiceResponse.h
@@ -12,7 +12,7 @@
#include "Platform/Serializable.h"
#include "Core/Core.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct CoreServiceResponse : public Serializable
{
diff --git a/src/Core/Unix/CoreUnix.cpp b/src/Core/Unix/CoreUnix.cpp
index 975c8401..15a96297 100644
--- a/src/Core/Unix/CoreUnix.cpp
+++ b/src/Core/Unix/CoreUnix.cpp
@@ -18,7 +18,7 @@
#include "Driver/Fuse/FuseService.h"
#include "Volume/VolumePasswordCache.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
CoreUnix::CoreUnix ()
{
diff --git a/src/Core/Unix/CoreUnix.h b/src/Core/Unix/CoreUnix.h
index b8e4cc54..08bf3395 100644
--- a/src/Core/Unix/CoreUnix.h
+++ b/src/Core/Unix/CoreUnix.h
@@ -14,7 +14,7 @@
#include "Core/CoreBase.h"
#include "Core/Unix/MountedFilesystem.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class CoreUnix : public CoreBase
{
diff --git a/src/Core/Unix/FreeBSD/CoreFreeBSD.cpp b/src/Core/Unix/FreeBSD/CoreFreeBSD.cpp
index e0a4dd5f..a160415b 100644
--- a/src/Core/Unix/FreeBSD/CoreFreeBSD.cpp
+++ b/src/Core/Unix/FreeBSD/CoreFreeBSD.cpp
@@ -16,7 +16,7 @@
#include "CoreFreeBSD.h"
#include "Core/Unix/CoreServiceProxy.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
CoreFreeBSD::CoreFreeBSD ()
{
diff --git a/src/Core/Unix/FreeBSD/CoreFreeBSD.h b/src/Core/Unix/FreeBSD/CoreFreeBSD.h
index a8230334..4c1eaa77 100644
--- a/src/Core/Unix/FreeBSD/CoreFreeBSD.h
+++ b/src/Core/Unix/FreeBSD/CoreFreeBSD.h
@@ -12,7 +12,7 @@
#include "System.h"
#include "Core/Unix/CoreUnix.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class CoreFreeBSD : public CoreUnix
{
diff --git a/src/Core/Unix/Linux/CoreLinux.cpp b/src/Core/Unix/Linux/CoreLinux.cpp
index 777ccb77..4170cdfe 100644
--- a/src/Core/Unix/Linux/CoreLinux.cpp
+++ b/src/Core/Unix/Linux/CoreLinux.cpp
@@ -22,7 +22,7 @@
#include "Driver/Fuse/FuseService.h"
#include "Core/Unix/CoreServiceProxy.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
CoreLinux::CoreLinux ()
{
diff --git a/src/Core/Unix/Linux/CoreLinux.h b/src/Core/Unix/Linux/CoreLinux.h
index 5758d651..54c40d5b 100644
--- a/src/Core/Unix/Linux/CoreLinux.h
+++ b/src/Core/Unix/Linux/CoreLinux.h
@@ -12,7 +12,7 @@
#include "System.h"
#include "Core/Unix/CoreUnix.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class CoreLinux : public CoreUnix
{
diff --git a/src/Core/Unix/MacOSX/CoreMacOSX.cpp b/src/Core/Unix/MacOSX/CoreMacOSX.cpp
index b7aa08c7..4f2baea6 100644
--- a/src/Core/Unix/MacOSX/CoreMacOSX.cpp
+++ b/src/Core/Unix/MacOSX/CoreMacOSX.cpp
@@ -19,7 +19,7 @@
#include "Driver/Fuse/FuseService.h"
#include "Core/Unix/CoreServiceProxy.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
CoreMacOSX::CoreMacOSX ()
{
diff --git a/src/Core/Unix/MacOSX/CoreMacOSX.h b/src/Core/Unix/MacOSX/CoreMacOSX.h
index 37ebd1d6..179c458e 100644
--- a/src/Core/Unix/MacOSX/CoreMacOSX.h
+++ b/src/Core/Unix/MacOSX/CoreMacOSX.h
@@ -12,7 +12,7 @@
#include "System.h"
#include "Core/Unix/FreeBSD/CoreFreeBSD.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class CoreMacOSX : public CoreFreeBSD
{
diff --git a/src/Core/Unix/MountedFilesystem.h b/src/Core/Unix/MountedFilesystem.h
index 6e704d3c..c6c10ae9 100644
--- a/src/Core/Unix/MountedFilesystem.h
+++ b/src/Core/Unix/MountedFilesystem.h
@@ -11,7 +11,7 @@
#include "Platform/Platform.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct MountedFilesystem
{
diff --git a/src/Core/Unix/Solaris/CoreSolaris.cpp b/src/Core/Unix/Solaris/CoreSolaris.cpp
index 63736db3..25fb537d 100644
--- a/src/Core/Unix/Solaris/CoreSolaris.cpp
+++ b/src/Core/Unix/Solaris/CoreSolaris.cpp
@@ -15,7 +15,7 @@
#include "CoreSolaris.h"
#include "Core/Unix/CoreServiceProxy.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
CoreSolaris::CoreSolaris ()
{
diff --git a/src/Core/Unix/Solaris/CoreSolaris.h b/src/Core/Unix/Solaris/CoreSolaris.h
index 76dd1945..1e6cd1f3 100644
--- a/src/Core/Unix/Solaris/CoreSolaris.h
+++ b/src/Core/Unix/Solaris/CoreSolaris.h
@@ -12,7 +12,7 @@
#include "System.h"
#include "Core/Unix/CoreUnix.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class CoreSolaris : public CoreUnix
{
diff --git a/src/Core/VolumeCreator.cpp b/src/Core/VolumeCreator.cpp
index 6011efd0..e9c764a0 100644
--- a/src/Core/VolumeCreator.cpp
+++ b/src/Core/VolumeCreator.cpp
@@ -19,7 +19,7 @@
#include "VolumeCreator.h"
#include "FatFormatter.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumeCreator::VolumeCreator ()
: SizeDone (0)
diff --git a/src/Core/VolumeCreator.h b/src/Core/VolumeCreator.h
index 4e8cf61e..74641d58 100644
--- a/src/Core/VolumeCreator.h
+++ b/src/Core/VolumeCreator.h
@@ -13,7 +13,7 @@
#include "Volume/Volume.h"
#include "RandomNumberGenerator.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct VolumeCreationOptions
diff --git a/src/Driver/Fuse/FuseService.cpp b/src/Driver/Fuse/FuseService.cpp
index fda56e0f..5ac724a3 100644
--- a/src/Driver/Fuse/FuseService.cpp
+++ b/src/Driver/Fuse/FuseService.cpp
@@ -30,7 +30,7 @@
#include "Volume/EncryptionThreadPool.h"
#include "Core/Core.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
static int fuse_service_access (const char *path, int mask)
{
diff --git a/src/Driver/Fuse/FuseService.h b/src/Driver/Fuse/FuseService.h
index e81567ea..5e343658 100644
--- a/src/Driver/Fuse/FuseService.h
+++ b/src/Driver/Fuse/FuseService.h
@@ -15,7 +15,7 @@
#include "Volume/VolumeInfo.h"
#include "Volume/Volume.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class FuseService
diff --git a/src/Format/FormatCom.cpp b/src/Format/FormatCom.cpp
index 9ab57c86..df0fc1e9 100644
--- a/src/Format/FormatCom.cpp
+++ b/src/Format/FormatCom.cpp
@@ -20,7 +20,7 @@
#include "FormatCom_h.h"
#include "FormatCom_i.c"
-using namespace TrueCrypt;
+using namespace VeraCrypt;
static volatile LONG ObjectCount = 0;
diff --git a/src/Format/InPlace.c b/src/Format/InPlace.c
index 2382605e..c3d09fb3 100644
--- a/src/Format/InPlace.c
+++ b/src/Format/InPlace.c
@@ -35,7 +35,7 @@ IMPORTANT: Due to this issue, functions in this file must not directly interact
#include "InPlace.h"
using namespace std;
-using namespace TrueCrypt;
+using namespace VeraCrypt;
#define TC_MAX_NONSYS_INPLACE_ENC_WORK_CHUNK_SIZE (2048 * BYTES_PER_KB)
#define TC_INITIAL_NTFS_CONCEAL_PORTION_SIZE (2 * TC_MAX_VOLUME_SECTOR_SIZE)
diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c
index c48b207e..5d830d0d 100644
--- a/src/Format/Tcformat.c
+++ b/src/Format/Tcformat.c
@@ -48,7 +48,7 @@
#include "Wipe.h"
#include "Xml.h"
-using namespace TrueCrypt;
+using namespace VeraCrypt;
enum wizard_pages
{
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 <FavoriteVolume> > 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> 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)
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 <Functor> 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 <KeyfileList> 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 <KeyfileList> 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 ChoiceType>
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 <VolumePassword> password, shared_ptr <KeyfileList> 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 <VolumePassword> password, shared_ptr <KeyfileList> 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 <Hotkey> > 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 <ApplicationServices/ApplicationServices.h>
#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 <XmlNode> XmlNodeList;
diff --git a/src/Mount/Favorites.cpp b/src/Mount/Favorites.cpp
index d608d5ad..06c1aa32 100644
--- a/src/Mount/Favorites.cpp
+++ b/src/Mount/Favorites.cpp
@@ -19,7 +19,7 @@
using namespace std;
-namespace TrueCrypt
+namespace VeraCrypt
{
vector <FavoriteVolume> FavoriteVolumes;
vector <FavoriteVolume> SystemFavoriteVolumes;
diff --git a/src/Mount/Favorites.h b/src/Mount/Favorites.h
index 31179fb7..248a4f08 100644
--- a/src/Mount/Favorites.h
+++ b/src/Mount/Favorites.h
@@ -11,7 +11,7 @@
#include <Tcdefs.h>
-namespace TrueCrypt
+namespace VeraCrypt
{
struct FavoriteVolume
{
diff --git a/src/Mount/MainCom.cpp b/src/Mount/MainCom.cpp
index ca3b5ef6..ed1fd68d 100644
--- a/src/Mount/MainCom.cpp
+++ b/src/Mount/MainCom.cpp
@@ -18,7 +18,7 @@
#include "Mount.h"
#include "Password.h"
-using namespace TrueCrypt;
+using namespace VeraCrypt;
static volatile LONG ObjectCount = 0;
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 74072fd1..370c5f57 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -46,7 +46,7 @@
#include "../Platform/Finally.h"
#include "../Platform/ForEach.h"
-using namespace TrueCrypt;
+using namespace VeraCrypt;
enum timer_ids
{
diff --git a/src/Mount/Mount.h b/src/Mount/Mount.h
index 4f80479e..140b3e99 100644
--- a/src/Mount/Mount.h
+++ b/src/Mount/Mount.h
@@ -109,7 +109,7 @@ static BOOL HandleDriveListMouseWheelEvent (UINT uMsg, WPARAM wParam, LPARAM lPa
}
void SetDriverConfigurationFlag (uint32 flag, BOOL state);
-BOOL MountFavoriteVolumes (BOOL systemFavorites = FALSE, BOOL logOnMount = FALSE, BOOL hotKeyMount = FALSE, const TrueCrypt::FavoriteVolume &favoriteVolumeToMount = TrueCrypt::FavoriteVolume());
+BOOL MountFavoriteVolumes (BOOL systemFavorites = FALSE, BOOL logOnMount = FALSE, BOOL hotKeyMount = FALSE, const VeraCrypt::FavoriteVolume &favoriteVolumeToMount = VeraCrypt::FavoriteVolume());
BOOL GetExecutableImageInformation (const string &path, string &version, string &description, string &companyName, string &productName);
#endif
diff --git a/src/Platform/Buffer.cpp b/src/Platform/Buffer.cpp
index 17dbb7ac..292f4595 100644
--- a/src/Platform/Buffer.cpp
+++ b/src/Platform/Buffer.cpp
@@ -9,7 +9,7 @@
#include "Buffer.h"
#include "Exception.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
Buffer::Buffer () : DataPtr (nullptr), DataSize (0)
{
diff --git a/src/Platform/Buffer.h b/src/Platform/Buffer.h
index d4972015..24478a66 100644
--- a/src/Platform/Buffer.h
+++ b/src/Platform/Buffer.h
@@ -12,7 +12,7 @@
#include "PlatformBase.h"
#include "Memory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class ConstBufferPtr
diff --git a/src/Platform/Directory.h b/src/Platform/Directory.h
index b2eb8027..fc2938a0 100644
--- a/src/Platform/Directory.h
+++ b/src/Platform/Directory.h
@@ -12,7 +12,7 @@
#include "PlatformBase.h"
#include "FilesystemPath.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Directory
{
diff --git a/src/Platform/Event.cpp b/src/Platform/Event.cpp
index 662ca478..b2ea3585 100644
--- a/src/Platform/Event.cpp
+++ b/src/Platform/Event.cpp
@@ -8,7 +8,7 @@
#include "Event.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void Event::Connect (const EventConnectorBase &connector)
{
diff --git a/src/Platform/Event.h b/src/Platform/Event.h
index de85a4bc..fcc16ef5 100644
--- a/src/Platform/Event.h
+++ b/src/Platform/Event.h
@@ -14,7 +14,7 @@
#include "Mutex.h"
#include "SharedPtr.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct EventArgs
{
diff --git a/src/Platform/Exception.cpp b/src/Platform/Exception.cpp
index 13b09ac9..7d323111 100644
--- a/src/Platform/Exception.cpp
+++ b/src/Platform/Exception.cpp
@@ -9,7 +9,7 @@
#include "Exception.h"
#include "SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void Exception::Deserialize (shared_ptr <Stream> stream)
{
diff --git a/src/Platform/Exception.h b/src/Platform/Exception.h
index 8e52b454..19d6523e 100644
--- a/src/Platform/Exception.h
+++ b/src/Platform/Exception.h
@@ -13,7 +13,7 @@
#include "PlatformBase.h"
#include "Serializable.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
#define TC_SERIALIZABLE_EXCEPTION(TYPE) TC_SERIALIZABLE (TYPE); \
virtual Exception *CloneNew () { return new TYPE (*this); } \
diff --git a/src/Platform/File.h b/src/Platform/File.h
index ef9a5c87..6fba968c 100644
--- a/src/Platform/File.h
+++ b/src/Platform/File.h
@@ -14,7 +14,7 @@
#include "FilesystemPath.h"
#include "SystemException.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class File
{
diff --git a/src/Platform/FileCommon.cpp b/src/Platform/FileCommon.cpp
index d76e5c19..e63e55c7 100644
--- a/src/Platform/FileCommon.cpp
+++ b/src/Platform/FileCommon.cpp
@@ -14,7 +14,7 @@
#include <utime.h>
#endif
-namespace TrueCrypt
+namespace VeraCrypt
{
File::~File ()
{
diff --git a/src/Platform/FileStream.h b/src/Platform/FileStream.h
index 1fe6b2ff..7770dd77 100644
--- a/src/Platform/FileStream.h
+++ b/src/Platform/FileStream.h
@@ -14,7 +14,7 @@
#include "SharedPtr.h"
#include "Stream.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class FileStream : public Stream
{
diff --git a/src/Platform/FilesystemPath.h b/src/Platform/FilesystemPath.h
index 2c85d2ce..24ed5dd3 100644
--- a/src/Platform/FilesystemPath.h
+++ b/src/Platform/FilesystemPath.h
@@ -14,7 +14,7 @@
#include "SharedPtr.h"
#include "StringConverter.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct FilesystemPathType
{
diff --git a/src/Platform/ForEach.h b/src/Platform/ForEach.h
index 786ff56b..209d277e 100644
--- a/src/Platform/ForEach.h
+++ b/src/Platform/ForEach.h
@@ -9,7 +9,7 @@
#ifndef TC_HEADER_Platform_ForEach
#define TC_HEADER_Platform_ForEach
-namespace TrueCrypt
+namespace VeraCrypt
{
class ForEach
{
diff --git a/src/Platform/Functor.h b/src/Platform/Functor.h
index 6840b3a1..65d8d74c 100644
--- a/src/Platform/Functor.h
+++ b/src/Platform/Functor.h
@@ -11,7 +11,7 @@
#include "PlatformBase.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct Functor
{
diff --git a/src/Platform/Memory.cpp b/src/Platform/Memory.cpp
index 3a032467..c75c18cd 100644
--- a/src/Platform/Memory.cpp
+++ b/src/Platform/Memory.cpp
@@ -10,7 +10,7 @@
#include "Memory.h"
#include "Exception.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void *Memory::Allocate (std::size_t size)
{
diff --git a/src/Platform/Memory.h b/src/Platform/Memory.h
index 3a17ba7b..053a138d 100644
--- a/src/Platform/Memory.h
+++ b/src/Platform/Memory.h
@@ -63,7 +63,7 @@
# error Unsupported byte ordering detected.
#endif
-namespace TrueCrypt
+namespace VeraCrypt
{
class Memory
{
diff --git a/src/Platform/MemoryStream.cpp b/src/Platform/MemoryStream.cpp
index 42d38427..0aba4ab5 100644
--- a/src/Platform/MemoryStream.cpp
+++ b/src/Platform/MemoryStream.cpp
@@ -9,7 +9,7 @@
#include "Exception.h"
#include "MemoryStream.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
MemoryStream::MemoryStream (const ConstBufferPtr &data) :
ReadPosition (0)
diff --git a/src/Platform/MemoryStream.h b/src/Platform/MemoryStream.h
index 30e26400..61b8acfb 100644
--- a/src/Platform/MemoryStream.h
+++ b/src/Platform/MemoryStream.h
@@ -12,7 +12,7 @@
#include "PlatformBase.h"
#include "Stream.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class MemoryStream : public Stream
{
diff --git a/src/Platform/Mutex.h b/src/Platform/Mutex.h
index bdeef260..c2bf146e 100644
--- a/src/Platform/Mutex.h
+++ b/src/Platform/Mutex.h
@@ -16,7 +16,7 @@
#endif
#include "PlatformBase.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Mutex
{
diff --git a/src/Platform/PlatformBase.h b/src/Platform/PlatformBase.h
index c63f975e..ea1271f7 100644
--- a/src/Platform/PlatformBase.h
+++ b/src/Platform/PlatformBase.h
@@ -31,7 +31,7 @@ using namespace std;
#define nullptr 0
#endif
-namespace TrueCrypt
+namespace VeraCrypt
{
#ifdef _MSC_VER
# ifndef TC_INT_TYPES_DEFINED
diff --git a/src/Platform/PlatformTest.cpp b/src/Platform/PlatformTest.cpp
index 83febe4f..a541c143 100644
--- a/src/Platform/PlatformTest.cpp
+++ b/src/Platform/PlatformTest.cpp
@@ -20,7 +20,7 @@
#include "Thread.h"
#include "Common/Tcdefs.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
// make_shared_auto, File, Stream, MemoryStream, Endian, Serializer, Serializable
void PlatformTest::SerializerTest ()
diff --git a/src/Platform/PlatformTest.h b/src/Platform/PlatformTest.h
index 9ca842e5..01b56e07 100644
--- a/src/Platform/PlatformTest.h
+++ b/src/Platform/PlatformTest.h
@@ -12,7 +12,7 @@
#include "PlatformBase.h"
#include "Thread.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class PlatformTest
{
diff --git a/src/Platform/Serializable.cpp b/src/Platform/Serializable.cpp
index 8e3ef582..7a19b811 100644
--- a/src/Platform/Serializable.cpp
+++ b/src/Platform/Serializable.cpp
@@ -9,7 +9,7 @@
#include "Serializable.h"
#include "SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
string Serializable::DeserializeHeader (shared_ptr <Stream> stream)
{
diff --git a/src/Platform/Serializable.h b/src/Platform/Serializable.h
index 50787547..06d7a761 100644
--- a/src/Platform/Serializable.h
+++ b/src/Platform/Serializable.h
@@ -15,7 +15,7 @@
#include "Serializer.h"
#include "SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Serializable
{
diff --git a/src/Platform/Serializer.cpp b/src/Platform/Serializer.cpp
index cd41b3c1..96c04ca3 100644
--- a/src/Platform/Serializer.cpp
+++ b/src/Platform/Serializer.cpp
@@ -11,7 +11,7 @@
#include "Memory.h"
#include "Serializer.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
template <typename T>
T Serializer::Deserialize ()
diff --git a/src/Platform/Serializer.h b/src/Platform/Serializer.h
index 71521341..3ede04ec 100644
--- a/src/Platform/Serializer.h
+++ b/src/Platform/Serializer.h
@@ -14,7 +14,7 @@
#include "SharedPtr.h"
#include "Stream.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Serializer
{
diff --git a/src/Platform/SerializerFactory.cpp b/src/Platform/SerializerFactory.cpp
index 1aae92d5..3174c389 100644
--- a/src/Platform/SerializerFactory.cpp
+++ b/src/Platform/SerializerFactory.cpp
@@ -9,7 +9,7 @@
#include <stdexcept>
#include "SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void SerializerFactory::Deinitialize ()
{
diff --git a/src/Platform/SerializerFactory.h b/src/Platform/SerializerFactory.h
index bad68d34..a04565b4 100644
--- a/src/Platform/SerializerFactory.h
+++ b/src/Platform/SerializerFactory.h
@@ -13,7 +13,7 @@
#include "PlatformBase.h"
#include "StringConverter.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Serializable;
diff --git a/src/Platform/SharedPtr.h b/src/Platform/SharedPtr.h
index 3221265d..64e2909a 100644
--- a/src/Platform/SharedPtr.h
+++ b/src/Platform/SharedPtr.h
@@ -14,7 +14,7 @@
#ifdef nullptr
-namespace TrueCrypt
+namespace VeraCrypt
{
template <class T>
class SharedPtr
@@ -135,7 +135,7 @@ namespace TrueCrypt
#ifdef shared_ptr
#undef shared_ptr
#endif
-#define shared_ptr TrueCrypt::SharedPtr
+#define shared_ptr VeraCrypt::SharedPtr
#ifdef make_shared
#undef make_shared
@@ -151,7 +151,7 @@ namespace TrueCrypt
return shared_ptr <T> (new T (arg));
}
-#define make_shared TrueCrypt::make_shared
+#define make_shared VeraCrypt::make_shared
}
diff --git a/src/Platform/SharedVal.h b/src/Platform/SharedVal.h
index 64298f0d..89b2a3e6 100644
--- a/src/Platform/SharedVal.h
+++ b/src/Platform/SharedVal.h
@@ -12,7 +12,7 @@
#include "PlatformBase.h"
#include "Mutex.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
template <class T>
class SharedVal
diff --git a/src/Platform/Stream.h b/src/Platform/Stream.h
index 338d0f51..f2d46d93 100644
--- a/src/Platform/Stream.h
+++ b/src/Platform/Stream.h
@@ -12,7 +12,7 @@
#include "PlatformBase.h"
#include "Buffer.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Stream
{
diff --git a/src/Platform/StringConverter.cpp b/src/Platform/StringConverter.cpp
index 164a218e..cbd89e1f 100644
--- a/src/Platform/StringConverter.cpp
+++ b/src/Platform/StringConverter.cpp
@@ -17,7 +17,7 @@
#include "StringConverter.h"
#include "SystemException.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void StringConverter::Erase (string &str)
{
diff --git a/src/Platform/StringConverter.h b/src/Platform/StringConverter.h
index 51047784..9a9e098f 100644
--- a/src/Platform/StringConverter.h
+++ b/src/Platform/StringConverter.h
@@ -12,7 +12,7 @@
#include <stdlib.h>
#include "PlatformBase.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class StringConverter
{
diff --git a/src/Platform/SyncEvent.h b/src/Platform/SyncEvent.h
index 30dcd419..e7a78909 100644
--- a/src/Platform/SyncEvent.h
+++ b/src/Platform/SyncEvent.h
@@ -17,7 +17,7 @@
#include "PlatformBase.h"
#include "Mutex.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class SyncEvent
{
diff --git a/src/Platform/SystemException.h b/src/Platform/SystemException.h
index 630703b1..4a1dc2d1 100644
--- a/src/Platform/SystemException.h
+++ b/src/Platform/SystemException.h
@@ -12,7 +12,7 @@
#include "PlatformBase.h"
#include "Exception.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class SystemException : public Exception
{
diff --git a/src/Platform/SystemInfo.h b/src/Platform/SystemInfo.h
index e70137a9..83f55fef 100644
--- a/src/Platform/SystemInfo.h
+++ b/src/Platform/SystemInfo.h
@@ -11,7 +11,7 @@
#include "PlatformBase.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class SystemInfo
{
diff --git a/src/Platform/SystemLog.h b/src/Platform/SystemLog.h
index 06d45367..3b729395 100644
--- a/src/Platform/SystemLog.h
+++ b/src/Platform/SystemLog.h
@@ -12,7 +12,7 @@
#include "Platform/PlatformBase.h"
#include "Platform/StringConverter.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class SystemLog
{
diff --git a/src/Platform/TextReader.cpp b/src/Platform/TextReader.cpp
index cc55db1b..2606d1d5 100644
--- a/src/Platform/TextReader.cpp
+++ b/src/Platform/TextReader.cpp
@@ -8,7 +8,7 @@
#include "TextReader.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
TextReader::TextReader (const FilePath &path)
{
diff --git a/src/Platform/TextReader.h b/src/Platform/TextReader.h
index a537907d..9aad217a 100644
--- a/src/Platform/TextReader.h
+++ b/src/Platform/TextReader.h
@@ -15,7 +15,7 @@
#include "SharedPtr.h"
#include "Stream.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class TextReader
{
diff --git a/src/Platform/Thread.h b/src/Platform/Thread.h
index 122d9344..5d570d64 100644
--- a/src/Platform/Thread.h
+++ b/src/Platform/Thread.h
@@ -21,7 +21,7 @@
#include "SharedPtr.h"
#include "SyncEvent.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Thread
{
diff --git a/src/Platform/Time.h b/src/Platform/Time.h
index 2a17f9ea..ca5d2540 100644
--- a/src/Platform/Time.h
+++ b/src/Platform/Time.h
@@ -11,7 +11,7 @@
#include "PlatformBase.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Time
{
diff --git a/src/Platform/Unix/Directory.cpp b/src/Platform/Unix/Directory.cpp
index 0a0088a2..163a8173 100644
--- a/src/Platform/Unix/Directory.cpp
+++ b/src/Platform/Unix/Directory.cpp
@@ -15,7 +15,7 @@
#include "Platform/Finally.h"
#include "Platform/SystemException.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
static Mutex ReadDirMutex; // readdir_r() may be unsafe on some systems
diff --git a/src/Platform/Unix/File.cpp b/src/Platform/Unix/File.cpp
index fd64eb2a..25475bb0 100644
--- a/src/Platform/Unix/File.cpp
+++ b/src/Platform/Unix/File.cpp
@@ -31,7 +31,7 @@
#include "Platform/File.h"
#include "Platform/TextReader.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
#if 0
# define TC_TRACE_FILE_OPERATIONS
diff --git a/src/Platform/Unix/FilesystemPath.cpp b/src/Platform/Unix/FilesystemPath.cpp
index ef52fe8a..66ae3dbb 100644
--- a/src/Platform/Unix/FilesystemPath.cpp
+++ b/src/Platform/Unix/FilesystemPath.cpp
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <sys/stat.h>
-namespace TrueCrypt
+namespace VeraCrypt
{
void FilesystemPath::Delete () const
{
diff --git a/src/Platform/Unix/Mutex.cpp b/src/Platform/Unix/Mutex.cpp
index aae5d78d..336dce3e 100644
--- a/src/Platform/Unix/Mutex.cpp
+++ b/src/Platform/Unix/Mutex.cpp
@@ -10,7 +10,7 @@
#include "Platform/Mutex.h"
#include "Platform/SystemException.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
Mutex::Mutex ()
{
diff --git a/src/Platform/Unix/Pipe.cpp b/src/Platform/Unix/Pipe.cpp
index d3465408..76d784b3 100644
--- a/src/Platform/Unix/Pipe.cpp
+++ b/src/Platform/Unix/Pipe.cpp
@@ -10,7 +10,7 @@
#include "Pipe.h"
#include "Platform/SystemException.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
Pipe::Pipe ()
{
diff --git a/src/Platform/Unix/Pipe.h b/src/Platform/Unix/Pipe.h
index 9aa5bf9e..198d3240 100644
--- a/src/Platform/Unix/Pipe.h
+++ b/src/Platform/Unix/Pipe.h
@@ -11,7 +11,7 @@
#include "Platform/PlatformBase.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Pipe
{
diff --git a/src/Platform/Unix/Poller.cpp b/src/Platform/Unix/Poller.cpp
index 3950eab0..3e823633 100644
--- a/src/Platform/Unix/Poller.cpp
+++ b/src/Platform/Unix/Poller.cpp
@@ -11,7 +11,7 @@
#include "Poller.h"
#include "Platform/SystemException.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
Poller::Poller (int fileDescriptor1, int fileDescriptor2, int fileDescriptor3, int fileDescriptor4)
{
diff --git a/src/Platform/Unix/Poller.h b/src/Platform/Unix/Poller.h
index 131e469f..445e9280 100644
--- a/src/Platform/Unix/Poller.h
+++ b/src/Platform/Unix/Poller.h
@@ -11,7 +11,7 @@
#include "Platform/PlatformBase.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Poller
{
diff --git a/src/Platform/Unix/Process.cpp b/src/Platform/Unix/Process.cpp
index d99dff87..c82461ea 100644
--- a/src/Platform/Unix/Process.cpp
+++ b/src/Platform/Unix/Process.cpp
@@ -21,7 +21,7 @@
#include "Platform/Unix/Pipe.h"
#include "Platform/Unix/Poller.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
string Process::Execute (const string &processName, const list <string> &arguments, int timeOut, ProcessExecFunctor *execFunctor, const Buffer *inputData)
{
diff --git a/src/Platform/Unix/Process.h b/src/Platform/Unix/Process.h
index dd878ddd..77d4d4e0 100644
--- a/src/Platform/Unix/Process.h
+++ b/src/Platform/Unix/Process.h
@@ -13,7 +13,7 @@
#include "Platform/Buffer.h"
#include "Platform/Functor.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct ProcessExecFunctor
{
diff --git a/src/Platform/Unix/SyncEvent.cpp b/src/Platform/Unix/SyncEvent.cpp
index fbf8300f..d58240e8 100644
--- a/src/Platform/Unix/SyncEvent.cpp
+++ b/src/Platform/Unix/SyncEvent.cpp
@@ -10,7 +10,7 @@
#include "Platform/SyncEvent.h"
#include "Platform/SystemException.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
SyncEvent::SyncEvent ()
{
diff --git a/src/Platform/Unix/SystemException.cpp b/src/Platform/Unix/SystemException.cpp
index b29c9b50..7348914e 100644
--- a/src/Platform/Unix/SystemException.cpp
+++ b/src/Platform/Unix/SystemException.cpp
@@ -12,7 +12,7 @@
#include "Platform/SystemException.h"
#include "Platform/StringConverter.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
SystemException::SystemException ()
: ErrorCode (errno)
diff --git a/src/Platform/Unix/SystemInfo.cpp b/src/Platform/Unix/SystemInfo.cpp
index d0ea6e61..41f6144d 100644
--- a/src/Platform/Unix/SystemInfo.cpp
+++ b/src/Platform/Unix/SystemInfo.cpp
@@ -10,7 +10,7 @@
#include "Platform/SystemInfo.h"
#include <sys/utsname.h>
-namespace TrueCrypt
+namespace VeraCrypt
{
wstring SystemInfo::GetPlatformName ()
{
diff --git a/src/Platform/Unix/SystemLog.cpp b/src/Platform/Unix/SystemLog.cpp
index ee0e990d..e5988122 100644
--- a/src/Platform/Unix/SystemLog.cpp
+++ b/src/Platform/Unix/SystemLog.cpp
@@ -9,7 +9,7 @@
#include <syslog.h>
#include "Platform/SystemLog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void SystemLog::WriteDebug (const string &debugMessage)
{
diff --git a/src/Platform/Unix/Thread.cpp b/src/Platform/Unix/Thread.cpp
index 7afe6832..c2167432 100644
--- a/src/Platform/Unix/Thread.cpp
+++ b/src/Platform/Unix/Thread.cpp
@@ -12,7 +12,7 @@
#include "Platform/Thread.h"
#include "Platform/SystemLog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void Thread::Join () const
{
diff --git a/src/Platform/Unix/Time.cpp b/src/Platform/Unix/Time.cpp
index 01313d53..d4720c6c 100644
--- a/src/Platform/Unix/Time.cpp
+++ b/src/Platform/Unix/Time.cpp
@@ -10,7 +10,7 @@
#include <sys/time.h>
#include <time.h>
-namespace TrueCrypt
+namespace VeraCrypt
{
uint64 Time::GetCurrent ()
{
diff --git a/src/Platform/User.h b/src/Platform/User.h
index d3aa9766..8b983ccd 100644
--- a/src/Platform/User.h
+++ b/src/Platform/User.h
@@ -16,7 +16,7 @@
#include <sys/types.h>
#endif
-namespace TrueCrypt
+namespace VeraCrypt
{
struct UserId
{
diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c
index 84bf07a9..c0fffb77 100644
--- a/src/Setup/Setup.c
+++ b/src/Setup/Setup.c
@@ -34,7 +34,7 @@
#include "../Common/Resource.h"
-using namespace TrueCrypt;
+using namespace VeraCrypt;
#pragma warning( disable : 4201 )
#pragma warning( disable : 4115 )
diff --git a/src/Volume/Cipher.cpp b/src/Volume/Cipher.cpp
index fa37e298..a69f15d9 100644
--- a/src/Volume/Cipher.cpp
+++ b/src/Volume/Cipher.cpp
@@ -19,7 +19,7 @@
# include "Crypto/Aes_hw_cpu.h"
#endif
-namespace TrueCrypt
+namespace VeraCrypt
{
Cipher::Cipher () : Initialized (false)
{
diff --git a/src/Volume/Cipher.h b/src/Volume/Cipher.h
index 25fc82c9..90a9a215 100644
--- a/src/Volume/Cipher.h
+++ b/src/Volume/Cipher.h
@@ -12,7 +12,7 @@
#include "Platform/Platform.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Cipher;
typedef vector < shared_ptr <Cipher> > CipherList;
diff --git a/src/Volume/Crc32.h b/src/Volume/Crc32.h
index d4392275..951e7479 100644
--- a/src/Volume/Crc32.h
+++ b/src/Volume/Crc32.h
@@ -12,7 +12,7 @@
#include "Platform/Platform.h"
#include "Common/Crc.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Crc32
{
diff --git a/src/Volume/EncryptionAlgorithm.cpp b/src/Volume/EncryptionAlgorithm.cpp
index 5ca27bab..ce76e71f 100644
--- a/src/Volume/EncryptionAlgorithm.cpp
+++ b/src/Volume/EncryptionAlgorithm.cpp
@@ -11,7 +11,7 @@
#include "EncryptionModeLRW.h"
#include "EncryptionModeXTS.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
EncryptionAlgorithm::EncryptionAlgorithm () : Deprecated (false)
{
diff --git a/src/Volume/EncryptionAlgorithm.h b/src/Volume/EncryptionAlgorithm.h
index 8118de6b..7fbee6ae 100644
--- a/src/Volume/EncryptionAlgorithm.h
+++ b/src/Volume/EncryptionAlgorithm.h
@@ -13,7 +13,7 @@
#include "Cipher.h"
#include "EncryptionMode.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class EncryptionAlgorithm;
typedef list < shared_ptr <EncryptionAlgorithm> > EncryptionAlgorithmList;
diff --git a/src/Volume/EncryptionMode.cpp b/src/Volume/EncryptionMode.cpp
index eb68186c..0a7ac546 100644
--- a/src/Volume/EncryptionMode.cpp
+++ b/src/Volume/EncryptionMode.cpp
@@ -12,7 +12,7 @@
#include "EncryptionModeXTS.h"
#include "EncryptionThreadPool.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
EncryptionMode::EncryptionMode () : KeySet (false), SectorOffset (0)
{
diff --git a/src/Volume/EncryptionMode.h b/src/Volume/EncryptionMode.h
index e74fca55..af22d931 100644
--- a/src/Volume/EncryptionMode.h
+++ b/src/Volume/EncryptionMode.h
@@ -13,7 +13,7 @@
#include "Common/Crypto.h"
#include "Cipher.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class EncryptionMode;
typedef list < shared_ptr <EncryptionMode> > EncryptionModeList;
diff --git a/src/Volume/EncryptionModeCBC.cpp b/src/Volume/EncryptionModeCBC.cpp
index f299b888..2892986b 100644
--- a/src/Volume/EncryptionModeCBC.cpp
+++ b/src/Volume/EncryptionModeCBC.cpp
@@ -11,7 +11,7 @@
#include "Common/Endian.h"
#include "EncryptionModeCBC.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void EncryptionModeCBC::Decrypt (byte *data, uint64 length) const
{
diff --git a/src/Volume/EncryptionModeCBC.h b/src/Volume/EncryptionModeCBC.h
index 3e1094aa..187432ea 100644
--- a/src/Volume/EncryptionModeCBC.h
+++ b/src/Volume/EncryptionModeCBC.h
@@ -12,7 +12,7 @@
#include "Platform/Platform.h"
#include "EncryptionMode.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class EncryptionModeCBC : public EncryptionMode
{
diff --git a/src/Volume/EncryptionModeLRW.cpp b/src/Volume/EncryptionModeLRW.cpp
index 38731d5d..115b0fc5 100644
--- a/src/Volume/EncryptionModeLRW.cpp
+++ b/src/Volume/EncryptionModeLRW.cpp
@@ -9,7 +9,7 @@
#include "EncryptionModeLRW.h"
#include "Common/GfMul.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void EncryptionModeLRW::Decrypt (byte *data, uint64 length) const
{
diff --git a/src/Volume/EncryptionModeLRW.h b/src/Volume/EncryptionModeLRW.h
index 97a8528d..0cfcd50c 100644
--- a/src/Volume/EncryptionModeLRW.h
+++ b/src/Volume/EncryptionModeLRW.h
@@ -12,7 +12,7 @@
#include "Platform/Platform.h"
#include "EncryptionMode.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class EncryptionModeLRW : public EncryptionMode
{
diff --git a/src/Volume/EncryptionModeXTS.cpp b/src/Volume/EncryptionModeXTS.cpp
index 8073f3ca..a25faa0e 100644
--- a/src/Volume/EncryptionModeXTS.cpp
+++ b/src/Volume/EncryptionModeXTS.cpp
@@ -9,7 +9,7 @@
#include "EncryptionModeXTS.h"
#include "Common/Crypto.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void EncryptionModeXTS::Encrypt (byte *data, uint64 length) const
{
diff --git a/src/Volume/EncryptionModeXTS.h b/src/Volume/EncryptionModeXTS.h
index 927a34cb..606d0b95 100644
--- a/src/Volume/EncryptionModeXTS.h
+++ b/src/Volume/EncryptionModeXTS.h
@@ -12,7 +12,7 @@
#include "Platform/Platform.h"
#include "EncryptionMode.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class EncryptionModeXTS : public EncryptionMode
{
diff --git a/src/Volume/EncryptionTest.cpp b/src/Volume/EncryptionTest.cpp
index c07bbb20..71f55f07 100644
--- a/src/Volume/EncryptionTest.cpp
+++ b/src/Volume/EncryptionTest.cpp
@@ -17,7 +17,7 @@
#include "EncryptionTest.h"
#include "Pkcs5Kdf.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void EncryptionTest::TestAll ()
{
diff --git a/src/Volume/EncryptionTest.h b/src/Volume/EncryptionTest.h
index 40221ae0..9d7ab519 100644
--- a/src/Volume/EncryptionTest.h
+++ b/src/Volume/EncryptionTest.h
@@ -12,7 +12,7 @@
#include "Platform/Platform.h"
#include "Common/Crypto.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class EncryptionTest
{
diff --git a/src/Volume/EncryptionThreadPool.cpp b/src/Volume/EncryptionThreadPool.cpp
index dbcc1b35..6635df70 100644
--- a/src/Volume/EncryptionThreadPool.cpp
+++ b/src/Volume/EncryptionThreadPool.cpp
@@ -20,7 +20,7 @@
#include "Common/Crypto.h"
#include "EncryptionThreadPool.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void EncryptionThreadPool::DoWork (WorkType::Enum type, const EncryptionMode *encryptionMode, byte *data, uint64 startUnitNo, uint64 unitCount, size_t sectorSize)
{
diff --git a/src/Volume/EncryptionThreadPool.h b/src/Volume/EncryptionThreadPool.h
index 70d87021..313b93d0 100644
--- a/src/Volume/EncryptionThreadPool.h
+++ b/src/Volume/EncryptionThreadPool.h
@@ -12,7 +12,7 @@
#include "Platform/Platform.h"
#include "EncryptionMode.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class EncryptionThreadPool
{
diff --git a/src/Volume/Hash.cpp b/src/Volume/Hash.cpp
index cca8cc6b..ddae669a 100644
--- a/src/Volume/Hash.cpp
+++ b/src/Volume/Hash.cpp
@@ -13,7 +13,7 @@
#include "Crypto/Sha2.h"
#include "Crypto/Whirlpool.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
HashList Hash::GetAvailableAlgorithms ()
{
diff --git a/src/Volume/Hash.h b/src/Volume/Hash.h
index 3a24602c..befdd631 100644
--- a/src/Volume/Hash.h
+++ b/src/Volume/Hash.h
@@ -11,7 +11,7 @@
#include "Platform/Platform.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Hash;
typedef list < shared_ptr <Hash> > HashList;
diff --git a/src/Volume/Keyfile.cpp b/src/Volume/Keyfile.cpp
index d132dbb8..e390ee88 100644
--- a/src/Volume/Keyfile.cpp
+++ b/src/Volume/Keyfile.cpp
@@ -12,7 +12,7 @@
#include "Keyfile.h"
#include "VolumeException.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void Keyfile::Apply (const BufferPtr &pool) const
{
diff --git a/src/Volume/Keyfile.h b/src/Volume/Keyfile.h
index 6d7a1a87..3a6c92e4 100644
--- a/src/Volume/Keyfile.h
+++ b/src/Volume/Keyfile.h
@@ -13,7 +13,7 @@
#include "Platform/Stream.h"
#include "VolumePassword.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Keyfile;
typedef list < shared_ptr <Keyfile> > KeyfileList;
diff --git a/src/Volume/Pkcs5Kdf.cpp b/src/Volume/Pkcs5Kdf.cpp
index 9c2fa65b..f3724b3a 100644
--- a/src/Volume/Pkcs5Kdf.cpp
+++ b/src/Volume/Pkcs5Kdf.cpp
@@ -10,7 +10,7 @@
#include "Pkcs5Kdf.h"
#include "VolumePassword.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
Pkcs5Kdf::Pkcs5Kdf ()
{
diff --git a/src/Volume/Pkcs5Kdf.h b/src/Volume/Pkcs5Kdf.h
index 283c8ce6..35e7dc15 100644
--- a/src/Volume/Pkcs5Kdf.h
+++ b/src/Volume/Pkcs5Kdf.h
@@ -13,7 +13,7 @@
#include "Hash.h"
#include "VolumePassword.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Pkcs5Kdf;
typedef list < shared_ptr <Pkcs5Kdf> > Pkcs5KdfList;
diff --git a/src/Volume/Version.h b/src/Volume/Version.h
index 62738142..5eed4575 100644
--- a/src/Volume/Version.h
+++ b/src/Volume/Version.h
@@ -12,7 +12,7 @@
#include "Platform/PlatformBase.h"
#include "Common/Tcdefs.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class Version
{
diff --git a/src/Volume/Volume.cpp b/src/Volume/Volume.cpp
index 93a38e28..aeec78e2 100644
--- a/src/Volume/Volume.cpp
+++ b/src/Volume/Volume.cpp
@@ -16,7 +16,7 @@
#include "VolumeLayout.h"
#include "Common/Crypto.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
Volume::Volume ()
: HiddenVolumeProtectionTriggered (false),
diff --git a/src/Volume/Volume.h b/src/Volume/Volume.h
index 8578bec1..dce2aa3b 100644
--- a/src/Volume/Volume.h
+++ b/src/Volume/Volume.h
@@ -18,7 +18,7 @@
#include "VolumeException.h"
#include "VolumeLayout.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumePath
{
diff --git a/src/Volume/VolumeException.cpp b/src/Volume/VolumeException.cpp
index 2c143dae..9a1f5a94 100644
--- a/src/Volume/VolumeException.cpp
+++ b/src/Volume/VolumeException.cpp
@@ -9,7 +9,7 @@
#include "VolumeException.h"
#include "Platform/SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
// Do not inline the constructors to ensure this module is not optimized away
VolumeException::VolumeException ()
diff --git a/src/Volume/VolumeException.h b/src/Volume/VolumeException.h
index 2f312b7f..026c86c5 100644
--- a/src/Volume/VolumeException.h
+++ b/src/Volume/VolumeException.h
@@ -11,7 +11,7 @@
#include "Platform/Platform.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct VolumeException : public Exception
{
diff --git a/src/Volume/VolumeHeader.cpp b/src/Volume/VolumeHeader.cpp
index 50746773..bee60af7 100644
--- a/src/Volume/VolumeHeader.cpp
+++ b/src/Volume/VolumeHeader.cpp
@@ -14,7 +14,7 @@
#include "VolumeException.h"
#include "Common/Crypto.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumeHeader::VolumeHeader (uint32 size)
{
diff --git a/src/Volume/VolumeHeader.h b/src/Volume/VolumeHeader.h
index c16fc560..8ce56fd8 100644
--- a/src/Volume/VolumeHeader.h
+++ b/src/Volume/VolumeHeader.h
@@ -22,7 +22,7 @@
// For specifications of the volume header see Common/Volumes.c
-namespace TrueCrypt
+namespace VeraCrypt
{
typedef uint64 VolumeTime;
diff --git a/src/Volume/VolumeInfo.cpp b/src/Volume/VolumeInfo.cpp
index fb6da7e2..49a2b3e9 100644
--- a/src/Volume/VolumeInfo.cpp
+++ b/src/Volume/VolumeInfo.cpp
@@ -10,7 +10,7 @@
#include "VolumeInfo.h"
#include "Platform/SerializerFactory.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
void VolumeInfo::Deserialize (shared_ptr <Stream> stream)
{
diff --git a/src/Volume/VolumeInfo.h b/src/Volume/VolumeInfo.h
index 6e5f5dd4..c58b13f5 100644
--- a/src/Volume/VolumeInfo.h
+++ b/src/Volume/VolumeInfo.h
@@ -14,7 +14,7 @@
#include "Volume/Volume.h"
#include "Volume/VolumeSlot.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumeInfo;
typedef list < shared_ptr <VolumeInfo> > VolumeInfoList;
diff --git a/src/Volume/VolumeLayout.cpp b/src/Volume/VolumeLayout.cpp
index 00696e92..aeade493 100644
--- a/src/Volume/VolumeLayout.cpp
+++ b/src/Volume/VolumeLayout.cpp
@@ -13,7 +13,7 @@
#include "VolumeLayout.h"
#include "Boot/Windows/BootCommon.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumeLayout::VolumeLayout ()
{
diff --git a/src/Volume/VolumeLayout.h b/src/Volume/VolumeLayout.h
index d2147425..57d278cc 100644
--- a/src/Volume/VolumeLayout.h
+++ b/src/Volume/VolumeLayout.h
@@ -15,7 +15,7 @@
#include "Volume/Pkcs5Kdf.h"
#include "VolumeHeader.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumeLayout;
typedef list < shared_ptr <VolumeLayout> > VolumeLayoutList;
diff --git a/src/Volume/VolumePassword.cpp b/src/Volume/VolumePassword.cpp
index 86b17e22..e314f52b 100644
--- a/src/Volume/VolumePassword.cpp
+++ b/src/Volume/VolumePassword.cpp
@@ -10,7 +10,7 @@
#include "Platform/SerializerFactory.h"
#include "Platform/StringConverter.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumePassword::VolumePassword () : PasswordSize (0), Unportable (false)
{
diff --git a/src/Volume/VolumePassword.h b/src/Volume/VolumePassword.h
index e43c50ec..ce9f3c0a 100644
--- a/src/Volume/VolumePassword.h
+++ b/src/Volume/VolumePassword.h
@@ -12,7 +12,7 @@
#include "Platform/Platform.h"
#include "Platform/Serializable.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumePassword : public Serializable
{
diff --git a/src/Volume/VolumePasswordCache.cpp b/src/Volume/VolumePasswordCache.cpp
index 23472d2d..296f066c 100644
--- a/src/Volume/VolumePasswordCache.cpp
+++ b/src/Volume/VolumePasswordCache.cpp
@@ -8,7 +8,7 @@
#include "VolumePasswordCache.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
CachedPasswordList VolumePasswordCache::GetPasswords ()
{
diff --git a/src/Volume/VolumePasswordCache.h b/src/Volume/VolumePasswordCache.h
index 6d5118af..711f6f21 100644
--- a/src/Volume/VolumePasswordCache.h
+++ b/src/Volume/VolumePasswordCache.h
@@ -12,7 +12,7 @@
#include "Platform/Platform.h"
#include "VolumePassword.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
typedef list < shared_ptr < VolumePassword > > CachedPasswordList;
diff --git a/src/Volume/VolumeSlot.h b/src/Volume/VolumeSlot.h
index fe368772..f4f55b6a 100644
--- a/src/Volume/VolumeSlot.h
+++ b/src/Volume/VolumeSlot.h
@@ -11,7 +11,7 @@
#include "Platform/Platform.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
typedef uint32 VolumeSlotNumber;
}