9.179.17

9 files changed, 13 insertions, 14 deletions

diff --git a/CPP/7zip/UI/FileManager/AppState.h b/CPP/7zip/UI/FileManager/AppState.h
index 4f8b7bbe..374cf04f 100755
--- a/CPP/7zip/UI/FileManager/AppState.h
+++ b/CPP/7zip/UI/FileManager/AppState.h
@@ -111,5 +111,4 @@ struct CAppState
   }
 };
 
-
-#endif
\ No newline at end of file
+#endif
diff --git a/CPP/7zip/UI/FileManager/FM.cpp b/CPP/7zip/UI/FileManager/FM.cpp
index 639a9b23..f3b48704 100755
--- a/CPP/7zip/UI/FileManager/FM.cpp
+++ b/CPP/7zip/UI/FileManager/FM.cpp
@@ -384,7 +384,7 @@ static const int kNumSwitches = 1;
 namespace NKey {
 enum Enum
 {
-  kOpenArachive = 0,
+  kOpenArachive = 0
 };
 
 }
diff --git a/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp b/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp
index 25aec359..08f15c18 100755
--- a/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp
+++ b/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp
@@ -163,4 +163,4 @@ HRESULT OpenFileFolderPlugin(
       return t.Result;
   }
   return S_FALSE;
-}
\ No newline at end of file
+}
diff --git a/CPP/7zip/UI/FileManager/Panel.cpp b/CPP/7zip/UI/FileManager/Panel.cpp
index 34f77861..27aa7a54 100755
--- a/CPP/7zip/UI/FileManager/Panel.cpp
+++ b/CPP/7zip/UI/FileManager/Panel.cpp
@@ -920,7 +920,7 @@ HRESULT CThreadTest::ProcessVirt()
     OkMessage = s;
   }
   return S_OK;
-};
+}
 
 /*
 static void AddSizePair(UINT resourceID, UInt32 langID, UInt64 value, UString &s)
diff --git a/CPP/7zip/UI/FileManager/PanelItemOpen.cpp b/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
index 8dcc60d5..29c99bfd 100755
--- a/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
+++ b/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
@@ -440,7 +440,7 @@ HRESULT CThreadCopyFrom::ProcessVirt()
   fileNames.Add(Name);
   fileNamePointers.Add(fileNames[0]);
   return FolderOperations->CopyFrom(PathPrefix, &fileNamePointers.Front(), fileNamePointers.Size(), UpdateCallback);
-};
+}
       
 HRESULT CPanel::OnOpenItemChanged(const UString &folderPath, const UString &itemName,
     bool usePassword, const UString &password)
diff --git a/CPP/7zip/UI/FileManager/PanelItems.cpp b/CPP/7zip/UI/FileManager/PanelItems.cpp
index 05b540b6..90d61b86 100755
--- a/CPP/7zip/UI/FileManager/PanelItems.cpp
+++ b/CPP/7zip/UI/FileManager/PanelItems.cpp
@@ -166,7 +166,7 @@ void CPanel::InsertColumn(int index)
   column.fmt = GetColumnAlign(prop.ID, prop.Type);
   column.iOrder = prop.Order;
   column.iSubItem = index;
-  column.pszText = (wchar_t *)(const wchar_t *)prop.Name;
+  column.pszText = const_cast<wchar_t *>((const wchar_t *)prop.Name);
   _listView.InsertColumn(index, &column);
 }
 
@@ -337,7 +337,7 @@ HRESULT CPanel::RefreshListCtrl(const UString &focusedName, int focusedPos, bool
     int subItem = 0;
     item.iSubItem = subItem++;
     item.lParam = kParentIndex;
-    item.pszText = (wchar_t *)(const wchar_t *)itemName;
+    item.pszText = const_cast<wchar_t *>((const wchar_t *)itemName);
     UInt32 attrib = FILE_ATTRIBUTE_DIRECTORY;
     item.iImage = _extToIconMap.GetIconIndex(attrib, itemName);
     if (item.iImage < 0)
@@ -391,10 +391,10 @@ HRESULT CPanel::RefreshListCtrl(const UString &focusedName, int focusedPos, bool
         pos = posNew;
         while (itemName[++pos] == ' ');
       }
-      item.pszText = (wchar_t *)(const wchar_t *)correctedName;
+      item.pszText = const_cast<wchar_t *>((const wchar_t *)correctedName);
     }
     else
-      item.pszText = (wchar_t *)(const wchar_t *)itemName;
+      item.pszText = const_cast<wchar_t *>((const wchar_t *)itemName);
 
     NCOM::CPropVariant prop;
     RINOK(_folder->GetProperty(i, kpidAttrib, &prop));
diff --git a/CPP/7zip/UI/FileManager/PanelOperations.cpp b/CPP/7zip/UI/FileManager/PanelOperations.cpp
index 579208d2..0c6d3122 100755
--- a/CPP/7zip/UI/FileManager/PanelOperations.cpp
+++ b/CPP/7zip/UI/FileManager/PanelOperations.cpp
@@ -50,7 +50,7 @@ public:
   
   HRESULT Result;
 
-  CThreadFolderOperations(EFolderOpType opType): OpType(opType), Result(E_FAIL) {};
+  CThreadFolderOperations(EFolderOpType opType): OpType(opType), Result(E_FAIL) {}
   HRESULT DoOperation(CPanel &panel, const UString &progressTitle, const UString &titleError);
 };
   
@@ -72,7 +72,7 @@ HRESULT CThreadFolderOperations::ProcessVirt()
       Result = E_FAIL;
   }
   return Result;
-};
+}
 
 
 HRESULT CThreadFolderOperations::DoOperation(CPanel &panel, const UString &progressTitle, const UString &titleError)
diff --git a/CPP/7zip/UI/FileManager/ProgressDialog2.cpp b/CPP/7zip/UI/FileManager/ProgressDialog2.cpp
index 313b6181..3d878a61 100755
--- a/CPP/7zip/UI/FileManager/ProgressDialog2.cpp
+++ b/CPP/7zip/UI/FileManager/ProgressDialog2.cpp
@@ -941,7 +941,7 @@ void CProgressDialog::ProcessWasFinished()
     PostMessage(kCloseMessage);
   else
     _needClose = true;
-};
+}
 
 
 HRESULT CProgressThreadVirt::Create(const UString &title, HWND parentWindow)
diff --git a/CPP/7zip/UI/FileManager/RootFolder.cpp b/CPP/7zip/UI/FileManager/RootFolder.cpp
index 1f4886d2..0715a8be 100755
--- a/CPP/7zip/UI/FileManager/RootFolder.cpp
+++ b/CPP/7zip/UI/FileManager/RootFolder.cpp
@@ -72,7 +72,7 @@ void CRootFolder::Init()
   _names[ROOT_INDEX_VOLUMES] = kVolPrefix;
   _iconIndices[ROOT_INDEX_VOLUMES] = GetIconIndexForCSIDL(CSIDL_DRIVES);
   #endif
-};
+}
 
 STDMETHODIMP CRootFolder::LoadItems()
 {