From 106cd424af0fec559422a6443944ed09e537d930 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 26 Jan 2019 18:18:58 +0100
Subject: fixing coding style and translation and merge from master

---
 src/live_effects/effect.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/live_effects/effect.cpp')

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 92f5a781a..dfad38e3a 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -160,8 +160,8 @@ const Util::EnumData<EffectType> LPETypeData[] = {
     {TEXT_LABEL,            N_("Text label"),                      "text_label"},
 #endif
 
-};
-const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData));
+
+const EnumEffectDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData) / sizeof(*LPETypeData));
 
 int
 Effect::acceptsNumClicks(EffectType type) {
-- 
cgit v1.2.3