From 11716ed2dacbb104f8f59867fe66f2c0a6984291 Mon Sep 17 00:00:00 2001 From: David Foerster Date: Tue, 10 May 2016 22:16:32 +0200 Subject: Remove trailing whitespace --- src/Main/UserPreferences.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/Main/UserPreferences.cpp') diff --git a/src/Main/UserPreferences.cpp b/src/Main/UserPreferences.cpp index 9e48b928..fafd0824 100644 --- a/src/Main/UserPreferences.cpp +++ b/src/Main/UserPreferences.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source @@ -32,7 +32,7 @@ namespace VeraCrypt else cfgVar = StringConverter::ToUInt32 (wstring (cfgText)); } - + void UserPreferences::SetValue (const wxString &cfgText, uint64 &cfgVar) { if (cfgText.empty()) @@ -108,12 +108,12 @@ namespace VeraCrypt TC_CONFIG_SET (UseKeyfiles); TC_CONFIG_SET (WipeCacheOnAutoDismount); TC_CONFIG_SET (WipeCacheOnClose); - + SetValue (configMap[L"DefaultTrueCryptMode"], DefaultMountOptions.TrueCryptMode); - + wstring defaultPrf; SetValue (configMap[L"DefaultPRF"], defaultPrf); - + shared_ptr savedKdf; try { @@ -123,9 +123,9 @@ namespace VeraCrypt catch (ParameterIncorrect&) { } - + DefaultMountOptions.Kdf = savedKdf; - DefaultMountOptions.ProtectionKdf = savedKdf; + DefaultMountOptions.ProtectionKdf = savedKdf; } // Default keyfiles @@ -137,7 +137,7 @@ namespace VeraCrypt DefaultKeyfiles.push_back (make_shared ((wstring) node.InnerText)); } } - + #ifdef TC_WINDOWS // Hotkeys Hotkeys = Hotkey::LoadList(); @@ -222,12 +222,12 @@ namespace VeraCrypt TC_CONFIG_ADD (UseKeyfiles); TC_CONFIG_ADD (WipeCacheOnAutoDismount); TC_CONFIG_ADD (WipeCacheOnClose); - - formatter.AddEntry (L"DefaultTrueCryptMode", DefaultMountOptions.TrueCryptMode); - + + formatter.AddEntry (L"DefaultTrueCryptMode", DefaultMountOptions.TrueCryptMode); + wstring defaultPrf = L"autodetection"; if (DefaultMountOptions.Kdf) - defaultPrf = DefaultMountOptions.Kdf->GetName (); + defaultPrf = DefaultMountOptions.Kdf->GetName (); formatter.AddEntry (L"DefaultPRF", defaultPrf); XmlWriter writer (Application::GetConfigFilePath (GetPreferencesFileName(), true)); @@ -236,7 +236,7 @@ namespace VeraCrypt // Default keyfiles FilePath keyfilesCfgPath = Application::GetConfigFilePath (GetDefaultKeyfilesFileName(), true); - + if (DefaultKeyfiles.empty()) { if (keyfilesCfgPath.IsFile()) -- cgit v1.2.3