diff options
Diffstat (limited to 'CPP/7zip/UI/Console/HashCon.h')
-rw-r--r-- | CPP/7zip/UI/Console/HashCon.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/CPP/7zip/UI/Console/HashCon.h b/CPP/7zip/UI/Console/HashCon.h index f926d4d..ebccb6f 100644 --- a/CPP/7zip/UI/Console/HashCon.h +++ b/CPP/7zip/UI/Console/HashCon.h | |||
@@ -1,14 +1,19 @@ | |||
1 | // HashCon.h | 1 | // HashCon.h |
2 | 2 | ||
3 | #ifndef __HASH_CON_H | 3 | #ifndef ZIP7_INC_HASH_CON_H |
4 | #define __HASH_CON_H | 4 | #define ZIP7_INC_HASH_CON_H |
5 | 5 | ||
6 | #include "../Common/HashCalc.h" | 6 | #include "../Common/HashCalc.h" |
7 | 7 | ||
8 | #include "UpdateCallbackConsole.h" | 8 | #include "UpdateCallbackConsole.h" |
9 | 9 | ||
10 | class CHashCallbackConsole: public IHashCallbackUI, public CCallbackConsoleBase | 10 | class CHashCallbackConsole Z7_final: |
11 | public IHashCallbackUI, | ||
12 | public CCallbackConsoleBase | ||
11 | { | 13 | { |
14 | Z7_IFACE_IMP(IDirItemsCallback) | ||
15 | Z7_IFACE_IMP(IHashCallbackUI) | ||
16 | |||
12 | UString _fileName; | 17 | UString _fileName; |
13 | AString _s; | 18 | AString _s; |
14 | 19 | ||
@@ -33,9 +38,7 @@ class CHashCallbackConsole: public IHashCallbackUI, public CCallbackConsoleBase | |||
33 | 38 | ||
34 | public: | 39 | public: |
35 | bool PrintNameInPercents; | 40 | bool PrintNameInPercents; |
36 | |||
37 | bool PrintHeaders; | 41 | bool PrintHeaders; |
38 | |||
39 | // bool PrintSize; | 42 | // bool PrintSize; |
40 | // bool PrintNewLine; // set it too (false), if you need only hash for single file without LF char. | 43 | // bool PrintNewLine; // set it too (false), if you need only hash for single file without LF char. |
41 | AString PrintFields; | 44 | AString PrintFields; |
@@ -48,10 +51,6 @@ public: | |||
48 | // , PrintSize(true), | 51 | // , PrintSize(true), |
49 | // , PrintNewLine(true) | 52 | // , PrintNewLine(true) |
50 | {} | 53 | {} |
51 | |||
52 | virtual ~CHashCallbackConsole() {} | ||
53 | |||
54 | INTERFACE_IHashCallbackUI(;) | ||
55 | }; | 54 | }; |
56 | 55 | ||
57 | void PrintHashStat(CStdOutStream &so, const CHashBundle &hb); | 56 | void PrintHashStat(CStdOutStream &so, const CHashBundle &hb); |