diff --git a/src/common/KReportItemLine.cpp b/src/common/KReportItemLine.cpp --- a/src/common/KReportItemLine.cpp +++ b/src/common/KReportItemLine.cpp @@ -29,8 +29,8 @@ } KReportItemLine::KReportItemLine(const QDomNode & element) + : KReportItemLine() { - createProperties(); QDomNodeList nl = element.childNodes(); QString n; QDomNode node; diff --git a/src/items/check/KReportItemCheck.cpp b/src/items/check/KReportItemCheck.cpp --- a/src/items/check/KReportItemCheck.cpp +++ b/src/items/check/KReportItemCheck.cpp @@ -33,8 +33,8 @@ } KReportItemCheckBox::KReportItemCheckBox(const QDomNode &element) + : KReportItemCheckBox() { - createProperties(); QDomNodeList nl = element.childNodes(); QString n; QDomNode node; diff --git a/src/items/field/KReportItemField.cpp b/src/items/field/KReportItemField.cpp --- a/src/items/field/KReportItemField.cpp +++ b/src/items/field/KReportItemField.cpp @@ -35,8 +35,8 @@ } KReportItemField::KReportItemField(const QDomNode & element) + : KReportItemField() { - createProperties(); QDomNodeList nl = element.childNodes(); QString n; QDomNode node; diff --git a/src/items/image/KReportItemImage.cpp b/src/items/image/KReportItemImage.cpp --- a/src/items/image/KReportItemImage.cpp +++ b/src/items/image/KReportItemImage.cpp @@ -31,8 +31,8 @@ } KReportItemImage::KReportItemImage(const QDomNode & element) + : KReportItemImage() { - createProperties(); QDomNodeList nl = element.childNodes(); QString n; QDomNode node; diff --git a/src/items/label/KReportItemLabel.cpp b/src/items/label/KReportItemLabel.cpp --- a/src/items/label/KReportItemLabel.cpp +++ b/src/items/label/KReportItemLabel.cpp @@ -31,8 +31,8 @@ } KReportItemLabel::KReportItemLabel(const QDomNode & element) + : KReportItemLabel() { - createProperties(); QDomNodeList nl = element.childNodes(); QString n; QDomNode node; diff --git a/src/items/text/KReportItemText.cpp b/src/items/text/KReportItemText.cpp --- a/src/items/text/KReportItemText.cpp +++ b/src/items/text/KReportItemText.cpp @@ -28,17 +28,18 @@ #include KReportItemText::KReportItemText() - : KReportItemText(QDomNode()) + : m_bottomPadding(0.0) { + createProperties(); } -KReportItemText::KReportItemText(const QDomNode & element) : m_bottomPadding(0.0) +KReportItemText::KReportItemText(const QDomNode & element) + : KReportItemText() { QDomNodeList nl = element.childNodes(); QString n; QDomNode node; - createProperties(); m_name->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"))); diff --git a/src/plugins/barcode/KReportItemBarcode.cpp b/src/plugins/barcode/KReportItemBarcode.cpp --- a/src/plugins/barcode/KReportItemBarcode.cpp +++ b/src/plugins/barcode/KReportItemBarcode.cpp @@ -27,14 +27,14 @@ #include "barcodes.h" KReportItemBarcode::KReportItemBarcode() - : KReportItemBarcode(QDomNode()) + : m_minWidthData(0), m_minWidthTotal(0), m_minHeight(0) { + createProperties(); } KReportItemBarcode::KReportItemBarcode(const QDomNode & element) - : m_minWidthData(0), m_minWidthTotal(0), m_minHeight(0) + : KReportItemBarcode() { - createProperties(); QDomNodeList nl = element.childNodes(); QString n; QDomNode node; diff --git a/src/plugins/chart/KReportItemChart.cpp b/src/plugins/chart/KReportItemChart.cpp --- a/src/plugins/chart/KReportItemChart.cpp +++ b/src/plugins/chart/KReportItemChart.cpp @@ -42,16 +42,14 @@ typedef QVector datalist; KReportItemChart::KReportItemChart() + : m_reportData(nullptr) { - m_reportData = 0; createProperties(); } KReportItemChart::KReportItemChart(QDomNode *element) + : KReportItemChart() { - m_reportData = 0; - createProperties(); - QDomNodeList nl = element->childNodes(); QString n; diff --git a/src/plugins/maps/KReportItemMaps.cpp b/src/plugins/maps/KReportItemMaps.cpp --- a/src/plugins/maps/KReportItemMaps.cpp +++ b/src/plugins/maps/KReportItemMaps.cpp @@ -29,11 +29,6 @@ //! @todo replace with ReportItemMaps(const QDomNode &element = QDomNode()) KReportItemMaps::KReportItemMaps() - : KReportItemMaps(QDomNode()) -{ -} - -KReportItemMaps::KReportItemMaps(const QDomNode &element) : m_longtitude(0) , m_latitude(0) , m_zoom(1200) @@ -45,7 +40,11 @@ , m_zoomDataSetFromScript(false) { createProperties(); +} +KReportItemMaps::KReportItemMaps(const QDomNode &element) + : KReportItemMaps() +{ m_name->setValue(element.toElement().attribute(QLatin1String("report:name"))); m_controlSource->setValue(element.toElement().attribute(QLatin1String("report:item-data-source"))); Z = element.toElement().attribute(QLatin1String("report:z-index")).toDouble(); diff --git a/src/plugins/web/KReportItemWeb.h b/src/plugins/web/KReportItemWeb.h --- a/src/plugins/web/KReportItemWeb.h +++ b/src/plugins/web/KReportItemWeb.h @@ -56,8 +56,6 @@ void loadFinished(bool); private: - void init(); - bool m_rendering; OROPage *m_targetPage; OROSection *m_targetSection; diff --git a/src/plugins/web/KReportItemWeb.cpp b/src/plugins/web/KReportItemWeb.cpp --- a/src/plugins/web/KReportItemWeb.cpp +++ b/src/plugins/web/KReportItemWeb.cpp @@ -32,16 +32,16 @@ #include "kreportplugin_debug.h" -KReportItemWeb::KReportItemWeb(): m_rendering(false) +KReportItemWeb::KReportItemWeb() : m_rendering(false) { createProperties(); - init(); + m_webPage = new QWebPage(); + connect(m_webPage, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool))); } KReportItemWeb::KReportItemWeb(const QDomNode &element) + : KReportItemWeb() { - createProperties(); - init(); QDomNodeList nl = element.childNodes(); QString n; QDomNode node; @@ -57,13 +57,6 @@ } } -void KReportItemWeb::init() -{ - m_webPage = new QWebPage(); - - connect(m_webPage, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool))); -} - void KReportItemWeb::createProperties() { m_set = new KPropertySet;