1 files changed, 8 insertions, 11 deletions

diff --git a/CPP/7zip/UI/FileManager/RootFolder.h b/CPP/7zip/UI/FileManager/RootFolder.h
index e253783..3f0a31b 100644
--- a/CPP/7zip/UI/FileManager/RootFolder.h
+++ b/CPP/7zip/UI/FileManager/RootFolder.h
@@ -1,26 +1,23 @@
 // RootFolder.h
 
-#ifndef __ROOT_FOLDER_H
-#define __ROOT_FOLDER_H
+#ifndef ZIP7_INC_ROOT_FOLDER_H
+#define ZIP7_INC_ROOT_FOLDER_H
 
+#include "../../../Common/MyCom.h"
 #include "../../../Common/MyString.h"
 
 #include "IFolder.h"
 
 const unsigned kNumRootFolderItems_Max = 4;
 
-class CRootFolder:
-  public IFolderFolder,
-  public IFolderGetSystemIconIndex,
-  public CMyUnknownImp
-{
+Z7_CLASS_IMP_NOQIB_2(
+  CRootFolder
+  , IFolderFolder
+  , IFolderGetSystemIconIndex
+)
   UString _names[kNumRootFolderItems_Max];
   int _iconIndices[kNumRootFolderItems_Max];
-
 public:
-  MY_UNKNOWN_IMP1(IFolderGetSystemIconIndex)
-  INTERFACE_FolderFolder(;)
-  STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex);
   void Init();
 };