From 9ca5908de5507de5a7c30e767d80c4dca6994844 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Wed, 2 Jul 2014 19:13:05 +0200 Subject: [PATCH] Create an enum for price sources Probably settingscache would have been the correct place for the enum, but keeping it in the same class/file where price sources are defined sounds cleaner to me --- cockatrice/src/dlg_settings.cpp | 11 ++++++----- cockatrice/src/priceupdater.h | 2 ++ cockatrice/src/tab_deck_editor.cpp | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index 0d36dd18..757c719a 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -24,6 +24,7 @@ #include "dlg_settings.h" #include "main.h" #include "settingscache.h" +#include "priceupdater.h" GeneralSettingsPage::GeneralSettingsPage() { @@ -538,10 +539,10 @@ DeckEditorSettingsPage::DeckEditorSettingsPage() switch(settingsCache->getPriceTagSource()) { - case 0: + case AbstractPriceUpdater::BLPPriceSource: priceTagSource0->setChecked(true); break; - case 1: + case AbstractPriceUpdater::DBPriceSource: priceTagSource1->setChecked(true); break; } @@ -578,11 +579,11 @@ void DeckEditorSettingsPage::radioPriceTagSourceClicked(bool checked) if(!checked) return; - int source=0; + int source=AbstractPriceUpdater::BLPPriceSource; if(priceTagSource0->isChecked()) - source=0; + source=AbstractPriceUpdater::BLPPriceSource; if(priceTagSource1->isChecked()) - source=1; + source=AbstractPriceUpdater::DBPriceSource; emit priceTagSourceChanged(source); } diff --git a/cockatrice/src/priceupdater.h b/cockatrice/src/priceupdater.h index 901471f5..642c75c7 100644 --- a/cockatrice/src/priceupdater.h +++ b/cockatrice/src/priceupdater.h @@ -14,6 +14,8 @@ class QNetworkAccessManager; class AbstractPriceUpdater : public QWidget { Q_OBJECT +public: + enum PriceSource { BLPPriceSource, DBPriceSource }; protected: const DeckList *deck; QNetworkAccessManager *nam; diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp index 5706ffd6..71fd9cbd 100644 --- a/cockatrice/src/tab_deck_editor.cpp +++ b/cockatrice/src/tab_deck_editor.cpp @@ -648,10 +648,10 @@ void TabDeckEditor::actUpdatePrices() switch(settingsCache->getPriceTagSource()) { - case 0: + case AbstractPriceUpdater::BLPPriceSource: up = new BLPPriceUpdater(deckModel->getDeckList()); break; - case 1: + case AbstractPriceUpdater::DBPriceSource: up = new DBPriceUpdater(deckModel->getDeckList()); break; }