diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index b9a2f14d..cc69ff28 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,15 +1,15 @@
-#ecm_optional_add_subdirectory(barcode)
+ecm_optional_add_subdirectory(barcode)
 
 if(NOT WIN32)
 #todo  ecm_optional_add_subdirectory(chart)
 endif()
 
 find_package(Marble)
 if(Marble_FOUND)
   ecm_optional_add_subdirectory(maps)
 endif()
 
 find_package(Qt5WebKitWidgets)
 if(Qt5WebKitWidgets_FOUND)
   ecm_optional_add_subdirectory(web)
 endif()
diff --git a/src/plugins/barcode/KReportItemBarcode.cpp b/src/plugins/barcode/KReportItemBarcode.cpp
index 95713a4e..44e3381b 100644
--- a/src/plugins/barcode/KReportItemBarcode.cpp
+++ b/src/plugins/barcode/KReportItemBarcode.cpp
@@ -1,253 +1,253 @@
 /* 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/>.
  */
 
 #include "KReportItemBarcode.h"
 
 #include <KProperty>
 #include <KPropertySet>
 
 #include <QDomNode>
 
 #include "kreportplugin_debug.h"
 
 #include "barcodes.h"
 
 KReportItemBarcode::KReportItemBarcode()
     : KReportItemBarcode(QDomNode())
 {
 }
 
 KReportItemBarcode::KReportItemBarcode(const QDomNode & element)
     : m_minWidthData(0), m_minWidthTotal(0), m_minHeight(0)
 {
     createProperties();
     QDomNodeList nl = element.childNodes();
     QString n;
     QDomNode node;
 
     nameProperty()->setValue(element.toElement().attribute(QLatin1String("report:name")));
     m_controlSource->setValue(element.toElement().attribute(QLatin1String("report:item-data-source")));
     m_itemValue->setValue(element.toElement().attribute(QLatin1String("report:value")));
     setZ(element.toElement().attribute(QLatin1String("report:z-index")).toDouble());
     m_horizontalAlignment->setValue(element.toElement().attribute(QLatin1String("report:horizontal-align")));
-    m_maxLength->setValue(element.toElement().attribute(QLatin1String("report:barcode-max-length")));
+    m_maxLength->setValue(element.toElement().attribute(QLatin1String("report:barcode-max-length")).toInt());
     m_format->setValue(element.toElement().attribute(QLatin1String("report:barcode-format")));
     parseReportRect(element.toElement());
 
 }
 
 void KReportItemBarcode::setMaxLength(int i)
 {
     if (i > 0) {
         if (m_maxLength->value().toInt() != i) {
             m_maxLength->setValue(i);
         }
         if (m_format->value().toString() == QLatin1String("3of9")) {
             int C = i; // number of characters
             int N = 2; // narrow mult for wide line
             int X = 1; // narrow line width
             int I = 1; // interchange line width
             m_minWidthData = (((C + 2) * ((3 * N) + 6) * X) + ((C + 1) * I)) / 100.0;
             //m_minHeight = m_minWidthData * 0.15;
             /*if(min_height < 0.25)*/
             m_minHeight = 0.25;
             m_minWidthTotal = m_minWidthData + 0.22; // added a little buffer to make sure we don't loose any
             // of our required quiet zone in conversions
         } else if (m_format->value().toString() == QLatin1String("3of9+")) {
             int C = i * 2; // number of characters
             int N = 2; // narrow mult for wide line
             int X = 1; // 1px narrow line
             int I = 1; // 1px narrow line interchange
             m_minWidthData = (((C + 2) * ((3 * N) + 6) * X) + ((C + 1) * I)) / 100.0;
             //m_minHeight = m_minWidthData * 0.15;
             /*if(min_height < 0.25)*/
             m_minHeight = 0.25;
             m_minWidthTotal = m_minWidthData + 0.22; // added a little buffer to make sure we don't loose any
             // of our required quiet zone in conversions
         } else if (m_format->value().toString() == QLatin1String("i2of5")) {
             int C = i * 2; // number of characters
             int N = 2; // narrow mult for wide line
             int X = 1; // 1px narrow line
             m_minWidthTotal = ((C * (2.0*N + 3.0) + 6.0 + N) * X);
             m_minHeight = 0.25;
             m_minWidthTotal = m_minWidthData + 0.22;
         } else if (m_format->value().toString() == QLatin1String("128")) {
             int C = i; // assuming 1:1 ratio of data passed in to data actually used in encoding
             int X = 1; // 1px wide
             m_minWidthData = (((11 * C) + 35) * X) / 100.0;       // assuming CODE A or CODE B
             //m_minHeight = m_minWidthData * 0.15;
             /*if(min_height < 0.25)*/
             m_minHeight = 0.25;
             m_minWidthTotal = m_minWidthData + 0.22; // added a little bugger to make sure we don't loose any
             // of our required quiet zone in conversions
         } else if (m_format->value().toString() == QLatin1String("upc-a")) {
             m_minWidthData = 0.95;
             m_minWidthTotal = 1.15;
             m_minHeight = 0.25;
         } else if (m_format->value().toString() == QLatin1String("upc-e")) {
             m_minWidthData = 0.52;
             m_minWidthTotal = 0.70;
             m_minHeight = 0.25;
         } else if (m_format->value().toString() == QLatin1String("ean13")) {
             m_minWidthData = 0.95;
             m_minWidthTotal = 1.15;
             m_minHeight = 0.25;
         } else if (m_format->value().toString() == QLatin1String("ean8")) {
             m_minWidthData = 0.67;
             m_minWidthTotal = 0.90;
             m_minHeight = 0.25;
         } else {
             kreportpluginWarning() << "Unknown format encountered: " << m_format->value().toString();
         }
     }
 }
 
 void KReportItemBarcode::createProperties()
 {
     QStringList keys, strings;
 
     m_controlSource = new KProperty("item-data-source", QStringList(), QStringList(),
                                     QString(), tr("Data Source"));
 
     m_itemValue = new KProperty("value", QString(), tr("Value"),
                                 tr("Value used if not bound to a field"));
 
     keys << QLatin1String("left") << QLatin1String("center") << QLatin1String("right");
     strings << tr("Left") << tr("Center") << tr("Right");
     m_horizontalAlignment = new KProperty("horizontal-align", keys, strings,
                                           QLatin1String("left"), tr("Horizontal Alignment"));
 
     keys.clear();
     strings.clear();
     keys << QLatin1String("3of9") << QLatin1String("3of9+") << QLatin1String("128")
          << QLatin1String("ean8") << QLatin1String("ean13") << QLatin1String("i2of5")
          << QLatin1String("upc-a") << QLatin1String("upc-e");
     strings << tr("Code 3 of 9", "Barcode symbology, keep short")
             << tr("Code 3 of 9 Ext.", "3 of 3 Extended: Barcode symbology, keep short")
             << tr("Code 128", "Barcode symbology, keep short")
             << tr("EAN-8", "Barcode symbology, keep short")
             << tr("EAN-13", "Barcode symbology, keep short")
             << tr("Interleaved 2 of 5", "Interleaved barcode 2 of 5: barcode symbology, keep short")
             << tr("UPC-A", "Barcode symbology, keep short")
             << tr("UPC-E", "Barcode symbology, keep short");
     m_format = new KProperty("barcode-format", keys, strings, QLatin1String("3of9"),
                              tr("Barcode Format"));
 
     m_maxLength = new KProperty("barcode-max-length", 5, tr("Max Length"),
                                 tr("Maximum Barcode Length"));
 
     propertySet()->addProperty(m_controlSource);
     propertySet()->addProperty(m_itemValue);
     propertySet()->addProperty(m_format);
     propertySet()->addProperty(m_horizontalAlignment);
     propertySet()->addProperty(m_maxLength);
 }
 
 KReportItemBarcode::~KReportItemBarcode()
 {
 }
 
 int KReportItemBarcode::alignment()
 {
     QByteArray a = m_horizontalAlignment->value().toByteArray();
 
     if (a == "left")
         return 0;
     else if (a == "center")
         return 1;
     else if (a == "right")
         return 2;
     else
         return 0;
 }
 
 QString KReportItemBarcode::itemDataSource() const
 {
     return m_controlSource->value().toString();
 }
 
 QString KReportItemBarcode::format()
 {
     return m_format->value().toString();
 }
 
 int KReportItemBarcode::maxLength()
 {
     return m_maxLength->value().toInt();
 }
 
 void KReportItemBarcode::setFormat(const QString& f)
 {
     m_format->setValue(f);
 }
 
 void KReportItemBarcode::setAlignment(int)
 {
     //! @todo Barcode alignment
 }
 
 //RTTI
 QString KReportItemBarcode::typeName() const
 {
     return QLatin1String("barcode");
 }
 
 int KReportItemBarcode::renderSimpleData(OROPage *page, OROSection *section, const QPointF &offset,
                                           const QVariant &data, KReportScriptHandler *script)
 {
     Q_UNUSED(section);
     Q_UNUSED(script);
 
     QPointF pos = scenePosition(position());
     QSizeF siz = sceneSize(size());
     pos += offset;
 
     QRectF rect = QRectF(pos, siz);
 
     QString val;
 
     if (m_controlSource->value().toString().isEmpty()) {
         val = m_itemValue->value().toString();
     } else {
         val = data.toString();
     }
 
     if (page) {
         QByteArray fmt = m_format->value().toByteArray();
         int align = alignment();
         if (fmt == "3of9")
             render3of9(page, rect, val, align);
         else if (fmt == "3of9+")
             renderExtended3of9(page, rect, val, align);
         else if (fmt == "i2of5")
             renderI2of5(page, rect, val, align);
         else if (fmt == "128")
             renderCode128(page, rect, val, align);
         else if (fmt == "ean13")
             renderCodeEAN13(page, rect, val, align);
         else if (fmt == "ean8")
             renderCodeEAN8(page, rect, val, align);
         else if (fmt == "upc-a")
             renderCodeUPCA(page, rect, val, align);
         else if (fmt == "upc-e")
             renderCodeUPCE(page, rect, val, align);
         else {
             kreportpluginWarning() << "Unknown barcode format:" << fmt;
         }
     }
     return 0;
 }
