1 files changed, 7 insertions, 9 deletions
diff --git a/7zip/FileManager/SysIconUtils.h b/7zip/FileManager/SysIconUtils.h
index cf8f79e5..51294751 100755
--- a/7zip/FileManager/SysIconUtils.h
+++ b/7zip/FileManager/SysIconUtils.h
@@ -7,9 +7,9 @@
 
 struct CExtIconPair
 {
-  CSysString Ext;
+  UString Ext;
   int IconIndex;
-  CSysString TypeName;
+  UString TypeName;
 
 };
 
@@ -26,9 +26,9 @@ inline bool operator<(const CExtIconPair &a1, const CExtIconPair &a2)
 class CExtToIconMap
 {
   int _dirIconIndex;
-  CSysString _dirTypeName;
+  UString _dirTypeName;
   int _noExtIconIndex;
-  CSysString _noExtTypeName;
+  UString _noExtTypeName;
   CObjectVector<CExtIconPair> _map;
 public:
   CExtToIconMap(): _dirIconIndex(-1), _noExtIconIndex(-1) {}
@@ -38,16 +38,14 @@ public:
     _noExtIconIndex = -1;
     _map.Clear();
   }
-  int GetIconIndex(UINT32 attributes, const CSysString &fileName, 
-      CSysString &typeName);
-  int GetIconIndex(UINT32 attributes, const CSysString &fileName);
+  int GetIconIndex(UINT32 attributes, const UString &fileName, UString &typeName);
+  int GetIconIndex(UINT32 attributes, const UString &fileName);
 };
 
 DWORD_PTR GetRealIconIndex(LPCTSTR path, UINT32 attributes, int &iconIndex);
 #ifndef _UNICODE
-// DWORD_PTR GetRealIconIndex(LPCWSTR path, UINT32 attributes, int &iconIndex);
+DWORD_PTR GetRealIconIndex(LPCWSTR path, UINT32 attributes, int &iconIndex);
 #endif
-DWORD_PTR GetRealIconIndex(const CSysString &fileName, UINT32 attributes, int &iconIndex, CSysString &typeName);
 int GetIconIndexForCSIDL(int aCSIDL);
 
 #endif