From ce94b847c87e2606c5f189d2ad3715c1d025b9cf Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 4 Oct 2019 14:13:36 +0200 Subject: Small performance improvements suggested by clang-tidy mostly add const &, a few std::move and in particular case, remove const so the std::move being done over the variable actually has effect Change-Id: Id611cd31bc012f219d7a17d4626b1c2a5fbddd66 Reviewed-by: Fabian Kosmale Reviewed-by: Ulf Hermann --- src/quick/items/qquickanimatedsprite.cpp | 2 +- src/quick/items/qquickanimatedsprite_p.h | 4 ++-- src/quick/items/qquickopenglshadereffect.cpp | 4 ++-- src/quick/items/qquickstateoperations.cpp | 12 ++++++------ src/quick/items/qquickstateoperations_p.h | 12 ++++++------ src/quick/items/qquicktableview.cpp | 4 ++-- src/quick/items/qquicktableview_p.h | 4 ++-- src/quick/items/qquicktextcontrol.cpp | 2 +- src/quick/items/qquicktextcontrol_p.h | 2 +- src/quick/items/qquicktextinput.cpp | 2 +- src/quick/items/qquicktextinput_p.h | 2 +- src/quick/items/qquicktextnodeengine.cpp | 2 +- src/quick/items/qquickwindow.cpp | 6 +++--- 13 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src/quick/items') diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp index 18adb4e992..d22e77c8ad 100644 --- a/src/quick/items/qquickanimatedsprite.cpp +++ b/src/quick/items/qquickanimatedsprite.cpp @@ -532,7 +532,7 @@ void QQuickAnimatedSprite::setInterpolate(bool arg) } } -void QQuickAnimatedSprite::setSource(QUrl arg) +void QQuickAnimatedSprite::setSource(const QUrl &arg) { Q_D(QQuickAnimatedSprite); diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h index ff59591c9f..d36f908c78 100644 --- a/src/quick/items/qquickanimatedsprite_p.h +++ b/src/quick/items/qquickanimatedsprite_p.h @@ -122,7 +122,7 @@ Q_SIGNALS: void runningChanged(bool arg); void interpolateChanged(bool arg); - void sourceChanged(QUrl arg); + void sourceChanged(const QUrl &arg); void reverseChanged(bool arg); void frameSyncChanged(bool arg); void frameCountChanged(int arg); @@ -148,7 +148,7 @@ public Q_SLOTS: void setRunning(bool arg); void setPaused(bool arg); void setInterpolate(bool arg); - void setSource(QUrl arg); + void setSource(const QUrl &arg); void setReverse(bool arg); void setFrameSync(bool arg); void setFrameCount(int arg); diff --git a/src/quick/items/qquickopenglshadereffect.cpp b/src/quick/items/qquickopenglshadereffect.cpp index 0fd7df8938..e217fdb5d0 100644 --- a/src/quick/items/qquickopenglshadereffect.cpp +++ b/src/quick/items/qquickopenglshadereffect.cpp @@ -189,8 +189,8 @@ class MappedSlotObject: public QtPrivate::QSlotObjectBase public: typedef std::function PropChangedFunc; - explicit MappedSlotObject(PropChangedFunc func) - : QSlotObjectBase(&impl), _signalIndex(-1), func(func) + explicit MappedSlotObject(PropChangedFunc f) + : QSlotObjectBase(&impl), _signalIndex(-1), func(std::move(f)) { ref(); } void setSignalIndex(int idx) { _signalIndex = idx; } diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp index fe1dfd349e..31d1c91649 100644 --- a/src/quick/items/qquickstateoperations.cpp +++ b/src/quick/items/qquickstateoperations.cpp @@ -200,7 +200,7 @@ QQmlScriptString QQuickParentChange::x() const return d->xString.value; } -void QQuickParentChange::setX(QQmlScriptString x) +void QQuickParentChange::setX(const QQmlScriptString &x) { Q_D(QQuickParentChange); d->xString = x; @@ -218,7 +218,7 @@ QQmlScriptString QQuickParentChange::y() const return d->yString.value; } -void QQuickParentChange::setY(QQmlScriptString y) +void QQuickParentChange::setY(const QQmlScriptString &y) { Q_D(QQuickParentChange); d->yString = y; @@ -236,7 +236,7 @@ QQmlScriptString QQuickParentChange::width() const return d->widthString.value; } -void QQuickParentChange::setWidth(QQmlScriptString width) +void QQuickParentChange::setWidth(const QQmlScriptString &width) { Q_D(QQuickParentChange); d->widthString = width; @@ -254,7 +254,7 @@ QQmlScriptString QQuickParentChange::height() const return d->heightString.value; } -void QQuickParentChange::setHeight(QQmlScriptString height) +void QQuickParentChange::setHeight(const QQmlScriptString &height) { Q_D(QQuickParentChange); d->heightString = height; @@ -272,7 +272,7 @@ QQmlScriptString QQuickParentChange::scale() const return d->scaleString.value; } -void QQuickParentChange::setScale(QQmlScriptString scale) +void QQuickParentChange::setScale(const QQmlScriptString &scale) { Q_D(QQuickParentChange); d->scaleString = scale; @@ -290,7 +290,7 @@ QQmlScriptString QQuickParentChange::rotation() const return d->rotationString.value; } -void QQuickParentChange::setRotation(QQmlScriptString rotation) +void QQuickParentChange::setRotation(const QQmlScriptString &rotation) { Q_D(QQuickParentChange); d->rotationString = rotation; diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h index e947b2213f..357366bc60 100644 --- a/src/quick/items/qquickstateoperations_p.h +++ b/src/quick/items/qquickstateoperations_p.h @@ -87,27 +87,27 @@ public: QQuickItem *originalParent() const; QQmlScriptString x() const; - void setX(QQmlScriptString x); + void setX(const QQmlScriptString &x); bool xIsSet() const; QQmlScriptString y() const; - void setY(QQmlScriptString y); + void setY(const QQmlScriptString &y); bool yIsSet() const; QQmlScriptString width() const; - void setWidth(QQmlScriptString width); + void setWidth(const QQmlScriptString &width); bool widthIsSet() const; QQmlScriptString height() const; - void setHeight(QQmlScriptString height); + void setHeight(const QQmlScriptString &height); bool heightIsSet() const; QQmlScriptString scale() const; - void setScale(QQmlScriptString scale); + void setScale(const QQmlScriptString &scale); bool scaleIsSet() const; QQmlScriptString rotation() const; - void setRotation(QQmlScriptString rotation); + void setRotation(const QQmlScriptString &rotation); bool rotationIsSet() const; ActionList actions() override; diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp index 95fac30808..295c6898bc 100644 --- a/src/quick/items/qquicktableview.cpp +++ b/src/quick/items/qquicktableview.cpp @@ -2582,7 +2582,7 @@ QJSValue QQuickTableView::rowHeightProvider() const return d_func()->rowHeightProvider; } -void QQuickTableView::setRowHeightProvider(QJSValue provider) +void QQuickTableView::setRowHeightProvider(const QJSValue &provider) { Q_D(QQuickTableView); if (provider.strictlyEquals(d->rowHeightProvider)) @@ -2598,7 +2598,7 @@ QJSValue QQuickTableView::columnWidthProvider() const return d_func()->columnWidthProvider; } -void QQuickTableView::setColumnWidthProvider(QJSValue provider) +void QQuickTableView::setColumnWidthProvider(const QJSValue &provider) { Q_D(QQuickTableView); if (provider.strictlyEquals(d->columnWidthProvider)) diff --git a/src/quick/items/qquicktableview_p.h b/src/quick/items/qquicktableview_p.h index 3b113efa4f..a5f727d7a4 100644 --- a/src/quick/items/qquicktableview_p.h +++ b/src/quick/items/qquicktableview_p.h @@ -95,10 +95,10 @@ public: void setColumnSpacing(qreal spacing); QJSValue rowHeightProvider() const; - void setRowHeightProvider(QJSValue provider); + void setRowHeightProvider(const QJSValue &provider); QJSValue columnWidthProvider() const; - void setColumnWidthProvider(QJSValue provider); + void setColumnWidthProvider(const QJSValue &provider); virtual QVariant model() const; virtual void setModel(const QVariant &newModel); diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index ab3b0c4605..127b3c3516 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -1397,7 +1397,7 @@ QVariant QQuickTextControl::inputMethodQuery(Qt::InputMethodQuery property) cons return inputMethodQuery(property, QVariant()); } -QVariant QQuickTextControl::inputMethodQuery(Qt::InputMethodQuery property, QVariant argument) const +QVariant QQuickTextControl::inputMethodQuery(Qt::InputMethodQuery property, const QVariant &argument) const { Q_D(const QQuickTextControl); QTextBlock block = d->cursor.block(); diff --git a/src/quick/items/qquicktextcontrol_p.h b/src/quick/items/qquicktextcontrol_p.h index 3c7d48f918..41b8ed7821 100644 --- a/src/quick/items/qquicktextcontrol_p.h +++ b/src/quick/items/qquicktextcontrol_p.h @@ -174,7 +174,7 @@ public: #if QT_CONFIG(im) virtual QVariant inputMethodQuery(Qt::InputMethodQuery property) const; - Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; + Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, const QVariant &argument) const; #endif virtual QMimeData *createMimeDataFromSelection() const; diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index b1ad6a1c15..34105d8c81 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -1958,7 +1958,7 @@ QVariant QQuickTextInput::inputMethodQuery(Qt::InputMethodQuery property) const return inputMethodQuery(property, QVariant()); } -QVariant QQuickTextInput::inputMethodQuery(Qt::InputMethodQuery property, QVariant argument) const +QVariant QQuickTextInput::inputMethodQuery(Qt::InputMethodQuery property, const QVariant &argument) const { Q_D(const QQuickTextInput); switch (property) { diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 92f3aa62ce..c10b06d02a 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -268,7 +268,7 @@ public: #if QT_CONFIG(im) QVariant inputMethodQuery(Qt::InputMethodQuery property) const override; - Q_REVISION(4) Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; + Q_REVISION(4) Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, const QVariant &argument) const; #endif QRectF boundingRect() const override; diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp index 7af90f0f8e..f8ebf13a1d 100644 --- a/src/quick/items/qquicktextnodeengine.cpp +++ b/src/quick/items/qquicktextnodeengine.cpp @@ -638,7 +638,7 @@ void QQuickTextNodeEngine::addBorder(const QRectF &rect, qreal border, QTextFrameFormat::BorderStyle borderStyle, const QBrush &borderBrush) { - QColor color = borderBrush.color(); + const QColor &color = borderBrush.color(); // Currently we don't support other styles than solid Q_UNUSED(borderStyle); diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 1b766de007..64d7232354 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2768,7 +2768,7 @@ void QQuickWindowPrivate::deliverMatchingPointsToItem(QQuickItem *item, QQuickPo // If the touch was accepted (regardless by whom or in what form), // update accepted new points. bool isPressOrRelease = pointerEvent->isPressEvent() || pointerEvent->isReleaseEvent(); - for (auto point: qAsConst(touchEvent->touchPoints())) { + for (const auto &point: qAsConst(touchEvent->touchPoints())) { if (auto pointerEventPoint = ptEvent->pointById(point.id())) { pointerEventPoint->setAccepted(); if (isPressOrRelease) @@ -2778,7 +2778,7 @@ void QQuickWindowPrivate::deliverMatchingPointsToItem(QQuickItem *item, QQuickPo } else { // But if the event was not accepted then we know this item // will not be interested in further updates for those touchpoint IDs either. - for (auto point: qAsConst(touchEvent->touchPoints())) { + for (const auto &point: qAsConst(touchEvent->touchPoints())) { if (point.state() == Qt::TouchPointPressed) { if (auto *tp = ptEvent->pointById(point.id())) { if (tp->exclusiveGrabber() == item) { @@ -3019,7 +3019,7 @@ bool QQuickWindowPrivate::sendFilteredPointerEventImpl(QQuickPointerEvent *event if (filteringParent->childMouseEventFilter(receiver, filteringParentTouchEvent.data())) { qCDebug(DBG_TOUCH) << "touch event intercepted by childMouseEventFilter of " << filteringParent; skipDelivery.append(filteringParent); - for (auto point: qAsConst(filteringParentTouchEvent->touchPoints())) { + for (const auto &point: qAsConst(filteringParentTouchEvent->touchPoints())) { QQuickEventPoint *pt = event->pointById(point.id()); pt->setAccepted(); pt->setGrabberItem(filteringParent); -- cgit v1.2.3