From 16f6f636aee6acaf52439643502f5ff9cb4ccffc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 1 Jun 2015 01:08:30 +0300
Subject: Convert UserColorId enum into strong typed enum.

---
 src/gui/widgets/tabs/setup_colors.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/gui/widgets/tabs/setup_colors.cpp')

diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 1ba6461ea..f7a2dcfd6 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -250,7 +250,8 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED)
         return;
 
     mSelected = mColorBox->getSelected();
-    const int type = userPalette->getColorTypeAt(mSelected);
+    const UserColorIdT type = static_cast<UserColorIdT>(
+        userPalette->getColorTypeAt(mSelected));
     const Color *col = &userPalette->getColor(type);
     const GradientTypeT grad = userPalette->getGradientType(type);
     const int delay = userPalette->getGradientDelay(type);
@@ -380,7 +381,8 @@ void Setup_Colors::cancel()
         return;
 
     userPalette->rollback();
-    const int type = userPalette->getColorTypeAt(mSelected);
+    const UserColorIdT type = static_cast<UserColorIdT>(
+        userPalette->getColorTypeAt(mSelected));
     const Color *const col = &userPalette->getColor(type);
     mGradTypeSlider->setValue(static_cast<int>(
         userPalette->getGradientType(type)));
@@ -397,7 +399,8 @@ void Setup_Colors::updateGradType()
         return;
 
     mSelected = mColorBox->getSelected();
-    const int type = userPalette->getColorTypeAt(mSelected);
+    const UserColorIdT type = static_cast<UserColorIdT>(
+        userPalette->getColorTypeAt(mSelected));
     const GradientTypeT grad = userPalette->getGradientType(type);
 
     mGradTypeText->setCaption(
@@ -427,7 +430,8 @@ void Setup_Colors::updateColor()
     if (mSelected == -1 || !userPalette)
         return;
 
-    const int type = userPalette->getColorTypeAt(mSelected);
+    const UserColorIdT type = static_cast<UserColorIdT>(
+        userPalette->getColorTypeAt(mSelected));
     const GradientTypeT grad = static_cast<GradientTypeT>(
         static_cast<int>(mGradTypeSlider->getValue()));
     const int delay = static_cast<int>(mGradDelaySlider->getValue());
-- 
cgit v1.2.3-70-g09d2