23.01

CPP/7zip/UI/FileManager/FSDrives.h

@@ -1,7 +1,7 @@
 // FSDrives.h
 
-#ifndef __FS_DRIVES_H
-#define __FS_DRIVES_H
+#ifndef ZIP7_INC_FS_DRIVES_H
+#define ZIP7_INC_FS_DRIVES_H
 
 #include "../../../Common/MyCom.h"
 #include "../../../Common/MyString.h"
@@ -28,12 +28,12 @@ struct CDriveInfo
   CDriveInfo(): KnownSize(false), KnownSizes(false), IsPhysicalDrive(false) {}
 };
 
-class CFSDrives:
-  public IFolderFolder,
-  public IFolderOperations,
-  public IFolderGetSystemIconIndex,
-  public CMyUnknownImp
-{
+Z7_CLASS_IMP_NOQIB_3(
+  CFSDrives
+  , IFolderFolder
+  , IFolderOperations
+  , IFolderGetSystemIconIndex
+)
   CObjectVector<CDriveInfo> _drives;
   bool _volumeMode;
   bool _superMode;
@@ -42,13 +42,6 @@ class CFSDrives:
   void AddExt(FString &s, unsigned index) const;
   HRESULT GetFileSize(unsigned index, UInt64 &fileSize) const;
 public:
-  MY_UNKNOWN_IMP2(IFolderGetSystemIconIndex, IFolderOperations)
-
-  INTERFACE_FolderFolder(;)
-  INTERFACE_FolderOperations(;)
-
-  STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex);
-
   void Init(bool volMode = false, bool superMode = false)
   {
     _volumeMode = volMode;