diff options
-rw-r--r-- | src/particles/qquickgroupgoal.cpp | 2 | ||||
-rw-r--r-- | src/particles/qquickgroupgoal_p.h | 4 | ||||
-rw-r--r-- | src/particles/qquickparticleaffector_p.h | 8 | ||||
-rw-r--r-- | src/particles/qquickparticleemitter_p.h | 4 | ||||
-rw-r--r-- | src/particles/qquickparticlepainter_p.h | 4 | ||||
-rw-r--r-- | src/particles/qquickspritegoal.cpp | 2 | ||||
-rw-r--r-- | src/particles/qquickspritegoal_p.h | 4 | ||||
-rw-r--r-- | src/particles/qquicktrailemitter_p.h | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4debugging_p.h | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlfileselector.cpp | 12 | ||||
-rw-r--r-- | src/qml/qml/qqmlfileselector.h | 3 | ||||
-rw-r--r-- | src/quick/items/qquickspriteengine_p.h | 12 | ||||
-rw-r--r-- | src/quick/items/qquickspritesequence_p.h | 4 | ||||
-rw-r--r-- | src/quick/util/qquickanimation_p.h | 4 |
14 files changed, 41 insertions, 28 deletions
diff --git a/src/particles/qquickgroupgoal.cpp b/src/particles/qquickgroupgoal.cpp index 8a487ae4c5..e2d457063b 100644 --- a/src/particles/qquickgroupgoal.cpp +++ b/src/particles/qquickgroupgoal.cpp @@ -82,7 +82,7 @@ QQuickGroupGoalAffector::QQuickGroupGoalAffector(QQuickItem *parent) : m_ignoresTime = true; } -void QQuickGroupGoalAffector::setGoalState(QString arg) +void QQuickGroupGoalAffector::setGoalState(const QString &arg) { if (m_goalState != arg) { m_goalState = arg; diff --git a/src/particles/qquickgroupgoal_p.h b/src/particles/qquickgroupgoal_p.h index 5d385f2f36..e51cb86e07 100644 --- a/src/particles/qquickgroupgoal_p.h +++ b/src/particles/qquickgroupgoal_p.h @@ -70,13 +70,13 @@ protected: Q_SIGNALS: - void goalStateChanged(QString arg); + void goalStateChanged(const QString &arg); void jumpChanged(bool arg); public Q_SLOTS: - void setGoalState(QString arg); + void setGoalState(const QString &arg); void setJump(bool arg) { diff --git a/src/particles/qquickparticleaffector_p.h b/src/particles/qquickparticleaffector_p.h index 5ee8430472..3b774f5ff0 100644 --- a/src/particles/qquickparticleaffector_p.h +++ b/src/particles/qquickparticleaffector_p.h @@ -96,7 +96,7 @@ Q_SIGNALS: void systemChanged(QQuickParticleSystem* arg); - void groupsChanged(QStringList arg); + void groupsChanged(const QStringList &arg); void enabledChanged(bool arg); @@ -106,7 +106,7 @@ Q_SIGNALS: void affected(qreal x, qreal y); - void whenCollidingWithChanged(QStringList arg); + void whenCollidingWithChanged(const QStringList &arg); public Q_SLOTS: void setSystem(QQuickParticleSystem* arg) @@ -118,7 +118,7 @@ void setSystem(QQuickParticleSystem* arg) } } -void setGroups(QStringList arg) +void setGroups(const QStringList &arg) { if (m_groups != arg) { m_groups = arg; @@ -152,7 +152,7 @@ void setShape(QQuickParticleExtruder* arg) } } -void setWhenCollidingWith(QStringList arg) +void setWhenCollidingWith(const QStringList &arg) { if (m_whenCollidingWith != arg) { m_whenCollidingWith = arg; diff --git a/src/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h index edca86d53d..e39310aec2 100644 --- a/src/particles/qquickparticleemitter_p.h +++ b/src/particles/qquickparticleemitter_p.h @@ -126,7 +126,7 @@ Q_SIGNALS: void systemChanged(QQuickParticleSystem* arg); - void groupChanged(QString arg); + void groupChanged(const QString &arg); void particleDurationVariationChanged(int arg); @@ -182,7 +182,7 @@ public Q_SLOTS: } } - void setGroup(QString arg) + void setGroup(const QString &arg) { if (m_group != arg) { m_group = arg; diff --git a/src/particles/qquickparticlepainter_p.h b/src/particles/qquickparticlepainter_p.h index cedf4cab52..ff1b8839e5 100644 --- a/src/particles/qquickparticlepainter_p.h +++ b/src/particles/qquickparticlepainter_p.h @@ -80,12 +80,12 @@ Q_SIGNALS: void countChanged(); void systemChanged(QQuickParticleSystem* arg); - void groupsChanged(QStringList arg); + void groupsChanged(const QStringList &arg); public Q_SLOTS: void setSystem(QQuickParticleSystem* arg); - void setGroups(QStringList arg) + void setGroups(const QStringList &arg) { if (m_groups != arg) { m_groups = arg; diff --git a/src/particles/qquickspritegoal.cpp b/src/particles/qquickspritegoal.cpp index 08c57f3d45..7c0a8deaff 100644 --- a/src/particles/qquickspritegoal.cpp +++ b/src/particles/qquickspritegoal.cpp @@ -108,7 +108,7 @@ void QQuickSpriteGoalAffector::updateStateIndex(QQuickStochasticEngine* e) } } -void QQuickSpriteGoalAffector::setGoalState(QString arg) +void QQuickSpriteGoalAffector::setGoalState(const QString &arg) { if (m_goalState != arg) { m_goalState = arg; diff --git a/src/particles/qquickspritegoal_p.h b/src/particles/qquickspritegoal_p.h index c5c7539b58..eb7850a8f7 100644 --- a/src/particles/qquickspritegoal_p.h +++ b/src/particles/qquickspritegoal_p.h @@ -75,7 +75,7 @@ protected: virtual bool affectParticle(QQuickParticleData *d, qreal dt); Q_SIGNALS: - void goalStateChanged(QString arg); + void goalStateChanged(const QString &arg); void jumpChanged(bool arg); @@ -83,7 +83,7 @@ Q_SIGNALS: public Q_SLOTS: -void setGoalState(QString arg); +void setGoalState(const QString &arg); void setJump(bool arg) { diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h index f3f6884417..31a95a42e0 100644 --- a/src/particles/qquicktrailemitter_p.h +++ b/src/particles/qquicktrailemitter_p.h @@ -99,7 +99,7 @@ Q_SIGNALS: void emitterYVariationChanged(qreal arg); - void followChanged(QString arg); + void followChanged(const QString &arg); void emissionShapeChanged(QQuickParticleExtruder* arg); @@ -128,7 +128,7 @@ public Q_SLOTS: } } - void setFollow(QString arg) + void setFollow(const QString &arg) { if (m_follow != arg) { m_follow = arg; diff --git a/src/qml/jsruntime/qv4debugging_p.h b/src/qml/jsruntime/qv4debugging_p.h index cedfee7f90..46d6313b68 100644 --- a/src/qml/jsruntime/qv4debugging_p.h +++ b/src/qml/jsruntime/qv4debugging_p.h @@ -70,7 +70,7 @@ enum PauseReason { class DebuggerAgent; struct DebuggerBreakPoint { - DebuggerBreakPoint(QString fileName, int line) + DebuggerBreakPoint(const QString &fileName, int line) : fileName(fileName), lineNumber(line) {} QString fileName; diff --git a/src/qml/qml/qqmlfileselector.cpp b/src/qml/qml/qqmlfileselector.cpp index 8498a4d67d..ffda7a3cf9 100644 --- a/src/qml/qml/qqmlfileselector.cpp +++ b/src/qml/qml/qqmlfileselector.cpp @@ -162,6 +162,18 @@ void QQmlFileSelector::setExtraSelectors(QStringList &strings) d->selector->setExtraSelectors(strings); } + +/*! + Adds extra selectors contained in \a strings to the current QFileSelector being used. + Use this when extra selectors are all you need to avoid having to create your own + QFileSelector instance. +*/ +void QQmlFileSelector::setExtraSelectors(const QStringList &strings) +{ + Q_D(QQmlFileSelector); + d->selector->setExtraSelectors(strings); +} + /*! Gets the QQmlFileSelector currently active on the target \a engine. */ diff --git a/src/qml/qml/qqmlfileselector.h b/src/qml/qml/qqmlfileselector.h index ec9bbc77db..64d10d3cdc 100644 --- a/src/qml/qml/qqmlfileselector.h +++ b/src/qml/qml/qqmlfileselector.h @@ -59,7 +59,8 @@ public: QQmlFileSelector(QQmlEngine* engine, QObject* parent=0); ~QQmlFileSelector(); void setSelector(QFileSelector *selector); - void setExtraSelectors(QStringList &strings); + void setExtraSelectors(QStringList &strings); // TODO Qt6: remove + void setExtraSelectors(const QStringList &strings); static QQmlFileSelector* get(QQmlEngine*); private: diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index 3ff5f8caee..b2d20e1579 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -111,9 +111,9 @@ public: Q_SIGNALS: void durationChanged(int arg); - void nameChanged(QString arg); + void nameChanged(const QString &arg); - void toChanged(QVariantMap arg); + void toChanged(const QVariantMap &arg); void durationVariationChanged(int arg); @@ -130,7 +130,7 @@ public Q_SLOTS: } } - void setName(QString arg) + void setName(const QString &arg) { if (m_name != arg) { m_name = arg; @@ -138,7 +138,7 @@ public Q_SLOTS: } } - void setTo(QVariantMap arg) + void setTo(const QVariantMap &arg) { if (m_to != arg) { m_to = arg; @@ -216,11 +216,11 @@ public: private: Q_SIGNALS: - void globalGoalChanged(QString arg); + void globalGoalChanged(const QString &arg); void stateChanged(int idx); public Q_SLOTS: - void setGlobalGoal(QString arg) + void setGlobalGoal(const QString &arg) { if (m_globalGoal != arg) { m_globalGoal = arg; diff --git a/src/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h index 8f5a992942..d029482aec 100644 --- a/src/quick/items/qquickspritesequence_p.h +++ b/src/quick/items/qquickspritesequence_p.h @@ -92,8 +92,8 @@ Q_SIGNALS: void runningChanged(bool arg); void interpolateChanged(bool arg); - void goalSpriteChanged(QString arg); - void currentSpriteChanged(QString arg); + void goalSpriteChanged(const QString &arg); + void currentSpriteChanged(const QString &arg); public Q_SLOTS: diff --git a/src/quick/util/qquickanimation_p.h b/src/quick/util/qquickanimation_p.h index 80783b1b96..a9d8ee66c8 100644 --- a/src/quick/util/qquickanimation_p.h +++ b/src/quick/util/qquickanimation_p.h @@ -300,8 +300,8 @@ protected: QObject *defaultTarget = 0); Q_SIGNALS: void durationChanged(int); - void fromChanged(QVariant); - void toChanged(QVariant); + void fromChanged(const QVariant &); + void toChanged(const QVariant &); void easingChanged(const QEasingCurve &); void propertiesChanged(const QString &); void targetChanged(); |