diff options
Diffstat (limited to 'CPP/Common/StdOutStream.h')
-rw-r--r-- | CPP/Common/StdOutStream.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/CPP/Common/StdOutStream.h b/CPP/Common/StdOutStream.h index bd15d7c..846b0db 100644 --- a/CPP/Common/StdOutStream.h +++ b/CPP/Common/StdOutStream.h | |||
@@ -14,6 +14,7 @@ class CStdOutStream | |||
14 | // bool _streamIsOpen; | 14 | // bool _streamIsOpen; |
15 | public: | 15 | public: |
16 | bool IsTerminalMode; | 16 | bool IsTerminalMode; |
17 | CBoolPair ListPathSeparatorSlash; | ||
17 | int CodePage; | 18 | int CodePage; |
18 | 19 | ||
19 | CStdOutStream(FILE *stream = NULL): | 20 | CStdOutStream(FILE *stream = NULL): |
@@ -21,7 +22,14 @@ public: | |||
21 | // _streamIsOpen(false), | 22 | // _streamIsOpen(false), |
22 | IsTerminalMode(false), | 23 | IsTerminalMode(false), |
23 | CodePage(-1) | 24 | CodePage(-1) |
24 | {} | 25 | { |
26 | ListPathSeparatorSlash.Val = | ||
27 | #ifdef _WIN32 | ||
28 | false; | ||
29 | #else | ||
30 | true; | ||
31 | #endif | ||
32 | } | ||
25 | 33 | ||
26 | // ~CStdOutStream() { Close(); } | 34 | // ~CStdOutStream() { Close(); } |
27 | 35 | ||
@@ -62,12 +70,13 @@ public: | |||
62 | void PrintUString(const UString &s, AString &temp); | 70 | void PrintUString(const UString &s, AString &temp); |
63 | void Convert_UString_to_AString(const UString &src, AString &dest); | 71 | void Convert_UString_to_AString(const UString &src, AString &dest); |
64 | 72 | ||
65 | void Normalize_UString_LF_Allowed(UString &s); | ||
66 | void Normalize_UString(UString &s); | 73 | void Normalize_UString(UString &s); |
74 | void Normalize_UString_Path(UString &s); | ||
67 | 75 | ||
68 | void NormalizePrint_UString(const UString &s, UString &tempU, AString &tempA); | 76 | void NormalizePrint_UString_Path(const UString &s, UString &tempU, AString &tempA); |
77 | void NormalizePrint_UString_Path(const UString &s); | ||
69 | void NormalizePrint_UString(const UString &s); | 78 | void NormalizePrint_UString(const UString &s); |
70 | void NormalizePrint_wstr(const wchar_t *s); | 79 | void NormalizePrint_wstr_Path(const wchar_t *s); |
71 | }; | 80 | }; |
72 | 81 | ||
73 | CStdOutStream & endl(CStdOutStream & outStream) throw(); | 82 | CStdOutStream & endl(CStdOutStream & outStream) throw(); |