From 44bc26f087cb8d712c6d3bc16c50247c9ac9377c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 2 Feb 2024 17:59:01 +0100 Subject: [PATCH] Use range-for loops for iterating over wxWebViewHistoryItems No real changes, just simplify the code a bit. --- samples/webview/webview.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp index eec43c479b..3db3f72d51 100644 --- a/samples/webview/webview.cpp +++ b/samples/webview/webview.cpp @@ -1207,19 +1207,15 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt)) } m_histMenuItems.clear(); - wxVector > back = m_browser->GetBackwardHistory(); - wxVector > forward = m_browser->GetForwardHistory(); - wxMenuItem* item; - unsigned int i; - for(i = 0; i < back.size(); i++) + for ( const auto& histItem : m_browser->GetBackwardHistory() ) { - wxString title = back[i]->GetTitle(); + wxString title = histItem->GetTitle(); if ( title.empty() ) title = "(untitled)"; item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title); - m_histMenuItems[item->GetId()] = back[i]; + m_histMenuItems[item->GetId()] = histItem; Bind(wxEVT_MENU, &WebFrame::OnHistory, this, item->GetId()); } @@ -1232,13 +1228,13 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt)) //No need to connect the current item m_histMenuItems[item->GetId()] = wxSharedPtr(new wxWebViewHistoryItem(m_browser->GetCurrentURL(), m_browser->GetCurrentTitle())); - for(i = 0; i < forward.size(); i++) + for ( const auto& histItem : m_browser->GetForwardHistory() ) { - wxString title = forward[i]->GetTitle(); + wxString title = histItem->GetTitle(); if ( title.empty() ) title = "(untitled)"; item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title); - m_histMenuItems[item->GetId()] = forward[i]; + m_histMenuItems[item->GetId()] = histItem; Bind(wxEVT_TOOL, &WebFrame::OnHistory, this, item->GetId()); }