From afb05a1c45a77e5cc251e113b5159bab39b1db6e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 13 Dec 2021 01:00:23 +0100 Subject: [PATCH] C++11 tidying. --- src/wx/send_i18n_dialog.cc | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/wx/send_i18n_dialog.cc b/src/wx/send_i18n_dialog.cc index 9cadc7f47..05cd87d44 100644 --- a/src/wx/send_i18n_dialog.cc +++ b/src/wx/send_i18n_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Carl Hetherington + Copyright (C) 2018-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,20 +18,23 @@ */ + +#include "i18n_hook.h" #include "send_i18n_dialog.h" #include "wx_util.h" -#include "i18n_hook.h" #include + using std::string; using std::map; + SendI18NDialog::SendI18NDialog (wxWindow* parent) : wxDialog (parent, wxID_ANY, _("Send translations")) { - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + auto overall_sizer = new wxBoxSizer (wxVERTICAL); - wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); add_label_to_sizer (table, this, _("Your name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); @@ -46,20 +49,20 @@ SendI18NDialog::SendI18NDialog (wxWindow* parent) _language = new wxTextCtrl (this, wxID_ANY); table->Add (_language, 0, wxEXPAND); - wxListCtrl* list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize(800, -1), wxLC_REPORT | wxLC_NO_HEADER); + auto list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize(800, -1), wxLC_REPORT | wxLC_NO_HEADER); list->AppendColumn(wxT(""), wxLIST_FORMAT_LEFT, 400); list->AppendColumn(wxT(""), wxLIST_FORMAT_LEFT, 400); - map translations = I18NHook::translations (); + auto translations = I18NHook::translations (); int N = 0; - for (map::const_iterator i = translations.begin(); i != translations.end(); ++i) { + for (auto const& i: translations) { wxListItem it; it.SetId(N); it.SetColumn(0); - it.SetText(std_to_wx(i->first)); + it.SetText(std_to_wx(i.first)); list->InsertItem(it); it.SetColumn(1); - it.SetText(std_to_wx(i->second)); + it.SetText(std_to_wx(i.second)); list->SetItem(it); ++N; } @@ -67,7 +70,7 @@ SendI18NDialog::SendI18NDialog (wxWindow* parent) overall_sizer->Add (table, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); overall_sizer->Add (list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); + auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); if (buttons) { overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } -- 2.30.2