diff --git a/src/common/KReportData.cpp b/src/common/KReportData.cpp
index 8f38f4c3..ad02579c 100644
--- a/src/common/KReportData.cpp
+++ b/src/common/KReportData.cpp
@@ -1,79 +1,79 @@
 /* This file is part of the KDE project
  * Copyright (C) 2007-2010 by Adam Pigg (adam@piggz.co.uk)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "KReportData.h"
 #include <QVariant>
 
 KReportData::~KReportData()
 {
 }
 
 KReportData::SortedField::SortedField()
     : order(Qt::AscendingOrder)
 {
 }
 
 QStringList KReportData::fieldKeys() const
 {
     return fieldNames();
 }
 
 QString KReportData::sourceName() const
 {
     return QString();
 }
 
 void KReportData::setSorting(const QList<SortedField> &sorting)
 {
     Q_UNUSED(sorting);
 }
 
 void KReportData::addExpression(const QString &field, const QVariant &value, char relation)
 {
     Q_UNUSED(field);
     Q_UNUSED(value);
     Q_UNUSED(relation);
 }
 
 #ifdef KREPORT_SCRIPTING
 QStringList KReportData::scriptList() const
 {
     return QStringList();
 }
 
 QString KReportData::scriptCode(const QString &script) const
 {
     Q_UNUSED(script);
     return QString();
 }
 #endif
 
 QStringList KReportData::dataSources() const
 {
     return QStringList();
 }
 
 QStringList KReportData::dataSourceNames() const
 {
     return dataSources();
 }
 
-KReportData* KReportData::data(const QString &source)
+KReportData* KReportData::create(const QString &source)
 {
     Q_UNUSED(source);
     return 0;
 }
diff --git a/src/common/KReportData.h b/src/common/KReportData.h
index 69a895e8..46795ef4 100644
--- a/src/common/KReportData.h
+++ b/src/common/KReportData.h
@@ -1,120 +1,120 @@
 /* This file is part of the KDE project
  * Copyright (C) 2007-2010 by Adam Pigg (adam@piggz.co.uk)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef KREPORTDATA_H
 #define KREPORTDATA_H
 
 #include <QStringList>
 #include <QVariant>
 
 #include "kreport_export.h"
 #include "config-kreport.h"
 
 /**
 
 */
 class KREPORT_EXPORT KReportData
 {
 
 public:
     virtual ~KReportData();
 
     //! Describes sorting for single field
     /*! By default the order is ascending. */
     class KREPORT_EXPORT SortedField
     {
     public:
         SortedField();
         QString field;
         Qt::SortOrder order;
     };
 
     //! Open the dataset
     virtual bool open() = 0;
 
     //! Close the dataset
     virtual bool close() = 0;
 
     //! Move to the next record
     virtual bool moveNext() = 0;
 
     //! Move to the previous record
     virtual bool movePrevious() = 0;
 
     //! Move to the first record
     virtual bool moveFirst() = 0;
 
     //! Move to the last record
     virtual bool moveLast() = 0;
 
     //! Return the current position in the dataset
     virtual qint64 at() const = 0;
 
     //! Return the total number of records
     virtual qint64 recordCount() const = 0;
 
     //! Return the index number of the field given by nane field
     virtual int fieldNumber(const QString &field) const = 0;
 
     //! Return the list of field names
     virtual QStringList fieldNames() const = 0;
 
     //! Return the list of field keys. Returns fieldNames() by default
     virtual QStringList fieldKeys() const;
 
     //! Return the value of the field at the given position for the current record
     virtual QVariant value(unsigned int) const = 0;
 
     //! Return the value of the field fir the given name for the current record
     virtual QVariant value(const QString &field) const = 0;
 
     //! Return the name of this source
     virtual QString sourceName() const;
 
     //! Sets the sorting for the data
     //! Should be called before open() so that the data source can be edited accordingly
     //! Default impl does nothing
     virtual void setSorting(const QList<SortedField> &sorting);
 
     //! Adds an expression to the data source
     virtual void addExpression(const QString &field, const QVariant &value, char relation = '=');
 
     //! Utility Functions
     //! @todo These are probably eligable to be moved into a new class
 
 #ifdef KREPORT_SCRIPTING
     //! Allow the reportdata implementation to return a list of possible scripts
     virtual QStringList scriptList() const;
 
     //! Allow the reportdata implementation to return some script code based on a specific script name
     //! as set in the report
     virtual QString scriptCode(const QString& script) const;
 #endif
 
     //! Return a list of data sources possible for advanced controls
     virtual QStringList dataSources() const;
 
     //! Return a list of data source names possible for advanced controls.
     //! Returns dataSources() by default
     virtual QStringList dataSourceNames() const;
 
-    //! Allow a driver to create a new instance with a new data source
-    //! source is a driver specific identifier
-    //! Owner of the returned pointer is the caller
-    virtual KReportData* data(const QString &source);
+    //! Creates a new instance with data source. Default implementation returns @c nullptr.
+    //! @a source is a driver-specific identifier.
+    //! Owner of the returned pointer is the caller.
+    virtual KReportData* create(const QString &source);
 };
 
 #endif
