diff --git a/include/lrreportengine.h b/include/lrreportengine.h index aaa77d7..a4c314f 100644 --- a/include/lrreportengine.h +++ b/include/lrreportengine.h @@ -64,10 +64,10 @@ private: class LIMEREPORT_EXPORT ItemGeometry{ public: - enum Type{Milimeters, Pixels}; - ItemGeometry(qreal x, qreal y, qreal width, qreal height, Qt::Alignment anchor, Type type = Milimeters) + enum Type{Millimeters, Pixels}; + ItemGeometry(qreal x, qreal y, qreal width, qreal height, Qt::Alignment anchor, Type type = Millimeters) :m_x(x), m_y(y), m_width(width), m_height(height), m_type(type), m_anchor(anchor){} - ItemGeometry(): m_x(0), m_y(0), m_width(0), m_height(0), m_type(Milimeters){} + ItemGeometry(): m_x(0), m_y(0), m_width(0), m_height(0), m_type(Millimeters){} qreal x() const; void setX(const qreal &x); diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index e5deb00..05418e5 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -2004,7 +2004,7 @@ QPointF WatermarkHelper::mapToPage(const PageItemDesignIntf &page) qreal WatermarkHelper::valueToPixels(qreal value) { switch (m_watermark.geometry().type()) { - case LimeReport::ItemGeometry::Milimeters: + case LimeReport::ItemGeometry::Millimeters: return value * Const::mmFACTOR; case LimeReport::ItemGeometry::Pixels: return value; diff --git a/limereport/lrreportengine.h b/limereport/lrreportengine.h index aaa77d7..a4c314f 100644 --- a/limereport/lrreportengine.h +++ b/limereport/lrreportengine.h @@ -64,10 +64,10 @@ private: class LIMEREPORT_EXPORT ItemGeometry{ public: - enum Type{Milimeters, Pixels}; - ItemGeometry(qreal x, qreal y, qreal width, qreal height, Qt::Alignment anchor, Type type = Milimeters) + enum Type{Millimeters, Pixels}; + ItemGeometry(qreal x, qreal y, qreal width, qreal height, Qt::Alignment anchor, Type type = Millimeters) :m_x(x), m_y(y), m_width(width), m_height(height), m_type(type), m_anchor(anchor){} - ItemGeometry(): m_x(0), m_y(0), m_width(0), m_height(0), m_type(Milimeters){} + ItemGeometry(): m_x(0), m_y(0), m_width(0), m_height(0), m_type(Millimeters){} qreal x() const; void setX(const qreal &x);