diff --git a/src/plugins/barcode/KReportItemBarcode.h b/src/plugins/barcode/KReportItemBarcode.h
index 45bfd46f..a9543ae4 100644
--- a/src/plugins/barcode/KReportItemBarcode.h
+++ b/src/plugins/barcode/KReportItemBarcode.h
@@ -1,74 +1,72 @@
 /* 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 KREPORTITEMBRCODE_H
 #define KREPORTITEMBRCODE_H
 
 #include "KReportItemBase.h"
-#include <KReportPosition.h>
-#include <KReportSize.h>
 
 class QDomNode;
 
 namespace Scripting
 {
 class Barcode;
 }
 
 /**
 */
 class KReportItemBarcode : public KReportItemBase
 {
 Q_OBJECT
 public:
     KReportItemBarcode();
     explicit KReportItemBarcode(const QDomNode &element);
     ~KReportItemBarcode();
 
     virtual QString typeName() const;
     virtual int renderSimpleData(OROPage *page, OROSection *section, const QPointF &offset, const QVariant &data, KReportScriptHandler *script);
     virtual QString itemDataSource() const;
 
 protected:
 
     KProperty * m_controlSource;
     KProperty * m_horizontalAlignment;
     KProperty * m_format;
     KProperty * m_maxLength;
     KProperty* m_itemValue;
 
 
     int alignment();
     void setAlignment(int);
     int maxLength();
     void setMaxLength(int i);
     QString format();
     void setFormat(const QString&);
 
     // all these values are in inches and
     // are for internal use only
     qreal m_minWidthData;
     qreal m_minWidthTotal;
     qreal m_minHeight;
 
 private:
     virtual void createProperties();
 
     friend class Scripting::Barcode;
 };
 
 #endif
