Unnecessary const_ prefix removed (blindly).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index a532528bb113328752cd46e0930ad414d1a78ecc..5d5f7f200f398aea09c541104d2eca86d7ece2e2 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -352,7 +352,7 @@ void wxSimpleHelpProvider::AddHelp(wxWindowBase *window, const wxString& text)
 
 void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 {
 
 void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 {

-    wxLongToStringHashMap::const_key_type key = (wxLongToStringHashMap::const_key_type)id;
+    wxLongToStringHashMap::key_type key = (wxLongToStringHashMap::key_type)id;

     m_hashIds.erase(key);
     m_hashIds[key] = text;
 }
     m_hashIds.erase(key);
     m_hashIds[key] = text;
 }

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index d6d183b2044e228a8b2404837ba86ae1ccf83a44..96c00390b88ddba5a9f2d26562117fe3d8b241d4 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -9541,7 +9541,7 @@ void wxGrid::SetColSize( int col, int width )
 void wxGrid::SetColMinimalWidth( int col, int width )
 {
     if (width > GetColMinimalAcceptableWidth()) {
 void wxGrid::SetColMinimalWidth( int col, int width )
 {
     if (width > GetColMinimalAcceptableWidth()) {

-        wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)col;
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;

         m_colMinWidths[key] = width;
     }
 }
         m_colMinWidths[key] = width;
     }
 }


@@ -9549,21 +9549,21 @@ void wxGrid::SetColMinimalWidth( int col, int width )
 void wxGrid::SetRowMinimalHeight( int row, int width )
 {
     if (width > GetRowMinimalAcceptableHeight()) {
 void wxGrid::SetRowMinimalHeight( int row, int width )
 {
     if (width > GetRowMinimalAcceptableHeight()) {

-        wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)row;
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;

         m_rowMinHeights[key] = width;
     }
 }
 
 int wxGrid::GetColMinimalWidth(int col) const
 {
         m_rowMinHeights[key] = width;
     }
 }
 
 int wxGrid::GetColMinimalWidth(int col) const
 {

-    wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)col;
+    wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;

     wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);
     return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
 }
 
 int wxGrid::GetRowMinimalHeight(int row) const
 {
     wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);
     return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
 }
 
 int wxGrid::GetRowMinimalHeight(int row) const
 {

-    wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)row;
+    wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;

     wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
     return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
 }
     wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
     return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
 }