diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2014-11-23 03:00:00 +0300 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:16:51 +0300 |
commit | f08f4dcc3c02464c17753b3feafcfe5243b9e236 (patch) | |
tree | b0e1b15bc5368d92dff422e8ec0818564a2b00b8 /CPP/7zip/UI/FileManager/SysIconUtils.h | |
parent | 83f8ddcc5b2161e1e3c49666265257fca8aeb12c (diff) |
9.349.34
Diffstat (limited to 'CPP/7zip/UI/FileManager/SysIconUtils.h')
-rw-r--r--[-rwxr-xr-x] | CPP/7zip/UI/FileManager/SysIconUtils.h | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/CPP/7zip/UI/FileManager/SysIconUtils.h b/CPP/7zip/UI/FileManager/SysIconUtils.h index 129de781..20199acb 100755..100644 --- a/CPP/7zip/UI/FileManager/SysIconUtils.h +++ b/CPP/7zip/UI/FileManager/SysIconUtils.h @@ -3,40 +3,44 @@ #ifndef __SYS_ICON_UTILS_H #define __SYS_ICON_UTILS_H -#include "Common/MyString.h" +#include "../../../Common/MyString.h" struct CExtIconPair { UString Ext; int IconIndex; - UString TypeName; + // UString TypeName; + + // int Compare(const CExtIconPair &a) const { return MyStringCompareNoCase(Ext, a.Ext); } }; struct CAttribIconPair { DWORD Attrib; int IconIndex; - UString TypeName; -}; + // UString TypeName; -inline bool operator==(const CExtIconPair &a1, const CExtIconPair &a2) { return a1.Ext == a2.Ext; } -inline bool operator< (const CExtIconPair &a1, const CExtIconPair &a2) { return a1.Ext < a2.Ext; } - -inline bool operator==(const CAttribIconPair &a1, const CAttribIconPair &a2) { return a1.Attrib == a2.Attrib; } -inline bool operator< (const CAttribIconPair &a1, const CAttribIconPair &a2) { return a1.Attrib < a2.Attrib; } + // int Compare(const CAttribIconPair &a) const { return Ext.Compare(a.Ext); } +}; class CExtToIconMap { - CObjectVector<CExtIconPair> _extMap; - CObjectVector<CAttribIconPair> _attribMap; public: + CRecordVector<CAttribIconPair> _attribMap; + CObjectVector<CExtIconPair> _extMap; + int SplitIconIndex; + int SplitIconIndex_Defined; + + CExtToIconMap(): SplitIconIndex_Defined(false) {} + void Clear() { + SplitIconIndex_Defined = false; _extMap.Clear(); _attribMap.Clear(); } - int GetIconIndex(DWORD attrib, const UString &fileName, UString &typeName); - int GetIconIndex(DWORD attrib, const UString &fileName); + int GetIconIndex(DWORD attrib, const wchar_t *fileName /* , UString *typeName */); + // int GetIconIndex(DWORD attrib, const UString &fileName); }; DWORD_PTR GetRealIconIndex(CFSTR path, DWORD attrib, int &iconIndex); |