diff --git a/src/plugins/barcode/KReportScriptBarcode.cpp b/src/plugins/barcode/KReportScriptBarcode.cpp
index 2fad24ba..eb65ec7b 100644
--- a/src/plugins/barcode/KReportScriptBarcode.cpp
+++ b/src/plugins/barcode/KReportScriptBarcode.cpp
@@ -1,105 +1,106 @@
 /* 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/>.
  */
 
 #include "KReportScriptBarcode.h"
 
 #include <KProperty>
+#include <QSizeF>
+#include <QPointF>
 
 namespace Scripting
 {
 
 Barcode::Barcode(KReportItemBarcode *b)
 {
     m_barcode = b;
 }
 
-
 Barcode::~Barcode()
 {
 }
 
 QPointF Barcode::position()
 {
     return m_barcode->position();
 }
 void Barcode::setPosition(const QPointF& p)
 {
     m_barcode->setPosition(p);
 }
 
 QSizeF Barcode::size()
 {
     return m_barcode->size();
 }
 void Barcode::setSize(const QSizeF& s)
 {
     m_barcode->setSize(s);
 }
 
 int Barcode::horizontalAlignment()
 {
     const QString a = m_barcode->m_horizontalAlignment->value().toString().toLower();
 
     if (a == QLatin1String("left")) {
         return -1;
     }
     if (a == QLatin1String("center")) {
         return 0;
     }
     if (a == QLatin1String("right")) {
         return 1;
     }
     return -1;
 }
 void Barcode::setHorizonalAlignment(int a)
 {
     switch (a) {
     case -1:
         m_barcode->m_horizontalAlignment->setValue(QLatin1String("left"));
         break;
     case 0:
         m_barcode->m_horizontalAlignment->setValue(QLatin1String("center"));
         break;
     case 1:
         m_barcode->m_horizontalAlignment->setValue(QLatin1String("right"));
         break;
     default:
         m_barcode->m_horizontalAlignment->setValue(QLatin1String("left"));
         break;
     }
 }
 
 QString Barcode::source()
 {
     return m_barcode->m_controlSource->value().toString();
 }
 
 void Barcode::setSource(const QString& s)
 {
     m_barcode->m_controlSource->setValue(s);
 }
 
 QString Barcode::format()
 {
     return m_barcode->m_format->value().toString();
 }
 
 void Barcode::setFormat(const QString& s)
 {
     m_barcode->m_format->setValue(s);
 }
 }