diff --git a/src/common/KReportDocument.cpp b/src/common/KReportDocument.cpp --- a/src/common/KReportDocument.cpp +++ b/src/common/KReportDocument.cpp @@ -73,10 +73,6 @@ return; } - const qreal dpiX = KReportPrivate::dpiX(); - const qreal dpiY = KReportPrivate::dpiY(); - - QDomNodeList sections = elemSource.childNodes(); for (int nodeCounter = 0; nodeCounter < sections.count(); nodeCounter++) { QDomElement elemThis = sections.item(nodeCounter).toElement(); diff --git a/src/common/KReportElement.cpp b/src/common/KReportElement.cpp --- a/src/common/KReportElement.cpp +++ b/src/common/KReportElement.cpp @@ -43,7 +43,7 @@ return dbg.space(); } -KREPORT_EXPORT uint qHash(const KReportElement &element, uint seed) +KREPORT_EXPORT uint qHash(const KReportElement &element, uint seed) Q_DECL_NOTHROW { return qHash(element.name(), seed) ^ qHash(element.z(), seed) diff --git a/src/common/KReportItemBase.cpp b/src/common/KReportItemBase.cpp --- a/src/common/KReportItemBase.cpp +++ b/src/common/KReportItemBase.cpp @@ -231,6 +231,8 @@ void KReportItemBase::propertyChanged(KPropertySet& s, KProperty& p) { + Q_UNUSED(s) + Q_UNUSED(p) } diff --git a/src/items/check/KReportDesignerItemCheckBox.h b/src/items/check/KReportDesignerItemCheckBox.h --- a/src/items/check/KReportDesignerItemCheckBox.h +++ b/src/items/check/KReportDesignerItemCheckBox.h @@ -43,7 +43,7 @@ virtual KReportDesignerItemCheckBox* clone(); private: - void init(QGraphicsScene*, KReportDesigner*); + void init(QGraphicsScene *scene); private Q_SLOTS: void slotPropertyChanged(KPropertySet &, KProperty &); diff --git a/src/items/check/KReportDesignerItemCheckBox.cpp b/src/items/check/KReportDesignerItemCheckBox.cpp --- a/src/items/check/KReportDesignerItemCheckBox.cpp +++ b/src/items/check/KReportDesignerItemCheckBox.cpp @@ -29,7 +29,7 @@ // class ReportEntityCheck // -void KReportDesignerItemCheckBox::init(QGraphicsScene *scene, KReportDesigner *d) +void KReportDesignerItemCheckBox::init(QGraphicsScene *scene) { if (scene) scene->addItem(this); @@ -45,15 +45,15 @@ : KReportDesignerItemRectBase(d, this) { Q_UNUSED(pos); - init(scene, d); + init(scene); setSceneRect(properRect(*d, KREPORT_ITEM_CHECK_DEFAULT_WIDTH, KREPORT_ITEM_CHECK_DEFAULT_HEIGHT)); nameProperty()->setValue(designer()->suggestEntityName(typeName())); } KReportDesignerItemCheckBox::KReportDesignerItemCheckBox(const QDomNode & element, KReportDesigner * d, QGraphicsScene * s) : KReportItemCheckBox(element), KReportDesignerItemRectBase(d, this) { - init(s, d); + init(s); setSceneRect(KReportItemBase::scenePosition(item()->position()), KReportItemBase::sceneSize(item()->size())); } diff --git a/src/items/field/KReportDesignerItemField.h b/src/items/field/KReportDesignerItemField.h --- a/src/items/field/KReportDesignerItemField.h +++ b/src/items/field/KReportDesignerItemField.h @@ -45,7 +45,7 @@ virtual void mousePressEvent(QGraphicsSceneMouseEvent * event); private: - void init(QGraphicsScene*, KReportDesigner * d); + void init(QGraphicsScene *scene); QRect getTextRect() const; private Q_SLOTS: diff --git a/src/items/field/KReportDesignerItemField.cpp b/src/items/field/KReportDesignerItemField.cpp --- a/src/items/field/KReportDesignerItemField.cpp +++ b/src/items/field/KReportDesignerItemField.cpp @@ -31,7 +31,7 @@ // class ReportEntityField // -void KReportDesignerItemField::init(QGraphicsScene * scene, KReportDesigner * d) +void KReportDesignerItemField::init(QGraphicsScene *scene) { if (scene) scene->addItem(this); @@ -42,19 +42,19 @@ } // methods (constructors) -KReportDesignerItemField::KReportDesignerItemField(KReportDesigner * rw, QGraphicsScene * scene, const QPointF &pos) +KReportDesignerItemField::KReportDesignerItemField(KReportDesigner *rw, QGraphicsScene *scene, const QPointF &pos) : KReportDesignerItemRectBase(rw, this) { Q_UNUSED(pos); - init(scene, rw); + init(scene); setSceneRect(properRect(*rw, getTextRect().width(), getTextRect().height())); nameProperty()->setValue(designer()->suggestEntityName(typeName())); } KReportDesignerItemField::KReportDesignerItemField(const QDomNode & element, KReportDesigner * d, QGraphicsScene * s) : KReportItemField(element), KReportDesignerItemRectBase(d, this) { - init(s, d); + init(s); setSceneRect(KReportItemBase::scenePosition(item()->position()), KReportItemBase::sceneSize(item()->size())); } diff --git a/src/items/image/KReportDesignerItemImage.h b/src/items/image/KReportDesignerItemImage.h --- a/src/items/image/KReportDesignerItemImage.h +++ b/src/items/image/KReportDesignerItemImage.h @@ -40,7 +40,7 @@ virtual void mousePressEvent(QGraphicsSceneMouseEvent * event); private: - void init(QGraphicsScene*, KReportDesigner*); + void init(QGraphicsScene *scene); private Q_SLOTS: void slotPropertyChanged(KPropertySet &, KProperty &); diff --git a/src/items/image/KReportDesignerItemImage.cpp b/src/items/image/KReportDesignerItemImage.cpp --- a/src/items/image/KReportDesignerItemImage.cpp +++ b/src/items/image/KReportDesignerItemImage.cpp @@ -31,7 +31,7 @@ // // contructors/deconstructors -void KReportDesignerItemImage::init(QGraphicsScene *scene, KReportDesigner *d) +void KReportDesignerItemImage::init(QGraphicsScene *scene) { //kreportpluginDebug(); if (scene) @@ -44,20 +44,20 @@ setZValue(z()); } -KReportDesignerItemImage::KReportDesignerItemImage(KReportDesigner * rw, QGraphicsScene* scene, const QPointF &pos) +KReportDesignerItemImage::KReportDesignerItemImage(KReportDesigner *rw, QGraphicsScene *scene, const QPointF &pos) : KReportDesignerItemRectBase(rw, this) { Q_UNUSED(pos); //kreportpluginDebug(); - init(scene, rw); + init(scene); setSceneRect(properRect(*rw, KREPORT_ITEM_RECT_DEFAULT_WIDTH, KREPORT_ITEM_RECT_DEFAULT_WIDTH)); nameProperty()->setValue(designer()->suggestEntityName(typeName())); } KReportDesignerItemImage::KReportDesignerItemImage(const QDomNode & element, KReportDesigner * rw, QGraphicsScene* scene) : KReportItemImage(element), KReportDesignerItemRectBase(rw, this) { - init(scene, rw); + init(scene); setSceneRect(KReportItemBase::scenePosition(item()->position()), KReportItemBase::sceneSize(item()->size())); } diff --git a/src/items/label/KReportDesignerItemLabel.h b/src/items/label/KReportDesignerItemLabel.h --- a/src/items/label/KReportDesignerItemLabel.h +++ b/src/items/label/KReportDesignerItemLabel.h @@ -49,7 +49,7 @@ virtual void keyReleaseEvent ( QKeyEvent * event ); private: - void init(QGraphicsScene*, KReportDesigner*); + void init(QGraphicsScene *scene); QRectF getTextRect() const; BoundedTextItem *m_inlineEdit; diff --git a/src/items/label/KReportDesignerItemLabel.cpp b/src/items/label/KReportDesignerItemLabel.cpp --- a/src/items/label/KReportDesignerItemLabel.cpp +++ b/src/items/label/KReportDesignerItemLabel.cpp @@ -30,7 +30,7 @@ #include #include -void KReportDesignerItemLabel::init(QGraphicsScene *scene, KReportDesigner *d) +void KReportDesignerItemLabel::init(QGraphicsScene *scene) { if (scene) scene->addItem(this); @@ -58,7 +58,7 @@ : KReportDesignerItemRectBase(d, this) { Q_UNUSED(pos); - init(scene, d); + init(scene); setSceneRect(properRect(*d, getTextRect().width(), getTextRect().height())); nameProperty()->setValue(designer()->suggestEntityName(typeName())); @@ -68,7 +68,7 @@ KReportDesignerItemLabel::KReportDesignerItemLabel(const QDomNode & element, KReportDesigner * d, QGraphicsScene * s) : KReportItemLabel(element), KReportDesignerItemRectBase(d, this), m_inlineEdit(0) { - init(s, d); + init(s); setSceneRect(KReportItemBase::scenePosition(item()->position()), KReportItemBase::sceneSize(item()->size())); } diff --git a/src/items/text/KReportDesignerItemText.h b/src/items/text/KReportDesignerItemText.h --- a/src/items/text/KReportDesignerItemText.h +++ b/src/items/text/KReportDesignerItemText.h @@ -45,7 +45,7 @@ private: QRect getTextRect() const; - void init(QGraphicsScene*, KReportDesigner*); + void init(QGraphicsScene *scene); private Q_SLOTS: void slotPropertyChanged(KPropertySet &, KProperty &); diff --git a/src/items/text/KReportDesignerItemText.cpp b/src/items/text/KReportDesignerItemText.cpp --- a/src/items/text/KReportDesignerItemText.cpp +++ b/src/items/text/KReportDesignerItemText.cpp @@ -33,7 +33,7 @@ // // methods (constructors) -void KReportDesignerItemText::init(QGraphicsScene *scene, KReportDesigner *d) +void KReportDesignerItemText::init(QGraphicsScene *scene) { //setFlags(ItemIsSelectable | ItemIsMovable); if (scene) @@ -53,15 +53,15 @@ : KReportDesignerItemRectBase(rw, this) { Q_UNUSED(pos); - init(scene, rw); + init(scene); setSceneRect(properRect(*rw, getTextRect().width(), getTextRect().height())); nameProperty()->setValue(designer()->suggestEntityName(typeName())); } -KReportDesignerItemText::KReportDesignerItemText(const QDomNode & element, KReportDesigner * d, QGraphicsScene * s) +KReportDesignerItemText::KReportDesignerItemText(const QDomNode & element, KReportDesigner *d, QGraphicsScene *scene) : KReportItemText(element), KReportDesignerItemRectBase(d, this) { - init(s, d); + init(scene); setSceneRect(KReportItemBase::scenePosition(item()->position()), KReportItemBase::sceneSize(item()->size())); } diff --git a/src/plugins/barcode/KReportDesignerItemBarcode.h b/src/plugins/barcode/KReportDesignerItemBarcode.h --- a/src/plugins/barcode/KReportDesignerItemBarcode.h +++ b/src/plugins/barcode/KReportDesignerItemBarcode.h @@ -46,7 +46,7 @@ virtual void mousePressEvent(QGraphicsSceneMouseEvent * event); private: - void init(QGraphicsScene*, KReportDesigner*); + void init(QGraphicsScene *scene); QRect getTextRect(); diff --git a/src/plugins/barcode/KReportDesignerItemBarcode.cpp b/src/plugins/barcode/KReportDesignerItemBarcode.cpp --- a/src/plugins/barcode/KReportDesignerItemBarcode.cpp +++ b/src/plugins/barcode/KReportDesignerItemBarcode.cpp @@ -31,7 +31,7 @@ #include #include "kreportplugin_debug.h" -void KReportDesignerItemBarcode::init(QGraphicsScene *scene, KReportDesigner *d) +void KReportDesignerItemBarcode::init(QGraphicsScene *scene) { if (scene) scene->addItem(this); @@ -50,15 +50,15 @@ : KReportDesignerItemRectBase(rw, this) { Q_UNUSED(pos); - init(scene, rw); + init(scene); setSceneRect(properRect(*rw, m_minWidthTotal*m_dpiX, m_minHeight*m_dpiY)); nameProperty()->setValue(designer()->suggestEntityName(typeName())); } KReportDesignerItemBarcode::KReportDesignerItemBarcode(const QDomNode & element, KReportDesigner * rw, QGraphicsScene* scene) : KReportItemBarcode(element), KReportDesignerItemRectBase(rw, this) { - init(scene, rw); + init(scene); setSceneRect(KReportItemBase::scenePosition(item()->position()), KReportItemBase::sceneSize(item()->size())); } diff --git a/src/plugins/maps/KReportDesignerItemMaps.h b/src/plugins/maps/KReportDesignerItemMaps.h --- a/src/plugins/maps/KReportDesignerItemMaps.h +++ b/src/plugins/maps/KReportDesignerItemMaps.h @@ -42,7 +42,7 @@ virtual void mousePressEvent(QGraphicsSceneMouseEvent * event); private: - void init(QGraphicsScene*, KReportDesigner*); + void init(QGraphicsScene *scene); private Q_SLOTS: void slotPropertyChanged(KPropertySet &, KProperty &); diff --git a/src/plugins/maps/KReportDesignerItemMaps.cpp b/src/plugins/maps/KReportDesignerItemMaps.cpp --- a/src/plugins/maps/KReportDesignerItemMaps.cpp +++ b/src/plugins/maps/KReportDesignerItemMaps.cpp @@ -29,7 +29,7 @@ #include #include "kreportplugin_debug.h" -void KReportDesignerItemMaps::init(QGraphicsScene *scene, KReportDesigner *d) +void KReportDesignerItemMaps::init(QGraphicsScene *scene) { if (scene) scene->addItem(this); @@ -41,19 +41,19 @@ setZValue(z()); } -KReportDesignerItemMaps::KReportDesignerItemMaps(KReportDesigner * rw, QGraphicsScene* scene, const QPointF &pos) +KReportDesignerItemMaps::KReportDesignerItemMaps(KReportDesigner *rw, QGraphicsScene *scene, const QPointF &pos) : KReportDesignerItemRectBase(rw, this) { Q_UNUSED(pos); - init(scene, rw); + init(scene); setSceneRect(properRect(*rw, KREPORT_ITEM_RECT_DEFAULT_WIDTH, KREPORT_ITEM_RECT_DEFAULT_WIDTH)); nameProperty()->setValue(designer()->suggestEntityName(typeName())); } -KReportDesignerItemMaps::KReportDesignerItemMaps(const QDomNode &element, KReportDesigner * rw, QGraphicsScene* scene) +KReportDesignerItemMaps::KReportDesignerItemMaps(const QDomNode &element, KReportDesigner *rw, QGraphicsScene* scene) : KReportItemMaps(element), KReportDesignerItemRectBase(rw, this) { - init(scene, rw); + init(scene); setSceneRect(KReportItemBase::scenePosition(item()->position()), KReportItemBase::sceneSize(item()->size())); } diff --git a/src/plugins/web/KReportDesignerItemWeb.h b/src/plugins/web/KReportDesignerItemWeb.h --- a/src/plugins/web/KReportDesignerItemWeb.h +++ b/src/plugins/web/KReportDesignerItemWeb.h @@ -36,17 +36,15 @@ KReportDesignerItemWeb(const QDomNode &element, KReportDesigner *rw, QGraphicsScene *scene); virtual ~KReportDesignerItemWeb(); - void init(QGraphicsScene *scene); - virtual void buildXML(QDomDocument *doc, QDomElement *parent); virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget); virtual KReportDesignerItemWeb *clone(); protected: virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); private: - void init(QGraphicsScene *, KReportDesigner *r); + void init(QGraphicsScene *scene); private Q_SLOTS: void slotPropertyChanged(KPropertySet &, KProperty &); diff --git a/src/plugins/web/KReportDesignerItemWeb.cpp b/src/plugins/web/KReportDesignerItemWeb.cpp --- a/src/plugins/web/KReportDesignerItemWeb.cpp +++ b/src/plugins/web/KReportDesignerItemWeb.cpp @@ -31,7 +31,7 @@ #include #include "kreportplugin_debug.h" -void KReportDesignerItemWeb::init(QGraphicsScene *scene, KReportDesigner *d) +void KReportDesignerItemWeb::init(QGraphicsScene *scene) { if (scene) scene->addItem(this); @@ -45,16 +45,16 @@ const QPointF &pos) : KReportDesignerItemRectBase(rw, this) { Q_UNUSED(pos); - init(scene, rw); + init(scene); setSceneRect(properRect(*rw, KREPORT_ITEM_RECT_DEFAULT_WIDTH, KREPORT_ITEM_RECT_DEFAULT_WIDTH)); nameProperty()->setValue(designer()->suggestEntityName(typeName())); } KReportDesignerItemWeb::KReportDesignerItemWeb(const QDomNode &element, KReportDesigner *rw, QGraphicsScene *scene) : KReportItemWeb(element), KReportDesignerItemRectBase(rw, this) { - init(scene, rw); + init(scene); setSceneRect(KReportItemBase::scenePosition(item()->position()), KReportItemBase::sceneSize(item()->size())); }