diff --git a/src/KChart/KChartAbstractDiagram.cpp b/src/KChart/KChartAbstractDiagram.cpp
index c88b5d9..dff27ee 100644
--- a/src/KChart/KChartAbstractDiagram.cpp
+++ b/src/KChart/KChartAbstractDiagram.cpp
@@ -1,1198 +1,1198 @@
 /*
  * Copyright (C) 2001-2015 Klaralvdalens Datakonsult AB.  All rights reserved.
  *
  * This file is part of the KD Chart library.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "KChartAbstractDiagram.h"
 #include "KChartAbstractDiagram_p.h"
 
 #include <QPainter>
 #include <QDebug>
 #include <QApplication>
 #include <QAbstractProxyModel>
 #include <QSizeF>
 #include <QPainterPath>
 
 #include "KChartAbstractCoordinatePlane.h"
 #include "KChartChart.h"
 #include "KChartDataValueAttributes.h"
 #include "KChartTextAttributes.h"
 #include "KChartMarkerAttributes.h"
 #include "KChartAbstractThreeDAttributes.h"
 #include "KChartThreeDLineAttributes.h"
 #include "KChartPainterSaver_p.h"
 
 #include <limits>
 
 using namespace KChart;
 
 #define d d_func()
 
 AbstractDiagram::AbstractDiagram ( QWidget* parent, AbstractCoordinatePlane* plane )
     : QAbstractItemView ( parent ), _d( new Private() )
 {
     _d->init( plane );
     init();
 }
 
 AbstractDiagram::~AbstractDiagram()
 {
     emit aboutToBeDestroyed();
     delete _d;
 }
 
 void AbstractDiagram::init()
 {
     _d->diagram = this;
     d->reverseMapper.setDiagram( this );
 }
 
 
 bool AbstractDiagram::compare( const AbstractDiagram* other ) const
 {
     if ( other == this ) return true;
     if ( !other ) {
         return false;
     }
     return  // compare QAbstractScrollArea properties
             (horizontalScrollBarPolicy() == other->horizontalScrollBarPolicy()) &&
             (verticalScrollBarPolicy()   == other->verticalScrollBarPolicy()) &&
             // compare QFrame properties
             (frameShadow()  == other->frameShadow()) &&
             (frameShape()   == other->frameShape()) &&
 // frameWidth is a read-only property defined by the style, it should not be in here:
             // (frameWidth()   == other->frameWidth()) &&
             (lineWidth()    == other->lineWidth()) &&
             (midLineWidth() == other->midLineWidth()) &&
             // compare QAbstractItemView properties
             (alternatingRowColors()  == other->alternatingRowColors()) &&
             (hasAutoScroll()         == other->hasAutoScroll()) &&
             (dragDropMode()          == other->dragDropMode()) &&
             (dragDropOverwriteMode() == other->dragDropOverwriteMode()) &&
             (horizontalScrollMode()  == other->horizontalScrollMode ()) &&
             (verticalScrollMode()    == other->verticalScrollMode()) &&
             (dragEnabled()           == other->dragEnabled()) &&
             (editTriggers()          == other->editTriggers()) &&
             (iconSize()              == other->iconSize()) &&
             (selectionBehavior()     == other->selectionBehavior()) &&
             (selectionMode()         == other->selectionMode()) &&
             (showDropIndicator()     == other->showDropIndicator()) &&
             (tabKeyNavigation()      == other->tabKeyNavigation()) &&
             (textElideMode()         == other->textElideMode()) &&
             // compare all of the properties stored in the attributes model
             attributesModel()->compare( other->attributesModel() ) &&
             // compare own properties
             (rootIndex().column()             == other->rootIndex().column()) &&
             (rootIndex().row()                == other->rootIndex().row()) &&
             (allowOverlappingDataValueTexts() == other->allowOverlappingDataValueTexts()) &&
             (antiAliasing()                   == other->antiAliasing()) &&
             (percentMode()                    == other->percentMode()) &&
             (datasetDimension()               == other->datasetDimension());
 }
 
 AbstractCoordinatePlane* AbstractDiagram::coordinatePlane() const
 {
     return d->plane;
 }
 
 const QPair<QPointF, QPointF> AbstractDiagram::dataBoundaries () const
 {
     if ( d->databoundariesDirty ) {
         d->databoundaries = calculateDataBoundaries ();
         d->databoundariesDirty = false;
     }
     return d->databoundaries;
 }
 
 void AbstractDiagram::setDataBoundariesDirty() const
 {
     d->databoundariesDirty = true;
     update();
 }
 
 void AbstractDiagram::resize(const QSizeF& size)
 {
     d->diagramSize = size;
     QAbstractItemView::resize( size.toSize() );
 }
 
 void AbstractDiagram::setModel( QAbstractItemModel * newModel )
 {
     if ( newModel == model() ) {
         return;
     }
 
     AttributesModel* amodel = new PrivateAttributesModel( newModel, this );
     amodel->initFrom( d->attributesModel );
     d->setAttributesModel(amodel);
 
     QAbstractItemView::setModel( newModel );
 
     scheduleDelayedItemsLayout();
     setDataBoundariesDirty();
     emit modelsChanged();
 }
 
 void AbstractDiagram::setSelectionModel( QItemSelectionModel* newSelectionModel )
 {
     if ( selectionModel() )
     {
         disconnect( selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SIGNAL(modelsChanged()) );
         disconnect( selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SIGNAL(modelsChanged()) );
     }
     QAbstractItemView::setSelectionModel( newSelectionModel );
     if ( selectionModel() )
     {
         connect( selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SIGNAL(modelsChanged()) );
         connect( selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SIGNAL(modelsChanged()) );
     }
     emit modelsChanged();
 }
 
-/*! Sets an external AttributesModel on this diagram. By default, a diagram has it's
+/* Sets an external AttributesModel on this diagram. By default, a diagram has it's
   own internal set of attributes, but an external one can be set. This can be used to
   share attributes between several diagrams. The diagram does not take ownership of the
   attributesmodel.
 
   @param amodel The AttributesModel to use for this diagram.
 */
 void AbstractDiagram::setAttributesModel( AttributesModel* amodel )
 {
     if ( amodel->sourceModel() != model() ) {
         qWarning("KChart::AbstractDiagram::setAttributesModel() failed: "
                  "Trying to set an attributesmodel which works on a different "
                  "model than the diagram.");
         return;
     }
     if ( qobject_cast<PrivateAttributesModel*>(amodel) ) {
         qWarning("KChart::AbstractDiagram::setAttributesModel() failed: "
                  "Trying to set an attributesmodel that is private to another diagram.");
         return;
     }
 
     d->setAttributesModel( amodel );
     scheduleDelayedItemsLayout();
     setDataBoundariesDirty();
     emit modelsChanged();
 }
 
 bool AbstractDiagram::usesExternalAttributesModel() const
 {
     return d->usesExternalAttributesModel();
 }
 
 AttributesModel* AbstractDiagram::attributesModel() const
 {
     return d->attributesModel;
 }
 
 QModelIndex AbstractDiagram::conditionallyMapFromSource( const QModelIndex & index ) const
 {
     Q_ASSERT( !index.isValid() || index.model() == attributesModel() || index.model() == attributesModel()->sourceModel() );
     return index.model() == attributesModel() ? index : attributesModel()->mapFromSource( index );
 }
 
