Changeset 056bee2


Ignore:
Timestamp:
01/22/17 20:11:19 (5 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
0d41eb2
Parents:
0f10c1a
Message:

Merged definition and initialization of conflictSeverity.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/mvc/delegate.cpp

    r0f10c1a r056bee2  
    6565        // determine severity of conflict
    6666        Favourite eventTimeConflict = event->timeConflict(); // cache value as event->timeConflict is expensive
    67         enum ConflictSeverity {csNone, csWeak, csStrong} conflictSeverity;
    68         conflictSeverity = csNone;
     67        enum ConflictSeverity {csNone, csWeak, csStrong} conflictSeverity = csNone;
    6968        switch (event->favourite()) {
    7069            case Favourite_strong:
Note: See TracChangeset for help on using the changeset viewer.