Use QVariant::fromValue(Q_ENUM) for DateFormat preference

Author: xARSENICx

src/preferences/dialog/dlgpreflibrary.cpp

@@ -113,20 +113,15 @@ DlgPrefLibrary::DlgPrefLibrary(
     updateSearchLineEditHistoryOptions();
 
     comboBox_dateFormat->addItem(tr("Native (System Default)"),
-            QVariant::fromValue(
-                    static_cast<int>(BaseTrackTableModel::DateFormat::Native)));
+            QVariant::fromValue(BaseTrackTableModel::DateFormat::Native));
     comboBox_dateFormat->addItem(tr("ISO 8601 (yyyy-MM-dd)"),
-            QVariant::fromValue(static_cast<int>(
-                    BaseTrackTableModel::DateFormat::ISO8601)));
+            QVariant::fromValue(BaseTrackTableModel::DateFormat::ISO8601));
     comboBox_dateFormat->addItem(tr("Regional Short (d/M/yy)"),
-            QVariant::fromValue(static_cast<int>(
-                    BaseTrackTableModel::DateFormat::RegionalShort)));
+            QVariant::fromValue(BaseTrackTableModel::DateFormat::RegionalShort));
     comboBox_dateFormat->addItem(tr("Regional Long (dd.MM.yyyy)"),
-            QVariant::fromValue(static_cast<int>(
-                    BaseTrackTableModel::DateFormat::RegionalLong)));
+            QVariant::fromValue(BaseTrackTableModel::DateFormat::RegionalLong));
     comboBox_dateFormat->addItem(tr("Custom"),
-            QVariant::fromValue(
-                    static_cast<int>(BaseTrackTableModel::DateFormat::Custom)));
+            QVariant::fromValue(BaseTrackTableModel::DateFormat::Custom));
 
     connect(comboBox_dateFormat,
             &QComboBox::currentIndexChanged,
@@ -295,7 +290,8 @@ void DlgPrefLibrary::slotResetToDefaults() {
     comboBox_search_bpm_fuzzy_range->setCurrentIndex(
             comboBox_search_bpm_fuzzy_range->findData(kDefaultFuzzyRateRangePercent));
 
-    int dateIndex = comboBox_dateFormat->findData(BaseTrackTableModel::kDateFormatDefault);
+    int dateIndex = comboBox_dateFormat->findData(
+            QVariant::fromValue(BaseTrackTableModel::DateFormat::Native));
     if (dateIndex != -1) {
         comboBox_dateFormat->setCurrentIndex(dateIndex);
     } else {
@@ -362,7 +358,7 @@ void DlgPrefLibrary::slotUpdate() {
         preset = BaseTrackTableModel::DateFormat::RegionalLong;
     }
 
-    int dateIndex = comboBox_dateFormat->findData(QVariant::fromValue(static_cast<int>(preset)));
+    int dateIndex = comboBox_dateFormat->findData(QVariant::fromValue(preset));
     if (dateIndex != -1) {
         comboBox_dateFormat->setCurrentIndex(dateIndex);
     }
@@ -785,8 +781,8 @@ void DlgPrefLibrary::setSeratoMetadataEnabled(bool shouldSyncTrackMetadata) {
 }
 
 void DlgPrefLibrary::slotDateFormatIndexChanged(int index) {
-    auto type = static_cast<BaseTrackTableModel::DateFormat>(
-            comboBox_dateFormat->itemData(index).toInt());
+    auto type = comboBox_dateFormat->itemData(index)
+                        .value<BaseTrackTableModel::DateFormat>();
 
     if (type == BaseTrackTableModel::DateFormat::Custom) {
         // Enable editing for Custom
@@ -831,8 +827,8 @@ void DlgPrefLibrary::slotDateFormatChanged(const QString& text) {
     if (comboBox_dateFormat->isEditable()) {
         int index = comboBox_dateFormat->currentIndex();
         if (index >= 0) {
-            auto type = static_cast<BaseTrackTableModel::DateFormat>(
-                    comboBox_dateFormat->itemData(index).toInt());
+            auto type = comboBox_dateFormat->itemData(index)
+                                .value<BaseTrackTableModel::DateFormat>();
             if (type == BaseTrackTableModel::DateFormat::Custom) {
                 m_lastCustomDateFormat = format;
             }