-/*! \reimpl */
+/* \reimpl */
 void AbstractDiagram::setRootIndex( const QModelIndex& idx )
 {
     QAbstractItemView::setRootIndex( idx );
     setAttributesModelRootIndex( d->attributesModel->mapFromSource( idx ) );
 }
 
 /*! \internal */
 void AbstractDiagram::setAttributesModelRootIndex( const QModelIndex& idx )
 {
     d->attributesModelRootIndex = idx;
     setDataBoundariesDirty();
     scheduleDelayedItemsLayout();
 }
 
 /*! returns a QModelIndex pointing into the AttributesModel that corresponds to the
   root index of the diagram. */
 QModelIndex AbstractDiagram::attributesModelRootIndex() const
 {
     if ( !d->attributesModelRootIndex.isValid() )
         d->attributesModelRootIndex = d->attributesModel->mapFromSource( rootIndex() );
     return d->attributesModelRootIndex;
 }
 
 void AbstractDiagram::setCoordinatePlane( AbstractCoordinatePlane* parent )
 {
     d->plane = parent;
 }
 
 void AbstractDiagram::doItemsLayout()
 {
     if ( d->plane ) {
         d->plane->layoutDiagrams();
         update();
     }
     QAbstractItemView::doItemsLayout();
 }
 
 void AbstractDiagram::dataChanged( const QModelIndex &topLeft,
                                    const QModelIndex &bottomRight,
                                    const QVector<int> & )
 {
     Q_UNUSED( topLeft );
     Q_UNUSED( bottomRight );
     // We are still too dumb to do intelligent updates...
     setDataBoundariesDirty();
     scheduleDelayedItemsLayout();
 }
 
 
 void AbstractDiagram::setHidden( const QModelIndex & index, bool hidden )
 {
     d->attributesModel->setData(
         conditionallyMapFromSource( index ),
         QVariant::fromValue( hidden ),
         DataHiddenRole );
     emit dataHidden();
 }
 
 void AbstractDiagram::setHidden( int dataset, bool hidden )
 {
     d->setDatasetAttrs( dataset, QVariant::fromValue( hidden ), DataHiddenRole );
     emit dataHidden();
 }
 
 void AbstractDiagram::setHidden( bool hidden )
 {
     d->attributesModel->setModelData( QVariant::fromValue( hidden ), DataHiddenRole );
     emit dataHidden();
 }
 
 bool AbstractDiagram::isHidden() const
 {
     return attributesModel()->modelData( DataHiddenRole ).value< bool >();
 }
 
 bool AbstractDiagram::isHidden( int dataset ) const
 {
     const QVariant boolFlag( d->datasetAttrs( dataset, DataHiddenRole ) );
     if ( boolFlag.isValid() )
         return boolFlag.value< bool >();
     return isHidden();
 }
 
 bool AbstractDiagram::isHidden( const QModelIndex & index ) const
 {
     const QVariant boolFlag( attributesModel()->data( conditionallyMapFromSource( index ),
                                                       DataHiddenRole ) );
     if ( boolFlag.isValid() ) {
         return boolFlag.value< bool >();
     }
     int dataset = index.column() / d->datasetDimension;
     return isHidden( dataset );
 }
 
 
 void AbstractDiagram::setDataValueAttributes( const QModelIndex & index,
                                               const DataValueAttributes & a )
 {
     d->attributesModel->setData( conditionallyMapFromSource( index ), QVariant::fromValue( a ),
                                  DataValueLabelAttributesRole );
     emit propertiesChanged();
 }
 
 
 void AbstractDiagram::setDataValueAttributes( int dataset, const DataValueAttributes & a )
 {
     d->setDatasetAttrs( dataset, QVariant::fromValue( a ), DataValueLabelAttributesRole );
     emit propertiesChanged();
 }
 
 DataValueAttributes AbstractDiagram::dataValueAttributes() const
 {
     return attributesModel()->modelData( KChart::DataValueLabelAttributesRole ).value< DataValueAttributes >();
 }
 
 DataValueAttributes AbstractDiagram::dataValueAttributes( int dataset ) const
 {
     /*
     The following did not work!
     (khz, 2008-01-25)
     If there was some attrs specified for the 0-th cells of a dataset,
     then this logic would return the cell's settings instead of the header settings:
 
     return qVariantValue<DataValueAttributes>(
         attributesModel()->data( attributesModel()->mapFromSource(columnToIndex( column )),
         KChart::DataValueLabelAttributesRole ) );
     */
 
     const QVariant headerAttrs(
         d->datasetAttrs( dataset, KChart::DataValueLabelAttributesRole ) );
     if ( headerAttrs.isValid() )
         return headerAttrs.value< DataValueAttributes >();
     return dataValueAttributes();
 }
 
 DataValueAttributes AbstractDiagram::dataValueAttributes( const QModelIndex & index ) const
 {
     return attributesModel()->data(
             conditionallyMapFromSource( index ),
             KChart::DataValueLabelAttributesRole ).value< DataValueAttributes >();
 }
 
 void AbstractDiagram::setDataValueAttributes( const DataValueAttributes & a )
 {
     d->attributesModel->setModelData( QVariant::fromValue( a ), DataValueLabelAttributesRole );
     emit propertiesChanged();
 }
 
 void AbstractDiagram::setAllowOverlappingDataValueTexts( bool allow )
 {
     DataValueAttributes attrs = dataValueAttributes();
     attrs.setShowOverlappingDataLabels( allow );
     setDataValueAttributes( attrs );
     d->allowOverlappingDataValueTexts = allow;
     emit propertiesChanged();
 }
 
 bool AbstractDiagram::allowOverlappingDataValueTexts() const
 {
     return d->allowOverlappingDataValueTexts;
 }
 
 void AbstractDiagram::setAntiAliasing( bool enabled )
 {
     d->antiAliasing = enabled;
     emit propertiesChanged();
 }
 
 bool AbstractDiagram::antiAliasing() const
 {
     return d->antiAliasing;
 }
 
 void AbstractDiagram::setPercentMode ( bool percent )
 {
     d->percent = percent;
     emit propertiesChanged();
 }
 
 bool AbstractDiagram::percentMode() const
 {
     return d->percent;
 }
 
 
 void AbstractDiagram::paintDataValueText( QPainter* painter,
                                           const QModelIndex& index,
                                           const QPointF& pos,
                                           qreal value )
 {
     d->paintDataValueText( painter, index, pos, value );
 }
 
 
 void AbstractDiagram::paintDataValueTexts( QPainter* painter )
 {
     if ( !checkInvariants() ) {
         return;
     }
 
     d->forgetAlreadyPaintedDataValues();
     const int rowCount = model()->rowCount( rootIndex() );
     const int columnCount = model()->columnCount( rootIndex() );
     for ( int column = 0; column < columnCount; column += datasetDimension() ) {
         for ( int row = 0; row < rowCount; ++row ) {
             QModelIndex index = model()->index( row, column, rootIndex() ); // checked
             qreal x;
             qreal y;
             if ( datasetDimension() == 1 ) {
                 x = row;
                 y = index.data().toReal();
             } else {
                 x = index.data().toReal();
                 y = model()->index( row, column + 1, rootIndex() ).data().toReal();
             }
             paintDataValueText( painter, index, coordinatePlane()->translate( QPointF( x, y ) ), y );
         }
     }
 }
 
 
 void AbstractDiagram::paintMarker( QPainter* painter,
                                    const DataValueAttributes& a,
                                    const QModelIndex& index,
                                    const QPointF& pos )
 {
     if ( !checkInvariants() || !a.isVisible() ) return;
     const MarkerAttributes ma = a.markerAttributes();
     if ( !ma.isVisible() ) return;
 
     const PainterSaver painterSaver( painter );
 
     QSizeF maSize = ma.markerSize();
     const qreal diagramWidth = d->diagramSize.width();
     const qreal diagramHeight = d->diagramSize.height();
 
     switch( ma.markerSizeMode() ) {
     case MarkerAttributes::AbsoluteSize:
         // Unscaled, i.e. without the painter's "zoom"
         maSize.rwidth()  /= painter->matrix().m11();
         maSize.rheight() /= painter->matrix().m22();
         break;
     case MarkerAttributes::AbsoluteSizeScaled:
         // Keep maSize as is. It is specified directly in pixels and desired
         // to be effected by the painter's "zoom".
         break;
     case MarkerAttributes::RelativeToDiagramWidthHeightMin:
         maSize *= qMin( diagramWidth, diagramHeight );
         break;
     }
 
     QBrush indexBrush( brush( index ) );
     QPen indexPen( ma.pen() );
     if ( ma.markerColor().isValid() )
         indexBrush.setColor( ma.markerColor() );
 
     paintMarker( painter, ma, indexBrush, indexPen, pos, maSize );
 
     // workaround: BC cannot be changed, otherwise we would pass the
     // index down to next-lower paintMarker function. So far, we
     // basically save a circle of radius maSize at pos in the
     // reverseMapper. This means that ^^^ this version of paintMarker
     // needs to be called to reverse-map the marker.
     d->reverseMapper.addCircle( index.row(), index.column(), pos, 2 * maSize );
 }
 
 void AbstractDiagram::paintMarker( QPainter* painter,
                                    const QModelIndex& index,
                                    const QPointF& pos )
 {
     if ( !checkInvariants() ) return;
     paintMarker( painter, dataValueAttributes( index ), index, pos );
 }
 
 void AbstractDiagram::paintMarker( QPainter* painter,
                                    const MarkerAttributes& markerAttributes,
                                    const QBrush& brush,
                                    const QPen& pen,
                                    const QPointF& pos,
                                    const QSizeF& maSize )
 {
     const QPen oldPen( painter->pen() );
     // Pen is used to paint 4Pixels - 1 Pixel - Ring and FastCross types.
     // make sure to use the brush color - see above in those cases.
     const bool isFourPixels = (markerAttributes.markerStyle() == MarkerAttributes::Marker4Pixels);
     if ( isFourPixels || (markerAttributes.markerStyle() == MarkerAttributes::Marker1Pixel) ) {
         // for high-performance point charts with tiny point markers:
         painter->setPen( PrintingParameters::scalePen( QPen( brush.color().lighter() ) ) );
         if ( isFourPixels ) {
             const qreal x = pos.x();
             const qreal y = pos.y();
             painter->drawLine( QPointF(x-1.0,y-1.0),
                                QPointF(x+1.0,y-1.0) );
             painter->drawLine( QPointF(x-1.0,y),
                                QPointF(x+1.0,y) );
             painter->drawLine( QPointF(x-1.0,y+1.0),
                                QPointF(x+1.0,y+1.0) );
         }
         painter->drawPoint( pos );
     } else {
         const PainterSaver painterSaver( painter );
         QPen painterPen( pen );
         painter->setPen( PrintingParameters::scalePen( painterPen ) );
         painter->setBrush( brush );
         painter->setRenderHint ( QPainter::Antialiasing );
         painter->translate( pos );
         switch ( markerAttributes.markerStyle() ) {
             case MarkerAttributes::MarkerCircle:
             {
                 if ( markerAttributes.threeD() ) {
                     QRadialGradient grad;
                     grad.setCoordinateMode( QGradient::ObjectBoundingMode );
                     QColor drawColor = brush.color();
                     grad.setCenter( 0.5, 0.5 );
                     grad.setRadius( 1.0 );
                     grad.setFocalPoint( 0.35, 0.35 );
                     grad.setColorAt( 0.00, drawColor.lighter( 150 ) );
                     grad.setColorAt( 0.20, drawColor );
                     grad.setColorAt( 0.50, drawColor.darker( 150 ) );
                     grad.setColorAt( 0.75, drawColor.darker( 200 ) );
                     grad.setColorAt( 0.95, drawColor.darker( 250 ) );
                     grad.setColorAt( 1.00, drawColor.darker( 200 ) );
                     QBrush newBrush( grad );
                     newBrush.setMatrix( brush.matrix() );
                     painter->setBrush( newBrush );
                 }
                 painter->drawEllipse( QRectF( 0 - maSize.height()/2, 0 - maSize.width()/2,
                             maSize.height(), maSize.width()) );
             }
                 break;
             case MarkerAttributes::MarkerSquare:
                 {
                     QRectF rect( 0 - maSize.width()/2, 0 - maSize.height()/2,
                                 maSize.width(), maSize.height() );
                     painter->drawRect( rect );
                     break;
                 }
             case MarkerAttributes::MarkerDiamond:
                 {
                     QVector <QPointF > diamondPoints;
                     QPointF top, left, bottom, right;
                     top    = QPointF( 0, 0 - maSize.height()/2 );
                     left   = QPointF( 0 - maSize.width()/2, 0 );
                     bottom = QPointF( 0, maSize.height()/2 );
                     right  = QPointF( maSize.width()/2, 0 );
                     diamondPoints << top << left << bottom << right;
                     painter->drawPolygon( diamondPoints );
                     break;
                 }
             // both handled on top of the method:
             case MarkerAttributes::Marker1Pixel:
             case MarkerAttributes::Marker4Pixels:
                     break;
             case MarkerAttributes::MarkerRing:
                 {
                     painter->setBrush( Qt::NoBrush );
                     painter->setPen( PrintingParameters::scalePen( QPen( brush.color() ) ) );
                     painter->drawEllipse( QRectF( 0 - maSize.height()/2, 0 - maSize.width()/2,
                                         maSize.height(), maSize.width()) );
                     break;
                 }
             case MarkerAttributes::MarkerCross:
                 {
                     // Note: Markers can have outline,
                     //       so just drawing two rects is NOT the solution here!
                     const qreal w02 = maSize.width() * 0.2;
                     const qreal w05 = maSize.width() * 0.5;
                     const qreal h02 = maSize.height()* 0.2;
                     const qreal h05 = maSize.height()* 0.5;
                     QVector <QPointF > crossPoints;
                     QPointF p[12];
                     p[ 0] = QPointF( -w02, -h05 );
                     p[ 1] = QPointF( w02, -h05 );
                     p[ 2] = QPointF( w02, -h02 );
                     p[ 3] = QPointF( w05, -h02 );
                     p[ 4] = QPointF( w05,  h02 );
                     p[ 5] = QPointF( w02,  h02 );
                     p[ 6] = QPointF( w02,  h05 );
                     p[ 7] = QPointF( -w02,  h05 );
                     p[ 8] = QPointF( -w02,  h02 );
                     p[ 9] = QPointF( -w05,  h02 );
                     p[10] = QPointF( -w05, -h02 );
                     p[11] = QPointF( -w02, -h02 );
                     for ( int i=0; i<12; ++i )
                         crossPoints << p[i];
                     crossPoints << p[0];
                     painter->drawPolygon( crossPoints );
                     break;
                 }
             case MarkerAttributes::MarkerFastCross:
                 {
                     QPointF left, right, top, bottom;
                     left  = QPointF( -maSize.width()/2, 0 );
                     right = QPointF( maSize.width()/2, 0 );
                     top   = QPointF( 0, -maSize.height()/2 );
                     bottom= QPointF( 0, maSize.height()/2 );
                     painter->setPen( PrintingParameters::scalePen( QPen( brush.color() ) ) );
                     painter->drawLine( left, right );
                     painter->drawLine( top, bottom );
                     break;
                 }
             case MarkerAttributes::MarkerArrowDown:
                 {
                     QVector <QPointF > arrowPoints;
                     QPointF topLeft, topRight, bottom;
                     topLeft  = QPointF( 0 - maSize.width()/2, 0 - maSize.height()/2 );
                     topRight = QPointF( maSize.width()/2, 0 - maSize.height()/2 );
                     bottom   = QPointF( 0, maSize.height()/2 );
                     arrowPoints << topLeft << bottom << topRight;
                     painter->drawPolygon( arrowPoints );
                     break;
                 }
             case MarkerAttributes::MarkerArrowUp:
                 {
                     QVector <QPointF > arrowPoints;
                     QPointF top, bottomLeft, bottomRight;
                     top         = QPointF( 0, 0 - maSize.height()/2 );
                     bottomLeft  = QPointF( 0 - maSize.width()/2, maSize.height()/2 );
                     bottomRight = QPointF( maSize.width()/2, maSize.height()/2 );
                     arrowPoints << top << bottomLeft << bottomRight;
                     painter->drawPolygon( arrowPoints );
                     break;
                 }
             case MarkerAttributes::MarkerArrowRight:
                 {
                     QVector <QPointF > arrowPoints;
                     QPointF right, topLeft, bottomLeft;
                     right      = QPointF( maSize.width()/2, 0 );
                     topLeft    = QPointF( 0 - maSize.width()/2, 0 - maSize.height()/2 );
                     bottomLeft = QPointF( 0 - maSize.width()/2, maSize.height()/2 );
                     arrowPoints << topLeft << bottomLeft << right;
                     painter->drawPolygon( arrowPoints );
                     break;
                 }
             case MarkerAttributes::MarkerArrowLeft:
                 {
                     QVector <QPointF > arrowPoints;
                     QPointF left, topRight, bottomRight;
                     left        = QPointF( 0 - maSize.width()/2, 0 );
                     topRight    = QPointF( maSize.width()/2, 0 - maSize.height()/2 );
                     bottomRight = QPointF( maSize.width()/2, maSize.height()/2 );
                     arrowPoints << left << bottomRight << topRight;
                     painter->drawPolygon( arrowPoints );
                     break;
                 }
             case MarkerAttributes::MarkerBowTie:
             case MarkerAttributes::MarkerHourGlass:
                 {
                     QVector <QPointF > points;
                     QPointF topLeft, topRight, bottomLeft, bottomRight;
                     topLeft     = QPointF( 0 - maSize.width()/2, 0 - maSize.height()/2);
                     topRight    = QPointF( maSize.width()/2, 0 - maSize.height()/2 );
                     bottomLeft  = QPointF( 0 - maSize.width()/2, maSize.height()/2 );
                     bottomRight = QPointF( maSize.width()/2, maSize.height()/2 );
                     if ( markerAttributes.markerStyle() == MarkerAttributes::MarkerBowTie)
                         points << topLeft << bottomLeft << topRight << bottomRight;
                     else
                         points << topLeft << bottomRight << bottomLeft << topRight;
                     painter->drawPolygon( points );
                     break;
                 }
             case MarkerAttributes::MarkerStar:
                 {
                     const qreal w01 = maSize.width() * 0.1;
                     const qreal w05 = maSize.width() * 0.5;
                     const qreal h01 = maSize.height() * 0.1;
                     const qreal h05 = maSize.height() * 0.5;
                     QVector <QPointF > points;
                     QPointF p1 = QPointF(    0, -h05 );
                     QPointF p2 = QPointF( -w01, -h01 );
                     QPointF p3 = QPointF( -w05,    0 );
                     QPointF p4 = QPointF( -w01,  h01 );
                     QPointF p5 = QPointF(    0,  h05 );
                     QPointF p6 = QPointF(  w01,  h01 );
                     QPointF p7 = QPointF( w05,    0 );
                     QPointF p8 = QPointF( w01, -h01 );
                     points << p1 << p2 << p3 << p4 << p5 << p6 << p7 << p8;
                     painter->drawPolygon( points );
                     break;
                 }
             case MarkerAttributes::MarkerX:
                 {
                     const qreal w01 = maSize.width() * 0.1;
                     const qreal w04 = maSize.width() * 0.4;
                     const qreal w05 = maSize.width() * 0.5;
                     const qreal h01 = maSize.height() * 0.1;
                     const qreal h04 = maSize.height() * 0.4;
                     const qreal h05 = maSize.height() * 0.5;
                     QVector <QPointF > crossPoints;
                     QPointF p1 = QPointF( -w04, -h05 );
                     QPointF p2 = QPointF( -w05, -h04 );
                     QPointF p3 = QPointF( -w01,  0 );
                     QPointF p4 = QPointF( -w05,  h04 );
                     QPointF p5 = QPointF( -w04,  h05 );
                     QPointF p6 = QPointF(  0,    h01 );
                     QPointF p7 = QPointF(  w04,  h05 );
                     QPointF p8 = QPointF(  w05,  h04 );
                     QPointF p9 = QPointF(  w01,  0 );
                     QPointF p10 = QPointF( w05, -h04 );
                     QPointF p11 = QPointF( w04, -h05 );
                     QPointF p12 = QPointF( 0,   -h01 );
                     crossPoints << p1 << p2 << p3 << p4 << p5 << p6
                                 << p7 << p8 << p9 << p10 << p11 << p12;
                     painter->drawPolygon( crossPoints );
                     break;
                 }
             case MarkerAttributes::MarkerAsterisk:
                 {
                     // Note: Markers can have outline,
                     //       so just drawing three lines is NOT the solution here!
                     // The idea that we use is to draw 3 lines anyway, but convert their
                     // outlines to QPainterPaths which are then united and filled.
                     const qreal w04 = maSize.width() * 0.4;
                     const qreal h02 = maSize.height() * 0.2;
                     const qreal h05 = maSize.height() * 0.5;
                     //QVector <QPointF > crossPoints;
                     QPointF p1 = QPointF(    0, -h05 );
                     QPointF p2 = QPointF( -w04, -h02 );
                     QPointF p3 = QPointF( -w04,  h02 );
                     QPointF p4 = QPointF(    0,  h05 );
                     QPointF p5 = QPointF(  w04,  h02 );
                     QPointF p6 = QPointF(  w04, -h02 );
                     QPen pen = painter->pen();
                     QPainterPathStroker stroker;
                     stroker.setWidth( pen.widthF() );
                     stroker.setCapStyle( pen.capStyle() );
 
                     QPainterPath path;
                     QPainterPath dummyPath;
                     dummyPath.moveTo( p1 );
                     dummyPath.lineTo( p4 );
                     path = stroker.createStroke( dummyPath );
 
                     dummyPath = QPainterPath();
                     dummyPath.moveTo( p2 );
                     dummyPath.lineTo( p5 );
                     path = path.united( stroker.createStroke( dummyPath ) );
 
                     dummyPath = QPainterPath();
                     dummyPath.moveTo( p3 );
                     dummyPath.lineTo( p6 );
                     path = path.united( stroker.createStroke( dummyPath ) );
 
                     painter->drawPath( path );
                     break;
                 }
             case MarkerAttributes::MarkerHorizontalBar:
                 {
                     const qreal w05 = maSize.width() * 0.5;
                     const qreal h02 = maSize.height()* 0.2;
                     QVector <QPointF > points;
                     QPointF p1 = QPointF( -w05, -h02 );
                     QPointF p2 = QPointF( -w05,  h02 );
                     QPointF p3 = QPointF(  w05,  h02 );
                     QPointF p4 = QPointF(  w05, -h02 );
                     points << p1 << p2 << p3 << p4;
                     painter->drawPolygon( points );
                     break;
                 }
             case MarkerAttributes::MarkerVerticalBar:
                 {
                     const qreal w02 = maSize.width() * 0.2;
                     const qreal h05 = maSize.height()* 0.5;
                     QVector <QPointF > points;
                     QPointF p1 = QPointF( -w02, -h05 );
                     QPointF p2 = QPointF( -w02,  h05 );
                     QPointF p3 = QPointF(  w02,  h05 );
                     QPointF p4 = QPointF(  w02, -h05 );
                     points << p1 << p2 << p3 << p4;
                     painter->drawPolygon( points );
                     break;
                 }
             case MarkerAttributes::NoMarker:
                 break;
             case MarkerAttributes::PainterPathMarker:
                 {
                     QPainterPath path = markerAttributes.customMarkerPath();
                     const QRectF pathBoundingRect = path.boundingRect();
                     const qreal xScaling = maSize.height() / pathBoundingRect.height();
                     const qreal yScaling = maSize.width() / pathBoundingRect.width();
                     const qreal scaling = qMin( xScaling, yScaling );
                     painter->scale( scaling, scaling );
                     painter->setPen( PrintingParameters::scalePen( QPen( brush.color() ) ) );
                     painter->drawPath(path);
                     break;
                 }
             default:
                 Q_ASSERT_X ( false, "paintMarkers()",
                             "Type item does not match a defined Marker Type." );
         }
     }
     painter->setPen( oldPen );
 }
 
 void AbstractDiagram::paintMarkers( QPainter* painter )
 {
     if ( !checkInvariants() ) {
         return;
     }
 
     const int rowCount = model()->rowCount( rootIndex() );
     const int columnCount = model()->columnCount( rootIndex() );
     for ( int column = 0; column < columnCount; column += datasetDimension() ) {
         for ( int row = 0; row < rowCount; ++row ) {
             QModelIndex index = model()->index( row, column, rootIndex() ); // checked
             qreal x;
             qreal y;
             if ( datasetDimension() == 1 ) {
                 x = row;
                 y = index.data().toReal();
             } else {
                 x = index.data().toReal();
                 y = model()->index( row, column + 1, rootIndex() ).data().toReal();
             }
             paintMarker( painter, index, coordinatePlane()->translate( QPointF( x, y ) ) );
         }
     }
 }
 
 
 void AbstractDiagram::setPen( const QModelIndex& index, const QPen& pen )
 {
     attributesModel()->setData(
         conditionallyMapFromSource( index ),
         QVariant::fromValue( pen ), DatasetPenRole );
     emit propertiesChanged();
 }
 
 void AbstractDiagram::setPen( const QPen& pen )
 {
     attributesModel()->setModelData(
         QVariant::fromValue( pen ), DatasetPenRole );
     emit propertiesChanged();
 }
 
 void AbstractDiagram::setPen( int dataset, const QPen& pen )
 {
     d->setDatasetAttrs( dataset, QVariant::fromValue( pen ), DatasetPenRole );
     emit propertiesChanged();
 }
 
 QPen AbstractDiagram::pen() const
 {
     return attributesModel()->data( DatasetPenRole ).value< QPen >();
 }
 
 QPen AbstractDiagram::pen( int dataset ) const
 {
     const QVariant penSettings( d->datasetAttrs( dataset, DatasetPenRole ) );
     if ( penSettings.isValid() )
         return penSettings.value< QPen >();
     return pen();
 }
 
 QPen AbstractDiagram::pen( const QModelIndex& index ) const
 {
     return  attributesModel()->data(
             conditionallyMapFromSource( index ),
             DatasetPenRole ).value< QPen >();
 }
 
 void AbstractDiagram::setBrush( const QModelIndex& index, const QBrush& brush )
 {
     attributesModel()->setData(
         conditionallyMapFromSource( index ),
         QVariant::fromValue( brush ), DatasetBrushRole );
     emit propertiesChanged();
 }
 
 void AbstractDiagram::setBrush( const QBrush& brush )
 {
     attributesModel()->setModelData(
         QVariant::fromValue( brush ), DatasetBrushRole );
     emit propertiesChanged();
 }
 
 void AbstractDiagram::setBrush( int dataset, const QBrush& brush )
 {
     d->setDatasetAttrs( dataset, QVariant::fromValue( brush ), DatasetBrushRole );
     emit propertiesChanged();
 }
 
 QBrush AbstractDiagram::brush() const
 {
     return attributesModel()->data( DatasetBrushRole ).value< QBrush >();
 }
 
 QBrush AbstractDiagram::brush( int dataset ) const
 {
     const QVariant brushSettings( d->datasetAttrs( dataset, DatasetBrushRole ) );
     if ( brushSettings.isValid() )
         return brushSettings.value< QBrush >();
     return brush();
 }
 
 QBrush AbstractDiagram::brush( const QModelIndex& index ) const
 {
     return 
         attributesModel()->data( conditionallyMapFromSource( index ), DatasetBrushRole ).value< QBrush >();
 }
 
