diff --git a/src/agenda/agendaitem.cpp b/src/agenda/agendaitem.cpp
--- a/src/agenda/agendaitem.cpp
+++ b/src/agenda/agendaitem.cpp
@@ -1142,12 +1142,12 @@
     const int RECT_MARGIN = 2; // the distance between two item is then RECT_MARGIN * 2
     const int RADIUS = 4; // absolute radius
     
-    QRect rectWithMargin(rect.x() + RECT_MARGIN, rect.y() + RECT_MARGIN, rect.width() - 2 * RECT_MARGIN, rect.height() - 2 * RECT_MARGIN);
+    const QRect rectWithMargin(rect.x() + RECT_MARGIN, rect.y() + RECT_MARGIN, rect.width() - 2 * RECT_MARGIN, rect.height() - 2 * RECT_MARGIN);
     
-    QPoint pointLeftTop(rectWithMargin.x(), rectWithMargin.y());
-    QPoint pointRightTop(rectWithMargin.x() + rectWithMargin.width(), rectWithMargin.y());
-    QPoint pointLeftBottom(rectWithMargin.x(), rectWithMargin.y() + rectWithMargin.height());
-    QPoint pointRightBottom(rectWithMargin.x() + rectWithMargin.width(), rectWithMargin.y() + rectWithMargin.height());
+    const QPoint pointLeftTop(rectWithMargin.x(), rectWithMargin.y());
+    const QPoint pointRightTop(rectWithMargin.x() + rectWithMargin.width(), rectWithMargin.y());
+    const QPoint pointLeftBottom(rectWithMargin.x(), rectWithMargin.y() + rectWithMargin.height());
+    const QPoint pointRightBottom(rectWithMargin.x() + rectWithMargin.width(), rectWithMargin.y() + rectWithMargin.height());
     
     if (!roundTop && !roundBottom) {
         path.addRect(rectWithMargin);
@@ -1175,12 +1175,12 @@
     path.closeSubpath();
     p->save();
     p->setRenderHint(QPainter::Antialiasing, false);
-    QPen border = QPen(QBrush(QColor(200, 200, 200, 255)),1.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+    const QPen border = QPen(QBrush(QColor(200, 200, 200, 255)),1.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
     p->setPen(border);
 
     // header
     if (!frame) {
-        QBrush brushSolid = QBrush(Qt::SolidPattern);
+        QBrush brushSolid(Qt::SolidPattern);
 
         if (selected) {
             QColor top = bgColor.darker(250);