Merged definition and initialization of conflictSeverity.

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 283f2c3bd8ab9b05ebc9e7680d7fbfafb5bd6daa..ebf421111c32e4dbe010cb54e90c1d3c9be5672b 100644 (file)
--- 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;