-/**
+/*
   * Sets the unit prefix for one value
   * @param prefix the prefix to be set
   * @param column the value using that prefix
   * @param orientation the orientantion of the axis to set
   */
 void AbstractDiagram::setUnitPrefix( const QString& prefix, int column, Qt::Orientation orientation )
 {
     d->unitPrefixMap[ column ][ orientation ]= prefix;
 }
 
-/**
+/*
   * Sets the unit prefix for all values
   * @param prefix the prefix to be set
   * @param orientation the orientantion of the axis to set
   */
 void AbstractDiagram::setUnitPrefix( const QString& prefix, Qt::Orientation orientation )
 {
     d->unitPrefix[ orientation ] = prefix;
 }
 
-/**
+/*
   * Sets the unit suffix for one value
   * @param suffix the suffix to be set
   * @param column the value using that suffix
   * @param orientation the orientantion of the axis to set
   */
 void AbstractDiagram::setUnitSuffix( const QString& suffix, int column, Qt::Orientation orientation )
 {
     d->unitSuffixMap[ column ][ orientation ]= suffix;
 }
 
-/**
+/*
   * Sets the unit suffix for all values
   * @param suffix the suffix to be set
   * @param orientation the orientantion of the axis to set
   */
 void AbstractDiagram::setUnitSuffix( const QString& suffix, Qt::Orientation orientation )
 {
     d->unitSuffix[ orientation ] = suffix;
 }
 
