summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-12 03:05:54 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-12 03:05:55 +0200
commitab818cbbeb7acab61eee3a4694457ceba8c35981 (patch)
tree37de3af7e214e5cd9ed1a93ec48ef388037b0c1f
parente73c55cd1b23c2973604642ae3a1752c61405e30 (diff)
parenta72ce34fd4f2fb0035bd982201bafedc0b6cd364 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
-rw-r--r--src/svg/qsvghandler.cpp2
-rw-r--r--src/svg/qsvghandler_p.h2
-rw-r--r--src/svg/qsvgnode.cpp2
-rw-r--r--src/svg/qsvgstyle.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index fe79977..86ca77e 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -1986,7 +1986,7 @@ static void parseCSStoXMLAttrs(const QVector<QCss::Declaration> &declarations,
}
}
-void QSvgHandler::parseCSStoXMLAttrs(QString css, QVector<QSvgCssAttribute> *attributes)
+void QSvgHandler::parseCSStoXMLAttrs(const QString &css, QVector<QSvgCssAttribute> *attributes)
{
// preprocess (for unicode escapes), tokenize and remove comments
m_cssParser.init(css);
diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h
index 8eb061b..d76e56c 100644
--- a/src/svg/qsvghandler_p.h
+++ b/src/svg/qsvghandler_p.h
@@ -128,7 +128,7 @@ public:
int animationDuration() const;
#ifndef QT_NO_CSSPARSER
- void parseCSStoXMLAttrs(QString css, QVector<QSvgCssAttribute> *attributes);
+ void parseCSStoXMLAttrs(const QString &css, QVector<QSvgCssAttribute> *attributes);
#endif
inline QPen defaultPen() const
diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp
index 14aaea4..29fd4e5 100644
--- a/src/svg/qsvgnode.cpp
+++ b/src/svg/qsvgnode.cpp
@@ -341,7 +341,7 @@ QSvgNode::DisplayMode QSvgNode::displayMode() const
qreal QSvgNode::strokeWidth(QPainter *p)
{
- QPen pen = p->pen();
+ const QPen &pen = p->pen();
if (pen.style() == Qt::NoPen || pen.brush().style() == Qt::NoBrush || pen.isCosmetic())
return 0;
return pen.widthF();
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index b934f94..c4edd25 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -126,7 +126,7 @@ void QSvgFillStyle::setFillStyle(QSvgFillStyleProperty* style)
void QSvgFillStyle::setBrush(QBrush brush)
{
- m_fill = brush;
+ m_fill = std::move(brush);
m_style = 0;
m_fillSet = 1;
}