diff --git a/src/plugins/chart/KReportItemChart.cpp b/src/plugins/chart/KReportItemChart.cpp
index bdcbe5ea..a8e0e9f6 100644
--- a/src/plugins/chart/KReportItemChart.cpp
+++ b/src/plugins/chart/KReportItemChart.cpp
@@ -1,431 +1,431 @@
 /* This file is part of the KDE project
  * Copyright (C) 2007-2010 by Adam Pigg (adam@piggz.co.uk)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "KoReportItemChart.h"
 
 #include "KReportRenderObjects.h"
 
 #include <KDChartBarDiagram>
 #include <KDChartThreeDBarAttributes>
 #include <KDChartLineDiagram>
 #include <KDChartThreeDLineAttributes>
 #include <KDChartPieDiagram>
 #include <KDChartThreeDPieAttributes>
 #include <KDChartLegend>
 #include <KDChartCartesianAxis>
 #include <KDChartChart>
 #include <KDChartBackgroundAttributes>
 #include <KDChartAbstractDiagram>
 #include <KDChartAbstractCoordinatePlane>
 #include <KDChartPosition>
 
 #include <KProperty>
 #include <KPropertySet>
 
 #include "kreportplugin_debug.h"
 #include <QFontDatabase>
 
 typedef QVector<double> datalist;
 
 KReportItemChart::KReportItemChart()
 {
     m_reportData = 0;
     createProperties();
 }
 
 KReportItemChart::KReportItemChart(QDomNode *element)
 {
     m_reportData = 0;
     createProperties();
 
     QDomNodeList nl = element->childNodes();
 
     QString n;
     QDomNode node;
     QDomElement e = element->toElement();
     m_name->setValue(e.attribute("report:name"));
     m_dataSource->setValue(e.attribute("report:data-source"));
     Z = e.attribute("report:z-index").toDouble();
     m_chartType->setValue(e.attribute("report:chart-type").toInt());
     m_chartSubType->setValue(e.attribute("report:chart-sub-type").toInt());
     m_threeD->setValue(e.attribute("report:three-dimensions"));
 
     m_colorScheme->setValue(e.attribute("report:chart-color-scheme"));
     m_aa->setValue(e.attribute("report:antialiased"));
     m_xTitle->setValue(e.attribute("report:title-x-axis"));
     m_yTitle->setValue(e.attribute("report:title-y-axis"));
     m_backgroundColor->setValue(e.attribute("report:background-color"));
     m_displayLegend->setValue(e.attribute("report:display-legend"));
     m_legendPosition->setValue(e.attribute("report:legend-position"));
     m_legendOrientation->setValue(e.attribute("report:legend-orientation"));
     m_linkMaster->setValue(e.attribute("report:link-master"));
     m_linkChild->setValue(e.attribute("report:link-child"));
 
     parseReportRect(e, &m_pos, &m_size);
 
 }
 
 
 KReportItemChart::~KReportItemChart()
 {
     delete m_set;
 }
 
 void KReportItemChart::createProperties()
 {
     m_chartWidget = 0;
     m_set = new KPropertySet(0, "Chart");
 
     QStringList strings;
     QList<QVariant> keys;
     QStringList stringkeys;
 
     m_dataSource = new KProperty("data-source", QStringList(), QStringList(), QString(), tr("Data Source"));
 
     m_dataSource->setOption("extraValueAllowed", "true");
 
     m_font = new KProperty("font", QFontDatabase::systemFont(QFontDatabase::GeneralFont), tr("Font"), tr("Field Font"));
 
     keys << 1 << 2 << 3 << 4 << 5;
     strings << tr("Bar") << tr("Line") << tr("Pie") << tr("Ring") << tr("Polar");
     KProperty::ListData *typeData = new KProperty::ListData(keys, strings);
     m_chartType = new KProperty("chart-type", typeData, 1, tr("Chart Type"));
 
     keys.clear();
     strings.clear();
     keys << 0 << 1 << 2 << 3;
     strings << tr("Normal") << tr("Stacked") << tr("Percent") << tr("Rows");
 
     KProperty::ListData *subData = new KProperty::ListData(keys, strings);
 
     m_chartSubType = new KProperty("chart-sub-type", subData, 0, tr("Chart Sub Type"));
 
     keys.clear();
     strings.clear();
     stringkeys << "default" << "rainbow" << "subdued";
     strings << tr("Default") << tr("Rainbow") << tr("Subdued");
     m_colorScheme = new KProperty("chart-color-scheme", stringkeys, strings, "default", tr("Color Scheme"));
 
     m_threeD = new KProperty("three-dimensions", QVariant(false),
         tr("3D", "Three dimensions"));
     m_aa = new KProperty("antialiased", QVariant(false), tr("Antialiased"));
 
     m_xTitle = new KProperty("title-x-axis", QString(), tr("X Axis Title"), tr("X Axis Title"));
     m_yTitle = new KProperty("title-y-axis", QString(), tr("Y Axis Title"), tr("Y Axis Title"));
 
     m_displayLegend = new KProperty("display-legend", true, tr("Display Legend"), tr("Display Legend"));
 
     keys.clear();
     strings.clear();
     keys << (int)KDChartEnums::PositionNorth
             << (int)KDChartEnums::PositionEast
             << (int)KDChartEnums::PositionSouth
             << (int)KDChartEnums::PositionWest;
     QStringList names = KDChart::Position::printableNames();
     foreach (const QVariant &pos, keys) {
         strings << names[pos.toInt()-1];
     }
     subData = new KProperty::ListData(keys, strings);
     m_legendPosition = new KProperty("legend-position", subData, (int)KDChartEnums::PositionEast, tr("Legend Position"));
 
     keys.clear();
     strings.clear();
     keys << Qt::Horizontal << Qt::Vertical;
     strings << tr("Horizontal") << tr("Vertical");
     subData = new KProperty::ListData(keys, strings);
     m_legendOrientation = new KProperty("legend-orientation", subData, Qt::Vertical, tr("Legend Orientation"));
 
     m_backgroundColor = new KProperty("background-color", Qt::white,
         tr("Background Color"), tr("Background Color"));
 
     m_linkMaster = new KProperty("link-master", QString(), tr("Link Master"),
         tr("Fields from master data source"));
     m_linkChild = new KProperty("link-child", QString(), tr("Link Child"),
         tr("Fields from child data source"));
 
     addDefaultProperties();
     m_set->addProperty(m_dataSource);
     m_set->addProperty(m_chartType);
     m_set->addProperty(m_chartSubType);
     m_set->addProperty(m_font);
     m_set->addProperty(m_colorScheme);
     m_set->addProperty(m_threeD);
     m_set->addProperty(m_aa);
     m_set->addProperty(m_xTitle);
     m_set->addProperty(m_yTitle);
     m_set->addProperty(m_backgroundColor);
     m_set->addProperty(m_displayLegend);
     m_set->addProperty(m_legendPosition);
     m_set->addProperty(m_legendOrientation);
     m_set->addProperty(m_linkMaster);
     m_set->addProperty(m_linkChild);
 
     set3D(false);
     setAA(false);
     setColorScheme("default");
 }
 
 void KReportItemChart::set3D(bool td)
 {
     if (m_chartWidget && m_chartWidget->barDiagram()) {
         KDChart::BarDiagram *bar = m_chartWidget->barDiagram();
         bar->setPen(QPen(Qt::black));
 
         KDChart::ThreeDBarAttributes threed = bar->threeDBarAttributes();
         threed.setEnabled(td);
         threed.setDepth(10);
         threed.setAngle(15);
         threed.setUseShadowColors(true);
         bar->setThreeDBarAttributes(threed);
     }
 
 }
 void KReportItemChart::setAA(bool aa)
 {
     if (m_chartWidget && m_chartWidget->diagram()) {
         m_chartWidget->diagram()->setAntiAliasing(aa);
     }
 }
 
 void KReportItemChart::setColorScheme(const QString &cs)
 {
     if (m_chartWidget && m_chartWidget->diagram()) {
         if (cs == "rainbow") {
             m_chartWidget->diagram()->useRainbowColors();
         } else if (cs == "subdued") {
             m_chartWidget->diagram()->useSubduedColors();
         } else {
             m_chartWidget->diagram()->useDefaultColors();
         }
     }
 }
 
 void KReportItemChart::setConnection(KReportData *c)
 {
     m_reportData = c;
     populateData();
 }
 
 void KReportItemChart::populateData()
 {
     QVector<datalist> data;
     QStringList labels;
 
     QStringList fn;
 
 
     delete m_chartWidget;
     m_chartWidget = 0;
 
     if (m_reportData) {
         QString src = m_dataSource->value().toString();
 
         if (!src.isEmpty()) {
-            KReportData *curs = m_reportData->data(src);
+            KReportData *curs = m_reportData->create(src);
             if (curs) {
                 const QStringList keys = m_links.keys();
                 foreach(const QString& field, keys) {
                     kreportpluginDebug() << "Adding Expression:" << field << m_links[field];
                     curs->addExpression(field, m_links[field], '=');
                 }
             }
             if (curs && curs->open()) {
                 fn = curs->fieldNames();
                 //resize the data lists to match the number of columns
                 int cols = fn.count() - 1;
                 if ( cols > 0 ) {
                     data.resize(cols);
                 }
 
                 m_chartWidget = new KDChart::Widget();
                 m_chartWidget->setType((KDChart::Widget::ChartType) m_chartType->value().toInt());
                 m_chartWidget->setSubType((KDChart::Widget::SubType) m_chartSubType->value().toInt());
                 set3D(m_threeD->value().toBool());
                 setAA(m_aa->value().toBool());
                 setColorScheme(m_colorScheme->value().toString());
                 setBackgroundColor(m_backgroundColor->value().value<QColor>());
                 curs->moveFirst();
                 //bool status = true;
                 do {
                     labels << curs->value(0).toString();
                     for (int i = 1; i <= cols; ++i) {
                         data[i - 1] << curs->value(i).toDouble();
                     }
                 } while (curs->moveNext());
 
                 for (int i = 1; i <= cols; ++i) {
                     m_chartWidget->setDataset(i - 1, data[i - 1], fn[i]);
                 }
 
                 setLegend(m_displayLegend->value().toBool(), fn);
 
                 //Add the axis
                 setAxis(m_xTitle->value().toString(), m_yTitle->value().toString());
 
                 //Add the bottom labels
                 if (m_chartWidget->barDiagram() || m_chartWidget->lineDiagram()) {
                     KDChart::AbstractCartesianDiagram *dia = static_cast<KDChart::AbstractCartesianDiagram*>(m_chartWidget->diagram());
 
                     foreach(KDChart::CartesianAxis* axis, dia->axes()) {
                         if (axis->position() == KDChart::CartesianAxis::Bottom) {
                             axis->setLabels(labels);
                         }
                     }
                 }
             } else {
                 kreportpluginDebug() << "Unable to open data set";
             }
             delete curs;
             curs = 0;
         } else {
             kreportpluginDebug() << "No source set";
         }
     } else {
         kreportpluginDebug() << "No connection!";
     }
 }
 
 QStringList KReportItemChart::masterFields()
 {
     return m_linkMaster->value().toString().split(',');
 }
 
 void KReportItemChart::setLinkData(QString fld, QVariant val)
 {
     kreportpluginDebug() << "Field: " << fld << "is" << val;
     m_links[fld] = val;
 }
 
 void KReportItemChart::setAxis(const QString& xa, const QString &ya)
 {
     if (!m_chartWidget) {
         return;
     }
     Q_ASSERT(m_chartWidget);
 
     if (m_chartWidget->barDiagram() || m_chartWidget->lineDiagram()) {
         KDChart::AbstractCartesianDiagram *dia = static_cast<KDChart::AbstractCartesianDiagram*>(m_chartWidget->diagram());
         KDChart::CartesianAxis *xAxis = 0;
         KDChart::CartesianAxis *yAxis = 0;
 
         //delete existing axis
         foreach(KDChart::CartesianAxis* axis, dia->axes()) {
             if (axis->position() == KDChart::CartesianAxis::Bottom) {
                 xAxis = axis;
             }
             if (axis->position() == KDChart::CartesianAxis::Left) {
                 yAxis = axis;
             }
         }
 
         if (!xAxis) {
             xAxis =  new KDChart::CartesianAxis(static_cast<KDChart::AbstractCartesianDiagram*>(m_chartWidget->diagram()));
             xAxis->setPosition(KDChart::CartesianAxis::Bottom);
             dia->addAxis(xAxis);
         }
 
         if (!yAxis) {
             yAxis = new KDChart::CartesianAxis(static_cast<KDChart::AbstractCartesianDiagram*>(m_chartWidget->diagram()));
             yAxis->setPosition(KDChart::CartesianAxis::Left);
             dia->addAxis(yAxis);
         }
 
         xAxis->setTitleText(xa);
         yAxis->setTitleText(ya);
     }
 }
 
 void KReportItemChart::setBackgroundColor(const QColor&)
 {
     //Set the background color
     if (!m_chartWidget) {
         return;
     }
     KDChart::Chart *cht = m_chartWidget->diagram()->coordinatePlane()->parent();
 
     KDChart::BackgroundAttributes ba;
 
     ba.setVisible(true);
     ba.setBrush(m_backgroundColor->value().value<QColor>());
     cht->setBackgroundAttributes(ba);
 }
 
 void KReportItemChart::setLegend(bool le, const QStringList &legends)
 {
     //Add the legend
     if (m_chartWidget) {
         if (le && ! legends.isEmpty()) {
             m_chartWidget->addLegend(KDChart::Position((KDChartEnums::PositionValue)m_legendPosition->value().toInt()));
             m_chartWidget->legend()->setOrientation((Qt::Orientation) m_legendOrientation->value().toInt());
             m_chartWidget->legend()->setTitleText("Legend");
             for (int i = 1; i < legends.count(); ++i) {
                 m_chartWidget->legend()->setText(i - 1, legends[i]);
             }
 
             m_chartWidget->legend()->setShowLines(true);
         } else {
             if (m_chartWidget->legend()) {
                 m_chartWidget->takeLegend(m_chartWidget->legend());
             }
         }
     }
 }
 
 // RTTI
 QString KReportItemChart::typeName() const
 {
     return "chart";
 }
 
 int KReportItemChart::renderReportData(OROPage *page, OROSection *section, const QPointF &offset,
                                         KReportData *data, KReportScriptHandler *script)
 {
     Q_UNUSED(script);
 
     setConnection(data);
 
     QStringList masters = masterFields();
     for (int i = 0; i < masters.size(); ++i) {
         if (!masters[i].simplified().isEmpty()) {
             setLinkData(masters[i], data->value(masters[i]));
         }
     }
     populateData();
     if (widget()) {
         OROPicture * pic = new OROPicture();
         widget()->setFixedSize(m_size.toScene().toSize());
 
         QPainter p(pic->picture());
 
         widget()->diagram()->coordinatePlane()->parent()->paint(&p, QRect(QPoint(0, 0), m_size.toScene().toSize()));
 
         QPointF pos = m_pos.toScene();
         QSizeF size = m_size.toScene();
 
         pos += offset;
 
         pic->setPosition(pos);
         pic->setSize(size);
         if (page) page->addPrimitive(pic);
 
         OROPicture *p2 = static_cast<OROPicture*>(pic->clone());
         p2->setPosition(m_pos.toPoint());
         if (section) section->addPrimitive(p2);
     }
 
     return 0;
 }
diff --git a/src/renderer/KReportPage.h b/src/renderer/KReportPage.h
index 60625460..e8f850e5 100644
--- a/src/renderer/KReportPage.h
+++ b/src/renderer/KReportPage.h
@@ -1,57 +1,58 @@
 /* This file is part of the KDE project
  * Copyright (C) 2007-2008 by Adam Pigg (adam@piggz.co.uk)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef KREPORTPAGE_H
 #define KREPORTPAGE_H
 
 #include "kreport_export.h"
 
 #include <QGraphicsRectItem>
 #include <QObject>
 
 class ORODocument;
 
 /**
  Provides a widget that renders a specific page of
  and ORODocument
  The widget is sized to the document size in pixels.
 */
 class KREPORT_EXPORT KReportPage : public QObject, public QGraphicsRectItem
 {
     Q_OBJECT
 public:
     KReportPage(QWidget *parent, ORODocument *document);
 
     ~KReportPage();
 
+    //! Renders page @a page (counted from 1).
     void renderPage(int page);
 
 public Q_SLOTS:
     virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
 
     void pageUpdated(int pageNo);
 
 private Q_SLOTS:
     void renderCurrentPage();
 
 private:
     Q_DISABLE_COPY(KReportPage)
     class Private;
     Private * const d;
 };
 
 #endif