-/**
+/*
   * Returns the unit prefix for a special value
   * @param column the value which's prefix is requested
   * @param orientation the orientation of the axis
   * @param fallback if true, the global prefix is return when no specific one is set for that value
   * @return the unit prefix
   */
 QString AbstractDiagram::unitPrefix( int column, Qt::Orientation orientation, bool fallback ) const
 {
     if ( !fallback || d->unitPrefixMap[ column ].contains( orientation ) )
         return d->unitPrefixMap[ column ][ orientation ];
     return d->unitPrefix[ orientation ];
 }
 
-/** Returns the global unit prefix
+/* Returns the global unit prefix
   * @param orientation the orientation of the axis
   * @return the unit prefix
   */
 QString AbstractDiagram::unitPrefix( Qt::Orientation orientation ) const
 {
     return d->unitPrefix[ orientation ];
 }
 
-/**
+/*
   * Returns the unit suffix for a special value
   * @param column the value which's suffix is requested
   * @param orientation the orientation of the axis
   * @param fallback if true, the global suffix is return when no specific one is set for that value
   * @return the unit suffix
   */
 QString AbstractDiagram::unitSuffix( int column, Qt::Orientation orientation, bool fallback ) const
 {
     if ( !fallback || d->unitSuffixMap[ column ].contains( orientation ) )
         return d->unitSuffixMap[ column ][ orientation ];
     return d->unitSuffix[ orientation ];
 }
 
