9.06 beta

1 files changed, 19 insertions, 30 deletions

diff --git a/CPP/7zip/UI/Far/Plugin.h b/CPP/7zip/UI/Far/Plugin.h
index 06003ba5..ab534e21 100755
--- a/CPP/7zip/UI/Far/Plugin.h
+++ b/CPP/7zip/UI/Far/Plugin.h
@@ -33,10 +33,8 @@ class CPlugin
   PanelMode PanelMode;
   void AddColumn(PROPID aPropID);
 
-
-  void EnterToDirectory(const UString &aDirName);
-
-  void GetPathParts(UStringVector &aPathParts);
+  void EnterToDirectory(const UString &dirName);
+  void GetPathParts(UStringVector &pathParts);
   void GetCurrentDir();
 public:
   UString m_FileName;
@@ -45,55 +43,46 @@ public:
   CMyComPtr<IInFolderArchive> m_ArchiveHandler;
   CMyComPtr<IFolderFolder> _folder;
   
-  // CArchiverInfo m_ArchiverInfo;
   UString _archiveTypeName;
 
   bool PasswordIsDefined;
   UString Password;
 
-
-  CPlugin(const UString &fileName,
-        // const UString &aDefaultName,
-        IInFolderArchive *archiveHandler,
-        UString archiveTypeName
-        );
+  CPlugin(const UString &fileName, IInFolderArchive *archiveHandler, UString archiveTypeName);
   ~CPlugin();
 
-  void ReadValueSafe(PROPID aPropID, NWindows::NCOM::CPropVariant aPropVariant);
-  void ReadPluginPanelItem(PluginPanelItem &aPanelItem, UINT32 anItemIndex);
-
-  int GetFindData(PluginPanelItem **pPanelItem,int *pItemsNumber,int OpMode);
-  void FreeFindData(PluginPanelItem *PanelItem,int ItemsNumber);
-  int SetDirectory(const char *aDir, int opMode);
-  void GetOpenPluginInfo(struct OpenPluginInfo *anInfo);
-
-  int DeleteFiles(PluginPanelItem *aPanelItems, int itemsNumber, int opMode);
+  void ReadPluginPanelItem(PluginPanelItem &panelItem, UInt32 itemIndex);
 
+  int GetFindData(PluginPanelItem **panelItems,int *itemsNumber,int opMode);
+  void FreeFindData(PluginPanelItem *panelItem,int ItemsNumber);
+  int SetDirectory(const char *aszDir, int opMode);
+  void GetOpenPluginInfo(struct OpenPluginInfo *info);
+  int DeleteFiles(PluginPanelItem *panelItems, int itemsNumber, int opMode);
 
   HRESULT ExtractFiles(
       bool decompressAllItems,
-      const UINT32 *indices,
-      UINT32 numIndices,
+      const UInt32 *indices,
+      UInt32 numIndices,
       bool silent,
       NExtract::NPathMode::EEnum pathMode,
       NExtract::NOverwriteMode::EEnum overwriteMode,
       const UString &destPath,
       bool passwordIsDefined, const UString &password);
 
-  NFar::NFileOperationReturnCode::EEnum GetFiles(struct PluginPanelItem *aPanelItem, int itemsNumber,
-    int move, char *destPath, int opMode);
+  NFar::NFileOperationReturnCode::EEnum GetFiles(struct PluginPanelItem *panelItem, int itemsNumber,
+      int move, char *destPath, int opMode);
   
-  NFar::NFileOperationReturnCode::EEnum GetFilesReal(struct PluginPanelItem *aPanelItems,
-    int itemsNumber, int move, const char *_aDestPath, int opMode, bool aShowBox);
+  NFar::NFileOperationReturnCode::EEnum GetFilesReal(struct PluginPanelItem *panelItems,
+      int itemsNumber, int move, const char *_aDestPath, int opMode, bool showBox);
 
-  NFar::NFileOperationReturnCode::EEnum PutFiles(struct PluginPanelItem *aPanelItems, int itemsNumber,
-    int move, int opMode);
+  NFar::NFileOperationReturnCode::EEnum PutFiles(struct PluginPanelItem *panelItems, int itemsNumber,
+      int move, int opMode);
 
   HRESULT ShowAttributesWindow();
 
-  int ProcessKey(int aKey, unsigned int aControlState);
+  int ProcessKey(int key, unsigned int controlState);
 };
 
-HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &aPluginPanelItems);
+HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &pluginPanelItems);
 
 #endif