From cfdf80d5866aac9fce9f5df56aa9c943598fe25a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 21 Jan 2019 19:57:33 +0100 Subject: [PATCH] Rename wxChoice::InitialiseSort() to QtInitSort() Use the prefix to indicate that this function is unique to this port. Also don't make unnecessarily make it virtual. --- include/wx/qt/choice.h | 2 +- src/qt/choice.cpp | 4 ++-- src/qt/combobox.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/qt/choice.h b/include/wx/qt/choice.h index 5b4e51129a..208005ec06 100644 --- a/include/wx/qt/choice.h +++ b/include/wx/qt/choice.h @@ -71,7 +71,7 @@ protected: virtual void DoClear(); virtual void DoDeleteOneItem(unsigned int pos); - virtual void InitialiseSort(QComboBox *combo); + void QtInitSort(QComboBox *combo); QComboBox *m_qtComboBox; diff --git a/src/qt/choice.cpp b/src/qt/choice.cpp index cc1587825e..4bc672b71e 100644 --- a/src/qt/choice.cpp +++ b/src/qt/choice.cpp @@ -75,7 +75,7 @@ wxChoice::wxChoice() : { } -void wxChoice::InitialiseSort(QComboBox *combo) +void wxChoice::QtInitSort( QComboBox *combo ) { QSortFilterProxyModel *proxyModel = new LexicalSortProxyModel(); proxyModel->setSourceModel(combo->model()); @@ -131,7 +131,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, { m_qtComboBox = new wxQtChoice( parent, this ); - InitialiseSort(m_qtComboBox); + QtInitSort( m_qtComboBox ); while ( n-- > 0 ) m_qtComboBox->addItem( wxQtConvertString( *choices++ )); diff --git a/src/qt/combobox.cpp b/src/qt/combobox.cpp index 36efe13300..3ca015a019 100644 --- a/src/qt/combobox.cpp +++ b/src/qt/combobox.cpp @@ -128,7 +128,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& name ) { m_qtComboBox = new wxQtComboBox( parent, this ); - InitialiseSort(m_qtComboBox); + QtInitSort( m_qtComboBox ); while ( n-- > 0 ) m_qtComboBox->addItem( wxQtConvertString( *choices++ ));