summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/backupstore/BackupStoreFilenameClear.cpp10
-rw-r--r--lib/backupstore/BackupStoreFilenameClear.h6
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/backupstore/BackupStoreFilenameClear.cpp b/lib/backupstore/BackupStoreFilenameClear.cpp
index bf23fea8..ad5666cf 100644
--- a/lib/backupstore/BackupStoreFilenameClear.cpp
+++ b/lib/backupstore/BackupStoreFilenameClear.cpp
@@ -17,9 +17,13 @@
#include "MemLeakFindOn.h"
-int BackupStoreFilenameClear::sEncodeMethod = BackupStoreFilename::Encoding_Clear;
-CipherContext BackupStoreFilenameClear::sBlowfishEncrypt;
-CipherContext BackupStoreFilenameClear::sBlowfishDecrypt;
+// Hide private variables from the rest of the world
+namespace
+{
+ int sEncodeMethod = BackupStoreFilename::Encoding_Clear;
+ CipherContext sBlowfishEncrypt;
+ CipherContext sBlowfishDecrypt;
+}
// --------------------------------------------------------------------------
//
diff --git a/lib/backupstore/BackupStoreFilenameClear.h b/lib/backupstore/BackupStoreFilenameClear.h
index 93217177..595d1158 100644
--- a/lib/backupstore/BackupStoreFilenameClear.h
+++ b/lib/backupstore/BackupStoreFilenameClear.h
@@ -11,7 +11,8 @@
#define BACKUPSTOREFILENAMECLEAR__H
#include "BackupStoreFilename.h"
-#include "CipherContext.h"
+
+class CipherContext;
// --------------------------------------------------------------------------
//
@@ -53,9 +54,6 @@ protected:
private:
mutable BackupStoreFilename_base mClearFilename;
- static CipherContext sBlowfishEncrypt;
- static CipherContext sBlowfishDecrypt;
- static int sEncodeMethod;
};
#endif // BACKUPSTOREFILENAMECLEAR__H