diff options
Diffstat (limited to 'src')
44 files changed, 57 insertions, 57 deletions
diff --git a/src/3rdparty/masm/yarr/YarrPattern.h b/src/3rdparty/masm/yarr/YarrPattern.h index 10ea2c5b94..ce2fe6ec00 100644 --- a/src/3rdparty/masm/yarr/YarrPattern.h +++ b/src/3rdparty/masm/yarr/YarrPattern.h @@ -21,7 +21,7 @@ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #pragma once @@ -169,7 +169,7 @@ struct PatternTerm { quantityType = QuantifierFixedCount; quantityMinCount = quantityMaxCount = 1; } - + PatternTerm(Type type, bool invert = false) : type(type) , m_capture(false) @@ -199,7 +199,7 @@ struct PatternTerm { quantityType = QuantifierFixedCount; quantityMinCount = quantityMaxCount = 1; } - + static PatternTerm ForwardReference() { return PatternTerm(TypeForwardReference); @@ -219,7 +219,7 @@ struct PatternTerm { { return PatternTerm(TypeAssertionWordBoundary, invert); } - + bool invert() { return m_invert; @@ -274,18 +274,18 @@ public: ASSERT(m_terms.size()); return m_terms[m_terms.size() - 1]; } - + void removeLastTerm() { ASSERT(m_terms.size()); m_terms.shrink(m_terms.size() - 1); } - + void setOnceThrough() { m_onceThrough = true; } - + bool onceThrough() { return m_onceThrough; @@ -305,12 +305,12 @@ public: struct PatternDisjunction { WTF_MAKE_FAST_ALLOCATED; public: - PatternDisjunction(PatternAlternative* parent = 0) + PatternDisjunction(PatternAlternative *parent = nullptr) : m_parent(parent) , m_hasFixedSize(false) { } - + PatternAlternative* addNewAlternative() { m_alternatives.append(std::make_unique<PatternAlternative>(this)); diff --git a/src/labs/folderlistmodel/fileinfothread_p.h b/src/labs/folderlistmodel/fileinfothread_p.h index 1ed3a9904b..9c8286f1cd 100644 --- a/src/labs/folderlistmodel/fileinfothread_p.h +++ b/src/labs/folderlistmodel/fileinfothread_p.h @@ -74,7 +74,7 @@ Q_SIGNALS: void statusChanged(QQuickFolderListModel::Status status) const; public: - FileInfoThread(QObject *parent = 0); + FileInfoThread(QObject *parent = nullptr); ~FileInfoThread(); void clear(); diff --git a/src/labs/settings/qqmlsettings_p.h b/src/labs/settings/qqmlsettings_p.h index 1739f3934a..9cc4b6571b 100644 --- a/src/labs/settings/qqmlsettings_p.h +++ b/src/labs/settings/qqmlsettings_p.h @@ -72,7 +72,7 @@ class Q_LABSSETTINGS_PRIVATE_EXPORT QQmlSettings : public QObject, public QQmlPa QML_ADDED_IN_VERSION(1, 0) public: - explicit QQmlSettings(QObject *parent = 0); + explicit QQmlSettings(QObject *parent = nullptr); ~QQmlSettings(); QString category() const; diff --git a/src/particles/qquickage_p.h b/src/particles/qquickage_p.h index 1730c25c28..491c2b0aff 100644 --- a/src/particles/qquickage_p.h +++ b/src/particles/qquickage_p.h @@ -63,7 +63,7 @@ class QQuickAgeAffector : public QQuickParticleAffector QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickAgeAffector(QQuickItem *parent = 0); + explicit QQuickAgeAffector(QQuickItem *parent = nullptr); int lifeLeft() const { diff --git a/src/particles/qquickangledirection_p.h b/src/particles/qquickangledirection_p.h index 9ec9e49d1a..a152782ae2 100644 --- a/src/particles/qquickangledirection_p.h +++ b/src/particles/qquickangledirection_p.h @@ -65,7 +65,7 @@ class QQuickAngleDirection : public QQuickDirection QML_NAMED_ELEMENT(AngleDirection) QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickAngleDirection(QObject *parent = 0); + explicit QQuickAngleDirection(QObject *parent = nullptr); QPointF sample(const QPointF &from) override; qreal angle() const { diff --git a/src/particles/qquickcumulativedirection_p.h b/src/particles/qquickcumulativedirection_p.h index 0a54d5dd22..ca93315250 100644 --- a/src/particles/qquickcumulativedirection_p.h +++ b/src/particles/qquickcumulativedirection_p.h @@ -64,7 +64,7 @@ class QQuickCumulativeDirection : public QQuickDirection QML_NAMED_ELEMENT(CumulativeDirection) QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickCumulativeDirection(QObject *parent = 0); + explicit QQuickCumulativeDirection(QObject *parent = nullptr); QQmlListProperty<QQuickDirection> directions(); QPointF sample(const QPointF &from) override; private: diff --git a/src/particles/qquickcustomaffector_p.h b/src/particles/qquickcustomaffector_p.h index 4506ae9d62..9cc1b7cfdb 100644 --- a/src/particles/qquickcustomaffector_p.h +++ b/src/particles/qquickcustomaffector_p.h @@ -71,7 +71,7 @@ class QQuickCustomAffector : public QQuickParticleAffector QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickCustomAffector(QQuickItem *parent = 0); + explicit QQuickCustomAffector(QQuickItem *parent = nullptr); void affectSystem(qreal dt) override; QQuickDirection * position() const diff --git a/src/particles/qquickellipseextruder_p.h b/src/particles/qquickellipseextruder_p.h index 3268923480..25a3aedb89 100644 --- a/src/particles/qquickellipseextruder_p.h +++ b/src/particles/qquickellipseextruder_p.h @@ -61,7 +61,7 @@ class QQuickEllipseExtruder : public QQuickParticleExtruder QML_NAMED_ELEMENT(EllipseShape) QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickEllipseExtruder(QObject *parent = 0); + explicit QQuickEllipseExtruder(QObject *parent = nullptr); QPointF extrude(const QRectF &) override; bool contains(const QRectF &bounds, const QPointF &point) override; diff --git a/src/particles/qquickfriction_p.h b/src/particles/qquickfriction_p.h index 952f47b141..ae77562611 100644 --- a/src/particles/qquickfriction_p.h +++ b/src/particles/qquickfriction_p.h @@ -62,7 +62,7 @@ class QQuickFrictionAffector : public QQuickParticleAffector QML_NAMED_ELEMENT(Friction) QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickFrictionAffector(QQuickItem *parent = 0); + explicit QQuickFrictionAffector(QQuickItem *parent = nullptr); qreal factor() const { diff --git a/src/particles/qquickgravity_p.h b/src/particles/qquickgravity_p.h index 351cbb93b1..c84f5086ef 100644 --- a/src/particles/qquickgravity_p.h +++ b/src/particles/qquickgravity_p.h @@ -64,7 +64,7 @@ class QQuickGravityAffector : public QQuickParticleAffector QML_NAMED_ELEMENT(Gravity) QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickGravityAffector(QQuickItem *parent = 0); + explicit QQuickGravityAffector(QQuickItem *parent = nullptr); qreal magnitude() const; qreal angle() const; diff --git a/src/particles/qquickgroupgoal_p.h b/src/particles/qquickgroupgoal_p.h index 5589483aa6..d0c0e52163 100644 --- a/src/particles/qquickgroupgoal_p.h +++ b/src/particles/qquickgroupgoal_p.h @@ -64,7 +64,7 @@ class QQuickGroupGoalAffector : public QQuickParticleAffector QML_NAMED_ELEMENT(GroupGoal) QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickGroupGoalAffector(QQuickItem *parent = 0); + explicit QQuickGroupGoalAffector(QQuickItem *parent = nullptr); QString goalState() const { diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h index 19000f6c9b..40f7f04998 100644 --- a/src/particles/qquickimageparticle_p.h +++ b/src/particles/qquickimageparticle_p.h @@ -224,7 +224,7 @@ class QQuickImageParticle : public QQuickParticlePainter QML_NAMED_ELEMENT(ImageParticle) QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickImageParticle(QQuickItem *parent = 0); + explicit QQuickImageParticle(QQuickItem *parent = nullptr); virtual ~QQuickImageParticle(); enum Status { Null, Ready, Loading, Error }; diff --git a/src/particles/qquickitemparticle_p.h b/src/particles/qquickitemparticle_p.h index 4fe5f9c031..1664873226 100644 --- a/src/particles/qquickitemparticle_p.h +++ b/src/particles/qquickitemparticle_p.h @@ -67,7 +67,7 @@ class QQuickItemParticle : public QQuickParticlePainter QML_ADDED_IN_VERSION(2, 0) QML_ATTACHED(QQuickItemParticleAttached) public: - explicit QQuickItemParticle(QQuickItem *parent = 0); + explicit QQuickItemParticle(QQuickItem *parent = nullptr); ~QQuickItemParticle(); bool fade() const { return m_fade; } diff --git a/src/particles/qquicklineextruder_p.h b/src/particles/qquicklineextruder_p.h index a337324c6a..2a2134bd3f 100644 --- a/src/particles/qquicklineextruder_p.h +++ b/src/particles/qquicklineextruder_p.h @@ -61,7 +61,7 @@ class QQuickLineExtruder : public QQuickParticleExtruder QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickLineExtruder(QObject *parent = 0); + explicit QQuickLineExtruder(QObject *parent = nullptr); QPointF extrude(const QRectF &) override; bool mirrored() const { diff --git a/src/particles/qquickparticleaffector_p.h b/src/particles/qquickparticleaffector_p.h index 79446a23a1..4e6089c814 100644 --- a/src/particles/qquickparticleaffector_p.h +++ b/src/particles/qquickparticleaffector_p.h @@ -73,7 +73,7 @@ class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticleAffector : public QQuickItem QML_UNCREATABLE("Abstract type. Use one of the inheriting types instead.") public: - explicit QQuickParticleAffector(QQuickItem *parent = 0); + explicit QQuickParticleAffector(QQuickItem *parent = nullptr); virtual void affectSystem(qreal dt); virtual void reset(QQuickParticleData*);//As some store their own data per particle? QQuickParticleSystem* system() const diff --git a/src/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h index 0455b97d3e..7e51a560df 100644 --- a/src/particles/qquickparticleemitter_p.h +++ b/src/particles/qquickparticleemitter_p.h @@ -87,7 +87,7 @@ class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticleEmitter : public QQuickItem QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickParticleEmitter(QQuickItem *parent = 0); + explicit QQuickParticleEmitter(QQuickItem *parent = nullptr); virtual ~QQuickParticleEmitter(); virtual void emitWindow(int timeStamp); diff --git a/src/particles/qquickparticleextruder_p.h b/src/particles/qquickparticleextruder_p.h index 0249ecd3aa..7e84dba50c 100644 --- a/src/particles/qquickparticleextruder_p.h +++ b/src/particles/qquickparticleextruder_p.h @@ -67,7 +67,7 @@ class QQuickParticleExtruder : public QObject QML_UNCREATABLE("Abstract type. Use one of the inheriting types instead.") public: - explicit QQuickParticleExtruder(QObject *parent = 0); + explicit QQuickParticleExtruder(QObject *parent = nullptr); virtual QPointF extrude(const QRectF &); virtual bool contains(const QRectF &bounds, const QPointF &point); }; diff --git a/src/particles/qquickparticlegroup_p.h b/src/particles/qquickparticlegroup_p.h index 6df1e61563..ce13b85d99 100644 --- a/src/particles/qquickparticlegroup_p.h +++ b/src/particles/qquickparticlegroup_p.h @@ -68,7 +68,7 @@ class QQuickParticleGroup : public QQuickStochasticState, public QQmlParserStatu Q_INTERFACES(QQmlParserStatus) public: - explicit QQuickParticleGroup(QObject* parent = 0); + explicit QQuickParticleGroup(QObject *parent = nullptr); QQmlListProperty<QObject> particleChildren(); diff --git a/src/particles/qquickparticlepainter_p.h b/src/particles/qquickparticlepainter_p.h index 5236bb6569..cecf04e4b0 100644 --- a/src/particles/qquickparticlepainter_p.h +++ b/src/particles/qquickparticlepainter_p.h @@ -72,7 +72,7 @@ public: // data typedef QQuickParticleVarLengthArray<QQuickParticleGroupData::ID, 4> GroupIDs; public: - explicit QQuickParticlePainter(QQuickItem *parent = 0); + explicit QQuickParticlePainter(QQuickItem *parent = nullptr); //Data Interface to system void load(QQuickParticleData*); void reload(QQuickParticleData*); diff --git a/src/particles/qquickpointattractor_p.h b/src/particles/qquickpointattractor_p.h index b3314f1a96..e20e1b4535 100644 --- a/src/particles/qquickpointattractor_p.h +++ b/src/particles/qquickpointattractor_p.h @@ -82,7 +82,7 @@ public: }; Q_ENUM(AffectableParameters) - explicit QQuickAttractorAffector(QQuickItem *parent = 0); + explicit QQuickAttractorAffector(QQuickItem *parent = nullptr); qreal strength() const { diff --git a/src/particles/qquickpointdirection_p.h b/src/particles/qquickpointdirection_p.h index 39109d8331..9bcabcaf20 100644 --- a/src/particles/qquickpointdirection_p.h +++ b/src/particles/qquickpointdirection_p.h @@ -64,7 +64,7 @@ class QQuickPointDirection : public QQuickDirection QML_NAMED_ELEMENT(PointDirection) QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickPointDirection(QObject *parent = 0); + explicit QQuickPointDirection(QObject *parent = nullptr); QPointF sample(const QPointF &from) override; qreal x() const { diff --git a/src/particles/qquickrectangleextruder_p.h b/src/particles/qquickrectangleextruder_p.h index f6f39579c4..61ac88e9d3 100644 --- a/src/particles/qquickrectangleextruder_p.h +++ b/src/particles/qquickrectangleextruder_p.h @@ -63,7 +63,7 @@ class QQuickRectangleExtruder : public QQuickParticleExtruder QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickRectangleExtruder(QObject *parent = 0); + explicit QQuickRectangleExtruder(QObject *parent = nullptr); QPointF extrude(const QRectF &) override; bool contains(const QRectF &bounds, const QPointF &point) override; bool fill() const diff --git a/src/particles/qquickspritegoal_p.h b/src/particles/qquickspritegoal_p.h index efd9b1ab39..93be75c3cc 100644 --- a/src/particles/qquickspritegoal_p.h +++ b/src/particles/qquickspritegoal_p.h @@ -66,7 +66,7 @@ class QQuickSpriteGoalAffector : public QQuickParticleAffector QML_NAMED_ELEMENT(SpriteGoal) QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickSpriteGoalAffector(QQuickItem *parent = 0); + explicit QQuickSpriteGoalAffector(QQuickItem *parent = nullptr); QString goalState() const { diff --git a/src/particles/qquicktargetdirection_p.h b/src/particles/qquicktargetdirection_p.h index ea6ac24893..b02a497e9a 100644 --- a/src/particles/qquicktargetdirection_p.h +++ b/src/particles/qquicktargetdirection_p.h @@ -74,7 +74,7 @@ class QQuickTargetDirection : public QQuickDirection QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickTargetDirection(QObject *parent = 0); + explicit QQuickTargetDirection(QObject *parent = nullptr); QPointF sample(const QPointF &from) override; qreal targetX() const diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h index 6cf2dc0c98..aa4686ddea 100644 --- a/src/particles/qquicktrailemitter_p.h +++ b/src/particles/qquicktrailemitter_p.h @@ -72,7 +72,7 @@ public: ParticleSize = -2//Anything less than 0 will do }; Q_ENUM(EmitSize) - explicit QQuickTrailEmitter(QQuickItem *parent = 0); + explicit QQuickTrailEmitter(QQuickItem *parent = nullptr); void emitWindow(int timeStamp) override; void reset() override; diff --git a/src/particles/qquickturbulence_p.h b/src/particles/qquickturbulence_p.h index c7a31bb8ae..dca946e39e 100644 --- a/src/particles/qquickturbulence_p.h +++ b/src/particles/qquickturbulence_p.h @@ -66,7 +66,7 @@ class QQuickTurbulenceAffector : public QQuickParticleAffector QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickTurbulenceAffector(QQuickItem *parent = 0); + explicit QQuickTurbulenceAffector(QQuickItem *parent = nullptr); ~QQuickTurbulenceAffector(); void affectSystem(qreal dt) override; diff --git a/src/particles/qquickwander_p.h b/src/particles/qquickwander_p.h index 174b780562..29458d926c 100644 --- a/src/particles/qquickwander_p.h +++ b/src/particles/qquickwander_p.h @@ -82,7 +82,7 @@ public: }; Q_ENUM(AffectableParameters) - explicit QQuickWanderAffector(QQuickItem *parent = 0); + explicit QQuickWanderAffector(QQuickItem *parent = nullptr); ~QQuickWanderAffector(); // virtual void reset(int systemIdx); diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h index a18ff942b6..f9cc27b060 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h +++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h @@ -70,7 +70,7 @@ class QQmlEngineDebugServiceImpl : public QQmlEngineDebugService { Q_OBJECT public: - QQmlEngineDebugServiceImpl(QObject * = 0); + QQmlEngineDebugServiceImpl(QObject * = nullptr); ~QQmlEngineDebugServiceImpl(); struct QQmlObjectData { diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.h b/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.h index 4b304a6087..ec5bd58523 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.h +++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.h @@ -69,7 +69,7 @@ class QQmlWatcher : public QObject { Q_OBJECT public: - QQmlWatcher(QObject * = 0); + QQmlWatcher(QObject * = nullptr); bool addWatch(int id, quint32 objectId); bool addWatch(int id, quint32 objectId, const QByteArray &property); diff --git a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h index f7b325c454..9980fd8a26 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h @@ -57,7 +57,7 @@ class GlobalInspector : public QObject { Q_OBJECT public: - GlobalInspector(QObject *parent = 0) : QObject(parent), m_eventId(0) {} + GlobalInspector(QObject *parent = nullptr) : QObject(parent), m_eventId(0) {} ~GlobalInspector(); void setSelectedItems(const QList<QQuickItem *> &items); diff --git a/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.h b/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.h index fc18f33ad3..f2bc9ccb85 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.h @@ -63,7 +63,7 @@ class QQuickWindowInspector : public QObject Q_OBJECT public: - explicit QQuickWindowInspector(QQuickWindow *quickWindow, QObject *parent = 0); + explicit QQuickWindowInspector(QQuickWindow *quickWindow, QObject *parent = nullptr); QQuickItem *overlay() const { return m_overlay; } QQuickItem *topVisibleItemAt(const QPointF &pos) const; diff --git a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.h b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.h index eb78afe900..8c2256b3fe 100644 --- a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.h +++ b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.h @@ -63,7 +63,7 @@ class QDebugMessageServiceImpl : public QDebugMessageService { Q_OBJECT public: - QDebugMessageServiceImpl(QObject *parent = 0); + QDebugMessageServiceImpl(QObject *parent = nullptr); void sendDebugMessage(QtMsgType type, const QMessageLogContext &ctxt, const QString &buf); void synchronizeTime(const QElapsedTimer &otherTimer) override; diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.h b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.h index e0d1b2d9a8..44b102fd46 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.h @@ -65,7 +65,7 @@ class QQmlDebugTranslationServiceImpl : public QQmlDebugTranslationService { Q_OBJECT public: - QQmlDebugTranslationServiceImpl(QObject *parent = 0); + QQmlDebugTranslationServiceImpl(QObject *parent = nullptr); ~QQmlDebugTranslationServiceImpl(); void foundTranslationBinding(const TranslationBindingInformation &translationBindingInformation) override; diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h index 3c5daa0f4f..45922c7a4f 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h +++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h @@ -71,7 +71,7 @@ public: StopWaitingEngine }; - QQmlEngineControlServiceImpl(QObject *parent = 0); + QQmlEngineControlServiceImpl(QObject *parent = nullptr); protected: friend class QQmlProfilerServiceFactory; diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h index 3791ab29ae..bff337d35a 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h +++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h @@ -93,7 +93,7 @@ public: quint64 features = std::numeric_limits<quint64>::max()) override; void stopProfiling(QJSEngine *engine) override; - QQmlProfilerServiceImpl(QObject *parent = 0); + QQmlProfilerServiceImpl(QObject *parent = nullptr); ~QQmlProfilerServiceImpl() override; void dataReady(QQmlAbstractProfilerAdapter *profiler) override; diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.h b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.h index 1f3467c1d0..ecbcede4d2 100644 --- a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.h +++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QQuickProfilerAdapter : public QQmlAbstractProfilerAdapter { Q_OBJECT public: - QQuickProfilerAdapter(QObject *parent = 0); + QQuickProfilerAdapter(QObject *parent = nullptr); ~QQuickProfilerAdapter(); qint64 sendMessages(qint64 until, QList<QByteArray> &messages) override; void receiveData(const QVector<QQuickProfilerData> &new_data); diff --git a/src/qml/doc/snippets/code/src_qml_qqmlparserstatus.cpp b/src/qml/doc/snippets/code/src_qml_qqmlparserstatus.cpp index f5d6f824f2..58a290c4ae 100644 --- a/src/qml/doc/snippets/code/src_qml_qqmlparserstatus.cpp +++ b/src/qml/doc/snippets/code/src_qml_qqmlparserstatus.cpp @@ -58,7 +58,7 @@ class MyObject : public QObject, public QQmlParserStatus Q_INTERFACES(QQmlParserStatus) public: - MyObject(QObject *parent = 0); + MyObject(QObject *parent = nullptr); // ... void classBegin() override; void componentComplete() override; diff --git a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/avatarExample.h b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/avatarExample.h index 1acc3a1c2f..58e75d02ae 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/avatarExample.h +++ b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/avatarExample.h @@ -64,7 +64,7 @@ class AvatarExample : public QObject QML_ELEMENT public: - AvatarExample(QObject *parent = 0) + AvatarExample(QObject *parent = nullptr) : QObject(parent), m_value(100, 100) { m_value.fill(Qt::blue); diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc index 53af637510..b8524b3e93 100644 --- a/src/qml/doc/src/qmlfunctions.qdoc +++ b/src/qml/doc/src/qmlfunctions.qdoc @@ -1022,7 +1022,7 @@ Q_PROPERTY (int someProperty READ someProperty WRITE setSomeProperty NOTIFY somePropertyChanged) public: - SingletonTypeExample(QObject* parent = 0) + SingletonTypeExample(QObject *parent = nullptr) : QObject(parent), m_someProperty(0) { } diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h index e3075c70ec..0a62ec61bc 100644 --- a/src/quick/items/qquickdroparea_p.h +++ b/src/quick/items/qquickdroparea_p.h @@ -134,7 +134,7 @@ class QQuickDropAreaDrag : public QObject QML_ANONYMOUS QML_ADDED_IN_VERSION(2, 0) public: - QQuickDropAreaDrag(QQuickDropAreaPrivate *d, QObject *parent = 0); + QQuickDropAreaDrag(QQuickDropAreaPrivate *d, QObject *parent = nullptr); ~QQuickDropAreaDrag(); qreal x() const; diff --git a/src/quick/util/qquicktextmetrics_p.h b/src/quick/util/qquicktextmetrics_p.h index 8fd0d84648..50036bb1f4 100644 --- a/src/quick/util/qquicktextmetrics_p.h +++ b/src/quick/util/qquicktextmetrics_p.h @@ -81,7 +81,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTextMetrics : public QObject QML_ADDED_IN_VERSION(2, 4) public: - explicit QQuickTextMetrics(QObject *parent = 0); + explicit QQuickTextMetrics(QObject *parent = nullptr); QFont font() const; void setFont(const QFont &font); diff --git a/src/quicklayouts/qquicklinearlayout.cpp b/src/quicklayouts/qquicklinearlayout.cpp index 2f97708b52..fc00691820 100644 --- a/src/quicklayouts/qquicklinearlayout.cpp +++ b/src/quicklayouts/qquicklinearlayout.cpp @@ -227,7 +227,7 @@ QQuickGridLayoutBase::QQuickGridLayoutBase() QQuickGridLayoutBase::QQuickGridLayoutBase(QQuickGridLayoutBasePrivate &dd, Qt::Orientation orientation, - QQuickItem *parent /*= 0*/) + QQuickItem *parent /*= nullptr */) : QQuickLayout(dd, parent) { Q_D(QQuickGridLayoutBase); @@ -516,7 +516,7 @@ void QQuickGridLayoutBase::rearrange(const QSizeF &size) ** QQuickGridLayout ** **/ -QQuickGridLayout::QQuickGridLayout(QQuickItem *parent /* = 0*/) +QQuickGridLayout::QQuickGridLayout(QQuickItem *parent /* = nullptr*/) : QQuickGridLayoutBase(*new QQuickGridLayoutPrivate, Qt::Horizontal, parent) { } @@ -781,7 +781,7 @@ void QQuickGridLayout::insertLayoutItems() ** **/ QQuickLinearLayout::QQuickLinearLayout(Qt::Orientation orientation, - QQuickItem *parent /*= 0*/) + QQuickItem *parent /*= nullptr*/) : QQuickGridLayoutBase(*new QQuickLinearLayoutPrivate, orientation, parent) { } diff --git a/src/quicktestutils/qml/qmlutils.cpp b/src/quicktestutils/qml/qmlutils.cpp index 130dd4e0cb..af100ad4bf 100644 --- a/src/quicktestutils/qml/qmlutils.cpp +++ b/src/quicktestutils/qml/qmlutils.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE -QQmlDataTest *QQmlDataTest::m_instance = 0; +QQmlDataTest *QQmlDataTest::m_instance = nullptr; QQmlDataTest::QQmlDataTest(const char *qmlTestDataDir) : m_qmlTestDataDir(qmlTestDataDir), @@ -54,7 +54,7 @@ QQmlDataTest::QQmlDataTest(const char *qmlTestDataDir) : QQmlDataTest::~QQmlDataTest() { - m_instance = 0; + m_instance = nullptr; } void QQmlDataTest::initTestCase() @@ -86,7 +86,7 @@ bool QQmlDataTest::canImportModule(const QString &importTestQmlSource) const Q_GLOBAL_STATIC(QMutex, qQmlTestMessageHandlerMutex) -QQmlTestMessageHandler *QQmlTestMessageHandler::m_instance = 0; +QQmlTestMessageHandler *QQmlTestMessageHandler::m_instance = nullptr; void QQmlTestMessageHandler::messageHandler(QtMsgType, const QMessageLogContext &context, const QString &message) { @@ -115,7 +115,7 @@ QQmlTestMessageHandler::~QQmlTestMessageHandler() QMutexLocker locker(qQmlTestMessageHandlerMutex()); Q_ASSERT(QQmlTestMessageHandler::m_instance); qInstallMessageHandler(m_oldHandler); - QQmlTestMessageHandler::m_instance = 0; + QQmlTestMessageHandler::m_instance = nullptr; } QT_END_NAMESPACE diff --git a/src/quicktestutils/quick/visualtestutils.cpp b/src/quicktestutils/quick/visualtestutils.cpp index c94484d189..9447c91513 100644 --- a/src/quicktestutils/quick/visualtestutils.cpp +++ b/src/quicktestutils/quick/visualtestutils.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE QQuickItem *QQuickVisualTestUtils::findVisibleChild(QQuickItem *parent, const QString &objectName) { - QQuickItem *item = 0; + QQuickItem *item = nullptr; QList<QQuickItem*> items = parent->findChildren<QQuickItem*>(objectName); for (int i = 0; i < items.count(); ++i) { if (items.at(i)->isVisible() && !QQuickItemPrivate::get(items.at(i))->culled) { |