-/** Returns the global unit suffix
+/* Returns the global unit suffix
   * @param orientation the orientation of the axis
   * @return the unit siffix
   */
 QString AbstractDiagram::unitSuffix( Qt::Orientation orientation ) const
 {
     return d->unitSuffix[ orientation ];
 }
 
 // implement QAbstractItemView:
 QRect AbstractDiagram::visualRect( const QModelIndex &index ) const
 {
     return d->reverseMapper.boundingRect( index.row(), index.column() ).toRect();
 }
 
 void AbstractDiagram::scrollTo(const QModelIndex &, ScrollHint )
 {}
 
 // indexAt ... down below
 
 QModelIndex AbstractDiagram::moveCursor(CursorAction, Qt::KeyboardModifiers )
 { return QModelIndex(); }
 
 int AbstractDiagram::horizontalOffset() const
 { return 0; }
 
 int AbstractDiagram::verticalOffset() const
 { return 0; }
 
 bool AbstractDiagram::isIndexHidden(const QModelIndex &) const
 { return true; }
 
 void AbstractDiagram::setSelection(const QRect& rect , QItemSelectionModel::SelectionFlags command )
 {
     const QModelIndexList indexes = d->indexesIn( rect );
     QItemSelection selection;
     Q_FOREACH( const QModelIndex& index, indexes )
     {
         selection.append( QItemSelectionRange( index ) );
     }
     selectionModel()->select( selection, command );
 }
 
 QRegion AbstractDiagram::visualRegionForSelection(const QItemSelection &selection) const
 {
     QPolygonF polygon;
     Q_FOREACH( const QModelIndex& index, selection.indexes() )
     {
         polygon << d->reverseMapper.polygon(index.row(), index.column());
     }
     return polygon.isEmpty() ? QRegion() : QRegion( polygon.toPolygon() );
 }
 
 QRegion AbstractDiagram::visualRegion(const QModelIndex &index) const
 {
     QPolygonF polygon = d->reverseMapper.polygon(index.row(), index.column());
     return polygon.isEmpty() ? QRegion() : QRegion( polygon.toPolygon() );
 }
 
 void KChart::AbstractDiagram::useDefaultColors( )
 {
     d->attributesModel->setPaletteType( AttributesModel::PaletteTypeDefault );
 }
 
 void KChart::AbstractDiagram::useSubduedColors( )
 {
     d->attributesModel->setPaletteType( AttributesModel::PaletteTypeSubdued );
 }
 
 void KChart::AbstractDiagram::useRainbowColors( )
 {
     d->attributesModel->setPaletteType( AttributesModel::PaletteTypeRainbow );
 }
 
 QStringList AbstractDiagram::itemRowLabels() const
 {
     QStringList ret;
     if ( model() ) {
         //qDebug() << "AbstractDiagram::itemRowLabels(): " << attributesModel()->rowCount(attributesModelRootIndex()) << "entries";
         const int rowCount = attributesModel()->rowCount(attributesModelRootIndex());
         for ( int i = 0; i < rowCount; ++i ) {
             //qDebug() << "item row label: " << attributesModel()->headerData( i, Qt::Vertical, Qt::DisplayRole ).toString();
             ret << unitPrefix( i, Qt::Horizontal, true ) +
                    attributesModel()->headerData( i, Qt::Vertical, Qt::DisplayRole ).toString() +
                    unitSuffix( i, Qt::Horizontal, true );
         }
     }
     return ret;
 }
 
 QStringList AbstractDiagram::datasetLabels() const
 {
     QStringList ret;
     if ( !model() ) {
         return ret;
     }
     const int datasetCount = d->datasetCount();
     for ( int i = 0; i < datasetCount; ++i ) {
         ret << d->datasetAttrs( i, Qt::DisplayRole ).toString();
     }
     return ret;
 }
 
 QList<QBrush> AbstractDiagram::datasetBrushes() const
 {
     QList<QBrush> ret;
     if ( !model() ) {
         return ret;
     }
     const int datasetCount = d->datasetCount();
     for ( int i = 0; i < datasetCount; ++i ) {
         ret << brush( i );
     }
     return ret;
 }
 
 QList<QPen> AbstractDiagram::datasetPens() const
 {
     QList<QPen> ret;
     if ( !model() ) {
         return ret;
     }
     const int datasetCount = d->datasetCount();
     for ( int i = 0; i < datasetCount; ++i ) {
         ret << pen( i );
     }
     return ret;
 }
 
 QList<MarkerAttributes> AbstractDiagram::datasetMarkers() const
 {
     QList<MarkerAttributes> ret;
     if ( !model() ) {
         return ret;
     }
     const int datasetCount = d->datasetCount();
     for ( int i = 0; i < datasetCount; ++i ) {
         ret << dataValueAttributes( i ).markerAttributes();
     }
     return ret;
 }
 
 bool AbstractDiagram::checkInvariants( bool justReturnTheStatus ) const
 {
     if ( ! justReturnTheStatus ) {
         Q_ASSERT_X ( model(), "AbstractDiagram::checkInvariants()",
                     "There is no usable model set, for the diagram." );
 
         Q_ASSERT_X ( coordinatePlane(), "AbstractDiagram::checkInvariants()",
                     "There is no usable coordinate plane set, for the diagram." );
     }
     return model() && coordinatePlane();
 }
 
 int AbstractDiagram::datasetDimension( ) const
 {
     return d->datasetDimension;
 }
 
 void AbstractDiagram::setDatasetDimension( int dimension )
 {
     Q_UNUSED( dimension );
     qDebug() << "Setting the dataset dimension using AbstractDiagram::setDatasetDimension is "
                 "obsolete. Use the specific diagram types instead.";
 }
 
 void AbstractDiagram::setDatasetDimensionInternal( int dimension )
 {
     Q_ASSERT( dimension != 0 );
     if ( d->datasetDimension == dimension ) {
         return;
     }
     d->datasetDimension = dimension;
     d->attributesModel->setDatasetDimension( dimension );
     setDataBoundariesDirty();
     emit layoutChanged( this );
 }
 
 qreal AbstractDiagram::valueForCell( int row, int column ) const
 {
     if ( !d->attributesModel->hasIndex( row, column, attributesModelRootIndex() ) ) {
         qWarning() << "AbstractDiagram::valueForCell(): Requesting value for invalid index!";
         return std::numeric_limits<qreal>::quiet_NaN();
     }
     return d->attributesModel->data(
             d->attributesModel->index( row, column, attributesModelRootIndex() ) ).toReal(); // checked
 }
 
 void AbstractDiagram::update() const
 {
     if ( d->plane ) {
         d->plane->update();
     }
 }
 
 QModelIndex AbstractDiagram::indexAt( const QPoint& point ) const
 {
     return d->indexAt( point );
 }
 
 QModelIndexList AbstractDiagram::indexesAt( const QPoint& point ) const
 {
     return d->indexesAt( point );
 }
 
 QModelIndexList AbstractDiagram::indexesIn( const QRect& rect ) const
 {
     return d->indexesIn( rect );
 }