amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: child class doesn't need to be public

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-16 00:58:44 +02:00
parent 32f28747f0
commit dbe6fbd33b
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/card_list_column_select.cpp
+3 -9
View File
@@ -44,14 +44,6 @@ CardListColumnSelectDialog::CardListColumnSelectDialog(Window* parent, const Gam
UpdateWindowUI(wxUPDATE_UI_RECURSE);
}
struct SortByPosition {
SortByPosition(const Game& game) : game(game) {}
const Game& game;
bool operator() (const CardListColumnSelectDialog::ColumnSettingsF& a, const CardListColumnSelectDialog::ColumnSettingsF& b){
return a.settings.position < b.settings.position;
}
};
void CardListColumnSelectDialog::initColumns() {
// order is a list of all columns that may be shown
FOR_EACH(f, game->card_fields) {
@@ -60,7 +52,9 @@ void CardListColumnSelectDialog::initColumns() {
}
}
// sorted by position
sort(columns.begin(), columns.end(), SortByPosition(*game));
sort(columns.begin(), columns.end(), [](const ColumnSettingsF& a, const ColumnSettingsF& b) {
return a.settings.position < b.settings.position;
});
// force unique position
int min = 0;
FOR_EACH(c, columns) {
src/gui/control/card_list_column_select.hpp
+2 -2
View File
@@ -35,7 +35,7 @@ private:
wxCheckListBox* list;
// other info
GameP game; ///< The game we are changing
public: struct ColumnSettingsF {
struct ColumnSettingsF {
ColumnSettingsF(const FieldP& field, const ColumnSettings& settings)
: field(field)
, settings(settings)
@@ -43,7 +43,7 @@ private:
FieldP field;
ColumnSettings settings;
};
private: vector<ColumnSettingsF> columns; ///< Settings of the fields, in order
vector<ColumnSettingsF> columns; ///< Settings of the fields, in order
// initialize columns
void initColumns();