From 056bee216eedaf6b06fac36bd8491f4fc6a185d2 Mon Sep 17 00:00:00 2001
From: Philipp Spitzer <philipp@spitzer.priv.at>
Date: Sun, 22 Jan 2017 20:11:19 +0100
Subject: [PATCH] Merged definition and initialization of conflictSeverity.

---
 src/mvc/delegate.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 283f2c3..ebf4211 100644
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -64,8 +64,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
 
         // determine severity of conflict
         Favourite eventTimeConflict = event->timeConflict(); // cache value as event->timeConflict is expensive
-        enum ConflictSeverity {csNone, csWeak, csStrong} conflictSeverity;
-        conflictSeverity = csNone;
+        enum ConflictSeverity {csNone, csWeak, csStrong} conflictSeverity = csNone;
         switch (event->favourite()) {
             case Favourite_strong:
                 conflictSeverity = (eventTimeConflict == Favourite_strong) ? csStrong : csNone;
-- 
2.39.5