From dc8422dbac2c45a082153240138d699c1bfc3b88 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2015 16:04:27 +0300 Subject: Move gradient type into separate file. --- src/gui/theme.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/theme.cpp') diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 477da5fb0..d9740de3b 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -913,7 +913,7 @@ static Color readColor(const std::string &description) return Color(v); } -static Palette::GradientType readColorGradient(const std::string &grad) +static GradientTypeT readColorGradient(const std::string &grad) { static const std::string grads[] = { @@ -924,15 +924,15 @@ static Palette::GradientType readColorGradient(const std::string &grad) }; if (grad.empty()) - return Palette::STATIC; + return GradientType::STATIC; for (int i = 0; i < 4; i++) { if (compareStrI(grad, grads[i])) - return static_cast(i); + return static_cast(i); } - return Palette::STATIC; + return GradientType::STATIC; } static int readProgressType(const std::string &type) @@ -1018,7 +1018,7 @@ void Theme::loadColors(std::string file) continue; const Color color = readColor(temp); - const GradientType grad = readColorGradient( + const GradientTypeT grad = readColorGradient( XML::getProperty(node, "effect", "")); mColors[paletteId * ThemeColorId::THEME_COLORS_END + type].set( type, color, grad, 10); -- cgit v1.2.3-70-g09d2