9.04 beta

1 files changed, 8 insertions, 17 deletions

diff --git a/CPP/7zip/UI/FileManager/NetFolder.h b/CPP/7zip/UI/FileManager/NetFolder.h
index 92471ec6..9962845c 100755
--- a/CPP/7zip/UI/FileManager/NetFolder.h
+++ b/CPP/7zip/UI/FileManager/NetFolder.h
@@ -1,12 +1,10 @@
 // NetFolder.h
 
-#ifndef __NETFOLDER_H
-#define __NETFOLDER_H
+#ifndef __NET_FOLDER_H
+#define __NET_FOLDER_H
 
-#include "Common/MyString.h"
-#include "Common/Buffer.h"
 #include "Common/MyCom.h"
-#include "Windows/PropVariant.h"
+
 #include "Windows/Net.h"
 
 #include "IFolder.h"
@@ -21,16 +19,6 @@ class CNetFolder:
   public IFolderGetSystemIconIndex,
   public CMyUnknownImp
 {
-public:
-  MY_UNKNOWN_IMP1(
-    IFolderGetSystemIconIndex
-  )
-
-  INTERFACE_FolderFolder(;)
-
-  STDMETHOD(GetSystemIconIndex)(UInt32 index, INT32 *iconIndex);
-
-private:
   NWindows::NNet::CResourceW _netResource;
   NWindows::NNet::CResourceW *_netResourcePointer;
 
@@ -38,12 +26,15 @@ private:
 
   CMyComPtr<IFolderFolder> _parentFolder;
   UString _path;
-  
 public:
+  MY_UNKNOWN_IMP1(IFolderGetSystemIconIndex)
+  INTERFACE_FolderFolder(;)
+  STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex);
+
+  CNetFolder(): _netResourcePointer(0) {}
   void Init(const UString &path);
   void Init(const NWindows::NNet::CResourceW *netResource,
       IFolderFolder *parentFolder, const UString &path);
-  CNetFolder(): _netResourcePointer(0) {}
 };
 
 #endif