remove unused QSvgTinyDocument members

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-02-05 05:07:50 +02:00
parent e0025d4ccd
commit 3174eef39f
3 changed files with 6 additions and 24 deletions

View file

@ -3054,14 +3054,14 @@ static QSvgNode *createSvgNode(QSvgNode *parent,
width = parseLength(widthStr, type, handler); width = parseLength(widthStr, type, handler);
if (type != QSvgHandler::LT_PT) if (type != QSvgHandler::LT_PT)
width = convertToPixels(width, true, type); width = convertToPixels(width, true, type);
node->setWidth(int(width), type == QSvgHandler::LT_PERCENT); node->setWidth(int(width));
} }
qreal height = 0; qreal height = 0;
if (!heightStr.isEmpty()) { if (!heightStr.isEmpty()) {
height = parseLength(heightStr, type, handler); height = parseLength(heightStr, type, handler);
if (type != QSvgHandler::LT_PT) if (type != QSvgHandler::LT_PT)
height = convertToPixels(height, false, type); height = convertToPixels(height, false, type);
node->setHeight(int(height), type == QSvgHandler::LT_PERCENT); node->setHeight(int(height));
} }
QStringList viewBoxValues; QStringList viewBoxValues;

View file

@ -52,8 +52,6 @@ QT_BEGIN_NAMESPACE
QSvgTinyDocument::QSvgTinyDocument() QSvgTinyDocument::QSvgTinyDocument()
: QSvgStructureNode(0) : QSvgStructureNode(0)
, m_widthPercent(false)
, m_heightPercent(false)
, m_animated(false) , m_animated(false)
, m_animationDuration(0) , m_animationDuration(0)
, m_fps(30) , m_fps(30)
@ -297,16 +295,14 @@ QSvgNode::Type QSvgTinyDocument::type() const
return DOC; return DOC;
} }
void QSvgTinyDocument::setWidth(int len, bool percent) void QSvgTinyDocument::setWidth(int len)
{ {
m_size.setWidth(len); m_size.setWidth(len);
m_widthPercent = percent;
} }
void QSvgTinyDocument::setHeight(int len, bool percent) void QSvgTinyDocument::setHeight(int len)
{ {
m_size.setHeight(len); m_size.setHeight(len);
m_heightPercent = percent;
} }
void QSvgTinyDocument::setViewBox(const QRectF &rect) void QSvgTinyDocument::setViewBox(const QRectF &rect)

View file

@ -75,12 +75,10 @@ public:
Type type() const; Type type() const;
QSize size() const; QSize size() const;
void setWidth(int len, bool percent); void setWidth(int len);
void setHeight(int len, bool percent); void setHeight(int len);
int width() const; int width() const;
int height() const; int height() const;
bool widthPercent() const;
bool heightPercent() const;
bool preserveAspectRatio() const; bool preserveAspectRatio() const;
@ -115,8 +113,6 @@ private:
void mapSourceToTarget(QPainter *p, const QRectF &targetRect, const QRectF &sourceRect = QRectF()); void mapSourceToTarget(QPainter *p, const QRectF &targetRect, const QRectF &sourceRect = QRectF());
QSize m_size; QSize m_size;
bool m_widthPercent;
bool m_heightPercent;
mutable QRectF m_viewBox; mutable QRectF m_viewBox;
@ -151,16 +147,6 @@ inline int QSvgTinyDocument::height() const
return size().height(); return size().height();
} }
inline bool QSvgTinyDocument::widthPercent() const
{
return m_widthPercent;
}
inline bool QSvgTinyDocument::heightPercent() const
{
return m_heightPercent;
}
inline QRectF QSvgTinyDocument::viewBox() const inline QRectF QSvgTinyDocument::viewBox() const
{ {
if (m_viewBox.isNull()) if (m_viewBox.isNull())