X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/blobdiff_plain/0f10c1afc546c4d06ed99dd4a39a2ec281c45bf6..102d186c946286839819bc3623fdddfcf5216877:/src/mvc/delegate.cpp

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 283f2c3..ae44cf6 100644
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -26,7 +26,6 @@
 
 #include "room.h"
 
-const int RADIUS = 10;
 const int SPACER = 10;
 
 const double scaleFactor1 = 0.4;
@@ -64,8 +63,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;
@@ -238,7 +236,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
                 option.rect.x()+SPACER,
                 option.rect.y()+option.rect.height()-fmBig.descent());
         painter->setFont(fontBig);
-        painter->drawText(titlePointF,qVariantValue<QString>(index.data()));
+        painter->drawText(titlePointF,index.data().value<QString>());
     }
 
     painter->restore();
@@ -364,7 +362,7 @@ int Delegate::numberOfFavourities(const QModelIndex &index) const
 
     int nrofFavs = 0;
     for(int i=0; i<index.model()->rowCount(index); i++)
-        if(static_cast<Event*>(index.child(i,0).internalPointer())->favourite() != Favourite_no)
+        if(static_cast<Event*>(index.model()->index(i, 0, index).internalPointer())->favourite() != Favourite_no)
             nrofFavs++;
 
     return nrofFavs;
@@ -377,7 +375,7 @@ int Delegate::numberOfAlarms(const QModelIndex &index) const
 
     int nrofAlarms = 0;
     for(int i=0; i<index.model()->rowCount(index); i++)
-        if(static_cast<Event*>(index.child(i,0).internalPointer())->hasAlarm())
+        if(static_cast<Event*>(index.model()->index(i, 0, index).internalPointer())->hasAlarm())
             nrofAlarms++;
 
     return nrofAlarms;