diff --git a/launcher/ui/dialogs/IconPickerDialog.cpp b/launcher/ui/dialogs/IconPickerDialog.cpp index dfeea20a1..49b396b5e 100644 --- a/launcher/ui/dialogs/IconPickerDialog.cpp +++ b/launcher/ui/dialogs/IconPickerDialog.cpp @@ -41,7 +41,7 @@ IconPickerDialog::IconPickerDialog(QWidget* parent) : QDialog(parent), ui(new Ui tr("Legacy"), tr("Modpacks"), }; - static const Context context_id[] = { + static const IconPickerCategory context_id[] = { Any, Modern, Legacy, @@ -101,7 +101,7 @@ IconPickerDialog::IconPickerDialog(QWidget* parent) : QDialog(parent), ui(new Ui connect(buttonFolder, &QPushButton::clicked, this, &IconPickerDialog::openFolder); connect(ui->searchLine, &QLineEdit::textChanged, this, &IconPickerDialog::filterIcons); connect(ui->contextCombo, &QComboBox::currentIndexChanged, this, [this](int index) { - Context category = static_cast(ui->contextCombo->itemData(index).toInt()); + IconPickerCategory category = static_cast(ui->contextCombo->itemData(index).toInt()); filterIconsByCategory(category); }); // Prevent incorrect indices from e.g. filesystem changes @@ -200,7 +200,7 @@ void IconPickerDialog::filterIcons(const QString& query) proxyModel->setFilterFixedString(query); } -void IconPickerDialog::filterIconsByCategory(Context category) +void IconPickerDialog::filterIconsByCategory(IconPickerCategory category) { switch (category) { default: diff --git a/launcher/ui/dialogs/IconPickerDialog.h b/launcher/ui/dialogs/IconPickerDialog.h index 58a94bb9b..b2d707ae8 100644 --- a/launcher/ui/dialogs/IconPickerDialog.h +++ b/launcher/ui/dialogs/IconPickerDialog.h @@ -32,6 +32,14 @@ class IconPickerDialog : public QDialog { int execWithSelection(QString selection); QString selectedIconKey; + enum IconPickerCategory { + Any, + Modern, + Legacy, + Modpacks, + }; + Q_ENUM(IconPickerCategory) + protected: virtual bool eventFilter(QObject*, QEvent*); @@ -41,14 +49,6 @@ class IconPickerDialog : public QDialog { QLineEdit* searchBar; QSortFilterProxyModel* proxyModel; - enum Context { - Any, - Modern, - Legacy, - Modpacks, - }; - Q_ENUM(Context) - private slots: void selectionChanged(QItemSelection, QItemSelection); void activated(QModelIndex); @@ -57,5 +57,5 @@ class IconPickerDialog : public QDialog { void removeSelectedIcon(); void openFolder(); void filterIcons(const QString& text); - void filterIconsByCategory(Context); + void filterIconsByCategory(IconPickerCategory); };