9.04 beta

1 files changed, 9 insertions, 16 deletions

diff --git a/CPP/7zip/UI/FileManager/RootFolder.h b/CPP/7zip/UI/FileManager/RootFolder.h
index f17a0783..9f08e601 100755
--- a/CPP/7zip/UI/FileManager/RootFolder.h
+++ b/CPP/7zip/UI/FileManager/RootFolder.h
@@ -1,34 +1,27 @@
 // RootFolder.h
 
-#ifndef __ROOTFOLDER_H
-#define __ROOTFOLDER_H
+#ifndef __ROOT_FOLDER_H
+#define __ROOT_FOLDER_H
 
 #include "Common/MyString.h"
 
-#include "Windows/PropVariant.h"
+#include "IFolder.h"
 
-#include "FSFolder.h"
-
-const int kNumRootFolderItems = 3;
+const int kNumRootFolderItems = 4;
 
 class CRootFolder:
   public IFolderFolder,
   public IFolderGetSystemIconIndex,
   public CMyUnknownImp
 {
-public:
-  MY_UNKNOWN_IMP1(
-    IFolderGetSystemIconIndex
-  )
+  UString _names[kNumRootFolderItems];
+  int _iconIndices[kNumRootFolderItems];
 
+public:
+  MY_UNKNOWN_IMP1(IFolderGetSystemIconIndex)
   INTERFACE_FolderFolder(;)
-
-  STDMETHOD(GetSystemIconIndex)(UInt32 index, INT32 *iconIndex);
-
+  STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex);
   void Init();
-private:
-  UString _names[kNumRootFolderItems];
-  int _iconIndices[kNumRootFolderItems];
 };
 
 #endif