VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/UserPreferences.cpp
diff options
context:
space:
mode:
authorDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-05-10 20:16:32 (GMT)
committerDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-05-10 20:18:34 (GMT)
commit11716ed2dacbb104f8f59867fe66f2c0a6984291 (patch)
tree28aa448de2e790d0f40dc57799a55a9df12ee6fb /src/Main/UserPreferences.cpp
parent191075155835172e5596e191cf0679ff9022f0fd (diff)
downloadVeraCrypt-11716ed2dacbb104f8f59867fe66f2c0a6984291.zip
VeraCrypt-11716ed2dacbb104f8f59867fe66f2c0a6984291.tar.gz
Remove trailing whitespace
Diffstat (limited to 'src/Main/UserPreferences.cpp')
-rw-r--r--src/Main/UserPreferences.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Main/UserPreferences.cpp b/src/Main/UserPreferences.cpp
index 9e48b92..fafd082 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 <Pkcs5Kdf> 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 <Keyfile> ((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())