diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-14 17:14:39 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-14 16:16:14 +0000 |
commit | bd1d8d14e73a6487cbbd0dc03aed4ad275ef2346 (patch) | |
tree | edb70b76993f5c5e3bc434c00129e9a534373cb0 | |
parent | 19316bc38c050cba511772d3a4edb02e9fa7ac33 (diff) |
Use nullptr
Change-Id: I1643f2a16ddc02a561704465953487115d24fdac
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
76 files changed, 82 insertions, 82 deletions
diff --git a/src/qmlandroid/app/qqmlandroidactionbar_p.h b/src/qmlandroid/app/qqmlandroidactionbar_p.h index ee73abf..5cda2ea 100644 --- a/src/qmlandroid/app/qqmlandroidactionbar_p.h +++ b/src/qmlandroid/app/qqmlandroidactionbar_p.h @@ -65,7 +65,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidActionBar : public QQmlAndroidObject Q_PROPERTY(QQmlAndroidDrawable *background READ background WRITE setBackground NOTIFY backgroundChanged) public: - explicit QQmlAndroidActionBar(QObject *parent = 0); + explicit QQmlAndroidActionBar(QObject *parent = nullptr); bool isVisible() const; void setVisible(bool visible); diff --git a/src/qmlandroid/app/qqmlandroidactivity_p.h b/src/qmlandroid/app/qqmlandroidactivity_p.h index 7d120e6..abc4c9c 100644 --- a/src/qmlandroid/app/qqmlandroidactivity_p.h +++ b/src/qmlandroid/app/qqmlandroidactivity_p.h @@ -66,7 +66,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidActivity : public QQmlAndroidContextWrapper Q_PROPERTY(QQmlAndroidView *contentView READ contentView WRITE setContentView) public: - explicit QQmlAndroidActivity(QObject *parent = 0); + explicit QQmlAndroidActivity(QObject *parent = nullptr); QQmlAndroidWindow *window() const; diff --git a/src/qmlandroid/app/qqmlandroidalertdialog_p.h b/src/qmlandroid/app/qqmlandroidalertdialog_p.h index 593fa68..53b5214 100644 --- a/src/qmlandroid/app/qqmlandroidalertdialog_p.h +++ b/src/qmlandroid/app/qqmlandroidalertdialog_p.h @@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAlertDialog : public QQmlAndroidDialog Q_PROPERTY(QString message READ message WRITE setMessage NOTIFY messageChanged) public: - explicit QQmlAndroidAlertDialog(QObject *parent = 0); + explicit QQmlAndroidAlertDialog(QObject *parent = nullptr); QString title() const; void setTitle(const QString &title); diff --git a/src/qmlandroid/app/qqmlandroiddialog_p.h b/src/qmlandroid/app/qqmlandroiddialog_p.h index e152ab7..3630dec 100644 --- a/src/qmlandroid/app/qqmlandroiddialog_p.h +++ b/src/qmlandroid/app/qqmlandroiddialog_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidDialog : public QQmlAndroidContextual Q_OBJECT public: - explicit QQmlAndroidDialog(QObject *parent = 0); + explicit QQmlAndroidDialog(QObject *parent = nullptr); public Q_SLOTS: void cancel(); diff --git a/src/qmlandroid/app/qqmlandroidservice_p.h b/src/qmlandroid/app/qqmlandroidservice_p.h index 5bb0257..abf37d3 100644 --- a/src/qmlandroid/app/qqmlandroidservice_p.h +++ b/src/qmlandroid/app/qqmlandroidservice_p.h @@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidService : public QQmlAndroidContextWrapper Q_PROPERTY(bool sticky READ isSticky WRITE setSticky NOTIFY stickyChanged) public: - explicit QQmlAndroidService(QObject *parent = 0); + explicit QQmlAndroidService(QObject *parent = nullptr); bool isSticky() const; void setSticky(bool sticky); diff --git a/src/qmlandroid/content/qqmlandroidcontext_p.h b/src/qmlandroid/content/qqmlandroidcontext_p.h index c64ffe9..6bb6736 100644 --- a/src/qmlandroid/content/qqmlandroidcontext_p.h +++ b/src/qmlandroid/content/qqmlandroidcontext_p.h @@ -57,8 +57,8 @@ class Q_QMLANDROID_EXPORT QQmlAndroidContext : public QQmlAndroidContextual Q_OBJECT public: - explicit QQmlAndroidContext(QObject *parent = 0); - explicit QQmlAndroidContext(QQmlAndroidContext *context, QObject *parent = 0); + explicit QQmlAndroidContext(QObject *parent = nullptr); + explicit QQmlAndroidContext(QQmlAndroidContext *context, QObject *parent = nullptr); }; QT_END_NAMESPACE diff --git a/src/qmlandroid/content/qqmlandroidcontextual_p.h b/src/qmlandroid/content/qqmlandroidcontextual_p.h index f7a844c..1555022 100644 --- a/src/qmlandroid/content/qqmlandroidcontextual_p.h +++ b/src/qmlandroid/content/qqmlandroidcontextual_p.h @@ -60,8 +60,8 @@ class Q_QMLANDROID_EXPORT QQmlAndroidContextual : public QQmlAndroidObject Q_PROPERTY(QQmlAndroidContext *context READ context NOTIFY contextChanged) public: - explicit QQmlAndroidContextual(QObject *parent = 0); - explicit QQmlAndroidContextual(QQmlAndroidContext *context, QObject *parent = 0); + explicit QQmlAndroidContextual(QObject *parent = nullptr); + explicit QQmlAndroidContextual(QQmlAndroidContext *context, QObject *parent = nullptr); QAndroidJniObject ctx() const; QQmlAndroidContext *context() const; @@ -74,7 +74,7 @@ protected: void componentComplete() Q_DECL_OVERRIDE; private Q_SLOTS: - bool initContext(QQmlAndroidContext *context = 0); + bool initContext(QQmlAndroidContext *context = nullptr); void resolveContext(); void propagateContext(); diff --git a/src/qmlandroid/content/qqmlandroidcontextwrapper_p.h b/src/qmlandroid/content/qqmlandroidcontextwrapper_p.h index 761fbff..59e73a5 100644 --- a/src/qmlandroid/content/qqmlandroidcontextwrapper_p.h +++ b/src/qmlandroid/content/qqmlandroidcontextwrapper_p.h @@ -57,8 +57,8 @@ class Q_QMLANDROID_EXPORT QQmlAndroidContextWrapper : public QQmlAndroidContext Q_OBJECT public: - explicit QQmlAndroidContextWrapper(QObject *parent = 0); - explicit QQmlAndroidContextWrapper(QQmlAndroidContext *context, QObject *parent = 0); + explicit QQmlAndroidContextWrapper(QObject *parent = nullptr); + explicit QQmlAndroidContextWrapper(QQmlAndroidContext *context, QObject *parent = nullptr); }; QT_END_NAMESPACE diff --git a/src/qmlandroid/core/qqmlandroidobject_p.h b/src/qmlandroid/core/qqmlandroidobject_p.h index 00bde6c..6d6acf3 100644 --- a/src/qmlandroid/core/qqmlandroidobject_p.h +++ b/src/qmlandroid/core/qqmlandroidobject_p.h @@ -67,7 +67,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidObject : public QObject, public QQmlParserS Q_INTERFACES(QQmlParserStatus) public: - explicit QQmlAndroidObject(QObject *parent = 0); + explicit QQmlAndroidObject(QObject *parent = nullptr); bool isValid() const; QAndroidJniObject instance() const; diff --git a/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h b/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h index 9dd6f86..48a696a 100644 --- a/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h +++ b/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h @@ -58,8 +58,8 @@ class Q_QMLANDROID_EXPORT QQmlAndroidColorDrawable : public QQmlAndroidDrawable Q_PROPERTY(int color READ color WRITE setColor NOTIFY colorChanged) public: - explicit QQmlAndroidColorDrawable(QObject *parent = 0); - explicit QQmlAndroidColorDrawable(int color, QObject *parent = 0); + explicit QQmlAndroidColorDrawable(QObject *parent = nullptr); + explicit QQmlAndroidColorDrawable(int color, QObject *parent = nullptr); int color() const; void setColor(int color); diff --git a/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h b/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h index ca61056..88a7846 100644 --- a/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h +++ b/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidDrawable : public QQmlAndroidObject Q_OBJECT public: - explicit QQmlAndroidDrawable(QObject *parent = 0); + explicit QQmlAndroidDrawable(QObject *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h index c668925..1781fa8 100644 --- a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h +++ b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h @@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidDrawerLayout : public QQmlAndroidViewGroup Q_OBJECT public: - explicit QQmlAndroidDrawerLayout(QQmlAndroidView *parent = 0); + explicit QQmlAndroidDrawerLayout(QQmlAndroidView *parent = nullptr); static QQmlAndroidDrawerLayoutParams *qmlAttachedProperties(QObject *object); diff --git a/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h b/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h index 750d133..6a65be8 100644 --- a/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h +++ b/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h @@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidSwipeRefreshLayout : public QQmlAndroidView Q_PROPERTY(bool refreshing READ isRefreshing WRITE setRefreshing NOTIFY refreshingChanged) public: - explicit QQmlAndroidSwipeRefreshLayout(QQmlAndroidView *parent = 0); + explicit QQmlAndroidSwipeRefreshLayout(QQmlAndroidView *parent = nullptr); bool isRefreshing() const; void setRefreshing(bool refreshing); diff --git a/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle_p.h b/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle_p.h index bcc2e38..b649219 100644 --- a/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle_p.h +++ b/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidActionBarDrawerToggle : public QQmlAndroidO Q_OBJECT public: - explicit QQmlAndroidActionBarDrawerToggle(QObject *parent = 0); + explicit QQmlAndroidActionBarDrawerToggle(QObject *parent = nullptr); void onCreate(const QAndroidJniObject &activity, const QAndroidJniObject &drawer); }; diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h b/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h index 5abd890..48adc88 100644 --- a/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h +++ b/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidCardView : public QQmlAndroidFrameLayout Q_OBJECT public: - explicit QQmlAndroidCardView(QQmlAndroidView *parent = 0); + explicit QQmlAndroidCardView(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp index 44eab94..54056ca 100644 --- a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp +++ b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp @@ -116,7 +116,7 @@ jobject QQmlAndroidRecyclerAdapter::onCreateViewHolder(JNIEnv *env, jobject obje Q_UNUSED(viewType); QQmlAndroidRecyclerAdapter *adapter = reinterpret_cast<QQmlAndroidRecyclerAdapter *>(instance); if (adapter) { - QQmlAndroidView *item = 0; + QQmlAndroidView *item = nullptr; QMetaObject::invokeMethod(adapter, "createItem", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QQmlAndroidView *, item)); item->construct(); adapter->m_holders += QAndroidJniObject("qt/android/support/v7/widget/QmlRecyclerAdapter$ViewHolder", @@ -143,7 +143,7 @@ void QQmlAndroidRecyclerAdapter::onBindViewHolder(JNIEnv *env, jobject object, j QQmlAndroidView *QQmlAndroidRecyclerAdapter::createItem() { - QQmlAndroidView *item = 0; + QQmlAndroidView *item = nullptr; if (m_delegate) { QQmlContext *creationContext = m_delegate->creationContext(); QQmlContext *context = new QQmlContext(creationContext ? creationContext : qmlContext(this)); diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h index 41b4a0f..bc9555f 100644 --- a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h +++ b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h @@ -62,7 +62,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidRecyclerAdapter : public QQmlAndroidContext Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) public: - explicit QQmlAndroidRecyclerAdapter(QObject *parent = 0); + explicit QQmlAndroidRecyclerAdapter(QObject *parent = nullptr); int count() const; void setCount(int count); diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h b/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h index 0a537c9..cfb3d1d 100644 --- a/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h +++ b/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h @@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidRecyclerView : public QQmlAndroidViewGroup Q_PROPERTY(QQmlAndroidRecyclerAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged) public: - explicit QQmlAndroidRecyclerView(QQmlAndroidView *parent = 0); + explicit QQmlAndroidRecyclerView(QQmlAndroidView *parent = nullptr); QQmlAndroidRecyclerAdapter *adapter() const; void setAdapter(QQmlAndroidRecyclerAdapter *adapter); diff --git a/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h index fc8ac9d..2864828 100644 --- a/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h @@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAccelerateDecelerateInterpolator : public Q Q_OBJECT public: - explicit QQmlAndroidAccelerateDecelerateInterpolator(QObject *parent = 0); + explicit QQmlAndroidAccelerateDecelerateInterpolator(QObject *parent = nullptr); Q_SIGNALS: diff --git a/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h index 8411cf0..92a257f 100644 --- a/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h @@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAccelerateInterpolator : public QQmlAndroid Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged) public: - explicit QQmlAndroidAccelerateInterpolator(QObject *parent = 0); + explicit QQmlAndroidAccelerateInterpolator(QObject *parent = nullptr); qreal factor() const; void setFactor(qreal factor); diff --git a/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h index d9707d7..121863d 100644 --- a/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h @@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAlphaAnimation : public QQmlAndroidAnimatio Q_PROPERTY(qreal toAlpha READ toAlpha WRITE setToAlpha NOTIFY toAlphaChanged) public: - explicit QQmlAndroidAlphaAnimation(QObject *parent = 0); + explicit QQmlAndroidAlphaAnimation(QObject *parent = nullptr); qreal fromAlpha() const; void setFromAlpha(qreal alpha); diff --git a/src/qmlandroid/view/animation/qqmlandroidanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidanimation_p.h index ded6473..e49d860 100644 --- a/src/qmlandroid/view/animation/qqmlandroidanimation_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidanimation_p.h @@ -71,7 +71,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAnimation : public QQmlAndroidContextual Q_ENUMS(RepeatMode ZAdjustment Infinity Relation) public: - explicit QQmlAndroidAnimation(QObject *parent = 0); + explicit QQmlAndroidAnimation(QObject *parent = nullptr); int resource() const; void setResource(int resource); diff --git a/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h b/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h index 1ef2169..0efd872 100644 --- a/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h @@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAnimationSet : public QQmlAndroidAnimation Q_PROPERTY(bool shareInterpolator READ shareInterpolator WRITE setShareInterpolator NOTIFY shareInterpolatorChanged) public: - explicit QQmlAndroidAnimationSet(QObject *parent = 0); + explicit QQmlAndroidAnimationSet(QObject *parent = nullptr); bool shareInterpolator() const; void setShareInterpolator(bool share); diff --git a/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h index 9974784..8789466 100644 --- a/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h @@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAnticipateInterpolator : public QQmlAndroid Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged) public: - explicit QQmlAndroidAnticipateInterpolator(QObject *parent = 0); + explicit QQmlAndroidAnticipateInterpolator(QObject *parent = nullptr); qreal tension() const; void setTension(qreal tension); diff --git a/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h index df1b356..e76f648 100644 --- a/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h @@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAnticipateOvershootInterpolator : public QQ Q_PROPERTY(qreal extraTension READ extraTension WRITE setExtraTension NOTIFY extraTensionChanged) public: - explicit QQmlAndroidAnticipateOvershootInterpolator(QObject *parent = 0); + explicit QQmlAndroidAnticipateOvershootInterpolator(QObject *parent = nullptr); qreal tension() const; void setTension(qreal tension); diff --git a/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h index c2569f3..ca54e07 100644 --- a/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h @@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidBounceInterpolator : public QQmlAndroidInte Q_OBJECT public: - explicit QQmlAndroidBounceInterpolator(QObject *parent = 0); + explicit QQmlAndroidBounceInterpolator(QObject *parent = nullptr); Q_SIGNALS: diff --git a/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h index 0eae46d..b7c2fb4 100644 --- a/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h @@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidCycleInterpolator : public QQmlAndroidInter Q_PROPERTY(qreal cycles READ cycles WRITE setCycles NOTIFY cyclesChanged) public: - explicit QQmlAndroidCycleInterpolator(QObject *parent = 0); + explicit QQmlAndroidCycleInterpolator(QObject *parent = nullptr); qreal cycles() const; void setCycles(qreal cycles); diff --git a/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h index 3e02543..65093f5 100644 --- a/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h @@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidDecelerateInterpolator : public QQmlAndroid Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged) public: - explicit QQmlAndroidDecelerateInterpolator(QObject *parent = 0); + explicit QQmlAndroidDecelerateInterpolator(QObject *parent = nullptr); qreal factor() const; void setFactor(qreal factor); diff --git a/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h index b05acc5..7a0d75c 100644 --- a/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidInterpolator : public QQmlAndroidObject Q_OBJECT public: - explicit QQmlAndroidInterpolator(QObject *parent = 0); + explicit QQmlAndroidInterpolator(QObject *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h index a641f21..b374a0f 100644 --- a/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h @@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidLinearInterpolator : public QQmlAndroidInte Q_OBJECT public: - explicit QQmlAndroidLinearInterpolator(QObject *parent = 0); + explicit QQmlAndroidLinearInterpolator(QObject *parent = nullptr); Q_SIGNALS: diff --git a/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h index d2f62b1..5650098 100644 --- a/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h @@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidOvershootInterpolator : public QQmlAndroidI Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged) public: - explicit QQmlAndroidOvershootInterpolator(QObject *parent = 0); + explicit QQmlAndroidOvershootInterpolator(QObject *parent = nullptr); qreal tension() const; void setTension(qreal tension); diff --git a/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h index 490b569..187b1cb 100644 --- a/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h @@ -62,7 +62,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidPathInterpolator : public QQmlAndroidInterp Q_PROPERTY(qreal controlY2 READ controlY2 WRITE setControlY2 NOTIFY controlY2Changed) public: - explicit QQmlAndroidPathInterpolator(QObject *parent = 0); + explicit QQmlAndroidPathInterpolator(QObject *parent = nullptr); qreal controlX() const; void setControlX(qreal x); diff --git a/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h index 259a22a..10aeba3 100644 --- a/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h @@ -64,7 +64,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidRotateAnimation : public QQmlAndroidAnimati Q_ENUMS(Relation) public: - explicit QQmlAndroidRotateAnimation(QObject *parent = 0); + explicit QQmlAndroidRotateAnimation(QObject *parent = nullptr); qreal fromDegrees() const; void setFromDegrees(qreal degrees); diff --git a/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h index 0ba1aff..41c765c 100644 --- a/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h @@ -65,7 +65,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidScaleAnimation : public QQmlAndroidAnimatio Q_PROPERTY(Relation pivotYType READ pivotYType WRITE setPivotYType NOTIFY pivotYTypeChanged) public: - explicit QQmlAndroidScaleAnimation(QObject *parent = 0); + explicit QQmlAndroidScaleAnimation(QObject *parent = nullptr); qreal fromXScale() const; void setFromXScale(qreal scale); diff --git a/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h index 47ada4a..d0f378f 100644 --- a/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h +++ b/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h @@ -65,7 +65,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidTranslateAnimation : public QQmlAndroidAnim Q_PROPERTY(Relation toYType READ toYType WRITE setToYType NOTIFY toYTypeChanged) public: - explicit QQmlAndroidTranslateAnimation(QObject *parent = 0); + explicit QQmlAndroidTranslateAnimation(QObject *parent = nullptr); qreal fromX() const; void setFromX(qreal x); diff --git a/src/qmlandroid/view/qqmlandroidmenu_p.h b/src/qmlandroid/view/qqmlandroidmenu_p.h index 885c15a..690d54f 100644 --- a/src/qmlandroid/view/qqmlandroidmenu_p.h +++ b/src/qmlandroid/view/qqmlandroidmenu_p.h @@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidMenu : public QQmlAndroidContextual Q_OBJECT public: - explicit QQmlAndroidMenu(QObject *parent = 0); + explicit QQmlAndroidMenu(QObject *parent = nullptr); QList<QQmlAndroidMenuItem *> items() const; diff --git a/src/qmlandroid/view/qqmlandroidmenuitem_p.h b/src/qmlandroid/view/qqmlandroidmenuitem_p.h index 173e25d..c169b34 100644 --- a/src/qmlandroid/view/qqmlandroidmenuitem_p.h +++ b/src/qmlandroid/view/qqmlandroidmenuitem_p.h @@ -67,7 +67,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidMenuItem : public QQmlAndroidContextual Q_ENUMS(ShowAs) public: - explicit QQmlAndroidMenuItem(QObject *parent = 0); + explicit QQmlAndroidMenuItem(QObject *parent = nullptr); QString title() const; void setTitle(const QString &title); diff --git a/src/qmlandroid/view/qqmlandroidview_p.h b/src/qmlandroid/view/qqmlandroidview_p.h index 8fc9db8..5dc1e00 100644 --- a/src/qmlandroid/view/qqmlandroidview_p.h +++ b/src/qmlandroid/view/qqmlandroidview_p.h @@ -104,7 +104,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidView : public QQmlAndroidContextual Q_PROPERTY(qreal translationZ READ translationZ WRITE setTranslationZ NOTIFY translationZChanged) public: - explicit QQmlAndroidView(QQmlAndroidView *parent = 0); + explicit QQmlAndroidView(QQmlAndroidView *parent = nullptr); ~QQmlAndroidView(); int identifier() const; diff --git a/src/qmlandroid/view/qqmlandroidviewgroup_p.h b/src/qmlandroid/view/qqmlandroidviewgroup_p.h index 1e12f2f..6756309 100644 --- a/src/qmlandroid/view/qqmlandroidviewgroup_p.h +++ b/src/qmlandroid/view/qqmlandroidviewgroup_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidViewGroup : public QQmlAndroidView Q_OBJECT public: - explicit QQmlAndroidViewGroup(QQmlAndroidView *parent = 0); + explicit QQmlAndroidViewGroup(QQmlAndroidView *parent = nullptr); static QQmlAndroidLayoutParams *qmlAttachedProperties(QObject *object); diff --git a/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h b/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h index 3b92e39..35a6db6 100644 --- a/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h +++ b/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAbsSeekBar : public QQmlAndroidProgressBar Q_OBJECT public: - explicit QQmlAndroidAbsSeekBar(QQmlAndroidView *parent = 0); + explicit QQmlAndroidAbsSeekBar(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidadapterview_p.h b/src/qmlandroid/widget/qqmlandroidadapterview_p.h index 7ac9032..8000b6b 100644 --- a/src/qmlandroid/widget/qqmlandroidadapterview_p.h +++ b/src/qmlandroid/widget/qqmlandroidadapterview_p.h @@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAdapterView : public QQmlAndroidViewGroup Q_PROPERTY(QQmlAndroidBaseAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged) // TODO: Adapter public: - explicit QQmlAndroidAdapterView(QQmlAndroidView *parent = 0); + explicit QQmlAndroidAdapterView(QQmlAndroidView *parent = nullptr); QQmlAndroidBaseAdapter *adapter() const; void setAdapter(QQmlAndroidBaseAdapter *adapter); diff --git a/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h b/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h index 0750002..50ede9b 100644 --- a/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h +++ b/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h @@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidArrayAdapter : public QQmlAndroidBaseAdapte Q_PROPERTY(QStringList array READ array WRITE setArray NOTIFY arrayChanged) public: - explicit QQmlAndroidArrayAdapter(QObject *parent = 0); + explicit QQmlAndroidArrayAdapter(QObject *parent = nullptr); int style() const; void setStyle(int style); diff --git a/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h b/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h index acbeb5e..84e6b00 100644 --- a/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h +++ b/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h @@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidBaseAdapter : public QQmlAndroidContextual Q_PROPERTY(int count READ count NOTIFY countChanged) public: - explicit QQmlAndroidBaseAdapter(QObject *parent = 0); + explicit QQmlAndroidBaseAdapter(QObject *parent = nullptr); virtual int count() const = 0; diff --git a/src/qmlandroid/widget/qqmlandroidbutton_p.h b/src/qmlandroid/widget/qqmlandroidbutton_p.h index c358c18..d990282 100644 --- a/src/qmlandroid/widget/qqmlandroidbutton_p.h +++ b/src/qmlandroid/widget/qqmlandroidbutton_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidButton : public QQmlAndroidTextView Q_OBJECT public: - explicit QQmlAndroidButton(QQmlAndroidView *parent = 0); + explicit QQmlAndroidButton(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidcalendarview_p.h b/src/qmlandroid/widget/qqmlandroidcalendarview_p.h index d12794b..fbec814 100644 --- a/src/qmlandroid/widget/qqmlandroidcalendarview_p.h +++ b/src/qmlandroid/widget/qqmlandroidcalendarview_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidCalendarView : public QQmlAndroidFrameLayou Q_OBJECT public: - explicit QQmlAndroidCalendarView(QQmlAndroidView *parent = 0); + explicit QQmlAndroidCalendarView(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidcheckbox_p.h b/src/qmlandroid/widget/qqmlandroidcheckbox_p.h index 12e036c..fd2e849 100644 --- a/src/qmlandroid/widget/qqmlandroidcheckbox_p.h +++ b/src/qmlandroid/widget/qqmlandroidcheckbox_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidCheckBox : public QQmlAndroidCompoundButton Q_OBJECT public: - explicit QQmlAndroidCheckBox(QQmlAndroidView *parent = 0); + explicit QQmlAndroidCheckBox(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h b/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h index e7c699f..deec3c0 100644 --- a/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h +++ b/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h @@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidCompoundButton : public QQmlAndroidButton Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged) public: - explicit QQmlAndroidCompoundButton(QQmlAndroidView *parent = 0); + explicit QQmlAndroidCompoundButton(QQmlAndroidView *parent = nullptr); bool isChecked() const; void setChecked(bool checked); diff --git a/src/qmlandroid/widget/qqmlandroiddatepicker_p.h b/src/qmlandroid/widget/qqmlandroiddatepicker_p.h index ef566cf..d697a09 100644 --- a/src/qmlandroid/widget/qqmlandroiddatepicker_p.h +++ b/src/qmlandroid/widget/qqmlandroiddatepicker_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidDatePicker : public QQmlAndroidFrameLayout Q_OBJECT public: - explicit QQmlAndroidDatePicker(QQmlAndroidView *parent = 0); + explicit QQmlAndroidDatePicker(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidedittext_p.h b/src/qmlandroid/widget/qqmlandroidedittext_p.h index c68a70b..f311d70 100644 --- a/src/qmlandroid/widget/qqmlandroidedittext_p.h +++ b/src/qmlandroid/widget/qqmlandroidedittext_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidEditText : public QQmlAndroidTextView Q_OBJECT public: - explicit QQmlAndroidEditText(QQmlAndroidView *parent = 0); + explicit QQmlAndroidEditText(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidframelayout_p.h b/src/qmlandroid/widget/qqmlandroidframelayout_p.h index 692122f..f6f8f60 100644 --- a/src/qmlandroid/widget/qqmlandroidframelayout_p.h +++ b/src/qmlandroid/widget/qqmlandroidframelayout_p.h @@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidFrameLayout : public QQmlAndroidViewGroup Q_OBJECT public: - explicit QQmlAndroidFrameLayout(QQmlAndroidView *parent = 0); + explicit QQmlAndroidFrameLayout(QQmlAndroidView *parent = nullptr); static QQmlAndroidFrameLayoutParams *qmlAttachedProperties(QObject *object); diff --git a/src/qmlandroid/widget/qqmlandroidimageview_p.h b/src/qmlandroid/widget/qqmlandroidimageview_p.h index 5fd1751..43c7d61 100644 --- a/src/qmlandroid/widget/qqmlandroidimageview_p.h +++ b/src/qmlandroid/widget/qqmlandroidimageview_p.h @@ -62,7 +62,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidImageView : public QQmlAndroidView Q_PROPERTY(int imageTintColor READ imageTintColor WRITE setImageTintColor NOTIFY imageTintColorChanged) public: - explicit QQmlAndroidImageView(QQmlAndroidView *parent = 0); + explicit QQmlAndroidImageView(QQmlAndroidView *parent = nullptr); QUrl imageURI() const; void setImageURI(const QUrl &uri); diff --git a/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h b/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h index 99b8875..8a960cc 100644 --- a/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h +++ b/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h @@ -65,7 +65,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidLinearLayout : public QQmlAndroidViewGroup Q_ENUMS(Orientation) public: - explicit QQmlAndroidLinearLayout(QQmlAndroidView *parent = 0); + explicit QQmlAndroidLinearLayout(QQmlAndroidView *parent = nullptr); static QQmlAndroidLinearLayoutParams *qmlAttachedProperties(QObject *object); diff --git a/src/qmlandroid/widget/qqmlandroidlistview_p.h b/src/qmlandroid/widget/qqmlandroidlistview_p.h index 7b0f650..ee3f855 100644 --- a/src/qmlandroid/widget/qqmlandroidlistview_p.h +++ b/src/qmlandroid/widget/qqmlandroidlistview_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidListView : public QQmlAndroidAdapterView // Q_OBJECT public: - explicit QQmlAndroidListView(QQmlAndroidView *parent = 0); + explicit QQmlAndroidListView(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h b/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h index aac8ecd..2be93b8 100644 --- a/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h +++ b/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h @@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidNumberPicker : public QQmlAndroidLinearLayo Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged) public: - explicit QQmlAndroidNumberPicker(QQmlAndroidView *parent = 0); + explicit QQmlAndroidNumberPicker(QQmlAndroidView *parent = nullptr); int value() const; void setValue(int value); diff --git a/src/qmlandroid/widget/qqmlandroidpopupmenu_p.h b/src/qmlandroid/widget/qqmlandroidpopupmenu_p.h index 0d8b63e..1f96d7b 100644 --- a/src/qmlandroid/widget/qqmlandroidpopupmenu_p.h +++ b/src/qmlandroid/widget/qqmlandroidpopupmenu_p.h @@ -63,7 +63,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidPopupMenu : public QQmlAndroidObject Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged) public: - explicit QQmlAndroidPopupMenu(QObject *parent = 0); + explicit QQmlAndroidPopupMenu(QObject *parent = nullptr); QList<QQmlAndroidMenuItem *> items() const; diff --git a/src/qmlandroid/widget/qqmlandroidprogressbar_p.h b/src/qmlandroid/widget/qqmlandroidprogressbar_p.h index 706d53d..8b85f53 100644 --- a/src/qmlandroid/widget/qqmlandroidprogressbar_p.h +++ b/src/qmlandroid/widget/qqmlandroidprogressbar_p.h @@ -64,7 +64,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidProgressBar : public QQmlAndroidView Q_ENUMS(Style) public: - explicit QQmlAndroidProgressBar(QQmlAndroidView *parent = 0); + explicit QQmlAndroidProgressBar(QQmlAndroidView *parent = nullptr); bool isIndeterminate() const; void setIndeterminate(bool indeterminate); diff --git a/src/qmlandroid/widget/qqmlandroidradiobutton_p.h b/src/qmlandroid/widget/qqmlandroidradiobutton_p.h index e8211b9..2237478 100644 --- a/src/qmlandroid/widget/qqmlandroidradiobutton_p.h +++ b/src/qmlandroid/widget/qqmlandroidradiobutton_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidRadioButton : public QQmlAndroidCompoundBut Q_OBJECT public: - explicit QQmlAndroidRadioButton(QQmlAndroidView *parent = 0); + explicit QQmlAndroidRadioButton(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidradiogroup_p.h b/src/qmlandroid/widget/qqmlandroidradiogroup_p.h index 6e5fdea..45cdecf 100644 --- a/src/qmlandroid/widget/qqmlandroidradiogroup_p.h +++ b/src/qmlandroid/widget/qqmlandroidradiogroup_p.h @@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidRadioGroup : public QQmlAndroidLinearLayout Q_PROPERTY(QQmlAndroidRadioButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged) public: - explicit QQmlAndroidRadioGroup(QQmlAndroidView *parent = 0); + explicit QQmlAndroidRadioGroup(QQmlAndroidView *parent = nullptr); QQmlAndroidRadioButton *checkedButton() const; void setCheckedButton(QQmlAndroidRadioButton *button); diff --git a/src/qmlandroid/widget/qqmlandroidratingbar_p.h b/src/qmlandroid/widget/qqmlandroidratingbar_p.h index 5556aef..215eeb9 100644 --- a/src/qmlandroid/widget/qqmlandroidratingbar_p.h +++ b/src/qmlandroid/widget/qqmlandroidratingbar_p.h @@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidRatingBar : public QQmlAndroidAbsSeekBar Q_PROPERTY(qreal rating READ rating WRITE setRating NOTIFY ratingChanged) public: - explicit QQmlAndroidRatingBar(QQmlAndroidView *parent = 0); + explicit QQmlAndroidRatingBar(QQmlAndroidView *parent = nullptr); qreal rating() const; void setRating(qreal rating); diff --git a/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h b/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h index eba0d19..c142950 100644 --- a/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h +++ b/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h @@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidRelativeLayout : public QQmlAndroidViewGrou Q_OBJECT public: - explicit QQmlAndroidRelativeLayout(QQmlAndroidView *parent = 0); + explicit QQmlAndroidRelativeLayout(QQmlAndroidView *parent = nullptr); static QQmlAndroidRelativeLayoutParams *qmlAttachedProperties(QObject *object); diff --git a/src/qmlandroid/widget/qqmlandroidscrollview_p.h b/src/qmlandroid/widget/qqmlandroidscrollview_p.h index 5133d11..84b9a5a 100644 --- a/src/qmlandroid/widget/qqmlandroidscrollview_p.h +++ b/src/qmlandroid/widget/qqmlandroidscrollview_p.h @@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidScrollView : public QQmlAndroidFrameLayout Q_PROPERTY(int scrollY READ scrollY WRITE setScrollY NOTIFY scrollYChanged) public: - explicit QQmlAndroidScrollView(QQmlAndroidView *parent = 0); + explicit QQmlAndroidScrollView(QQmlAndroidView *parent = nullptr); int scrollX() const; void setScrollX(int x); diff --git a/src/qmlandroid/widget/qqmlandroidsearchview_p.h b/src/qmlandroid/widget/qqmlandroidsearchview_p.h index ce2ce82..bc99ea4 100644 --- a/src/qmlandroid/widget/qqmlandroidsearchview_p.h +++ b/src/qmlandroid/widget/qqmlandroidsearchview_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidSearchView : public QQmlAndroidLinearLayout Q_OBJECT public: - explicit QQmlAndroidSearchView(QQmlAndroidView *parent = 0); + explicit QQmlAndroidSearchView(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidseekbar_p.h b/src/qmlandroid/widget/qqmlandroidseekbar_p.h index e0affd1..97e35ef 100644 --- a/src/qmlandroid/widget/qqmlandroidseekbar_p.h +++ b/src/qmlandroid/widget/qqmlandroidseekbar_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidSeekBar : public QQmlAndroidAbsSeekBar Q_OBJECT public: - explicit QQmlAndroidSeekBar(QQmlAndroidView *parent = 0); + explicit QQmlAndroidSeekBar(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidspace_p.h b/src/qmlandroid/widget/qqmlandroidspace_p.h index 63837a5..6cee806 100644 --- a/src/qmlandroid/widget/qqmlandroidspace_p.h +++ b/src/qmlandroid/widget/qqmlandroidspace_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidSpace : public QQmlAndroidView Q_OBJECT public: - explicit QQmlAndroidSpace(QQmlAndroidView *parent = 0); + explicit QQmlAndroidSpace(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidspinner_p.h b/src/qmlandroid/widget/qqmlandroidspinner_p.h index d0319c9..770701c 100644 --- a/src/qmlandroid/widget/qqmlandroidspinner_p.h +++ b/src/qmlandroid/widget/qqmlandroidspinner_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidSpinner : public QQmlAndroidAdapterView // Q_OBJECT public: - explicit QQmlAndroidSpinner(QQmlAndroidView *parent = 0); + explicit QQmlAndroidSpinner(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidswitch_p.h b/src/qmlandroid/widget/qqmlandroidswitch_p.h index 942eca4..d28a3f2 100644 --- a/src/qmlandroid/widget/qqmlandroidswitch_p.h +++ b/src/qmlandroid/widget/qqmlandroidswitch_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidSwitch : public QQmlAndroidCompoundButton Q_OBJECT public: - explicit QQmlAndroidSwitch(QQmlAndroidView *parent = 0); + explicit QQmlAndroidSwitch(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidtabhost_p.h b/src/qmlandroid/widget/qqmlandroidtabhost_p.h index 004e1f3..5d15520 100644 --- a/src/qmlandroid/widget/qqmlandroidtabhost_p.h +++ b/src/qmlandroid/widget/qqmlandroidtabhost_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidTabHost : public QQmlAndroidFrameLayout Q_OBJECT public: - explicit QQmlAndroidTabHost(QQmlAndroidView *parent = 0); + explicit QQmlAndroidTabHost(QQmlAndroidView *parent = nullptr); Q_SIGNALS: void tabChanged(const QString &tabId); diff --git a/src/qmlandroid/widget/qqmlandroidtabwidget_p.h b/src/qmlandroid/widget/qqmlandroidtabwidget_p.h index 0a97f9e..f35debc 100644 --- a/src/qmlandroid/widget/qqmlandroidtabwidget_p.h +++ b/src/qmlandroid/widget/qqmlandroidtabwidget_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidTabWidget : public QQmlAndroidLinearLayout Q_OBJECT public: - explicit QQmlAndroidTabWidget(QQmlAndroidView *parent = 0); + explicit QQmlAndroidTabWidget(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidtextview_p.h b/src/qmlandroid/widget/qqmlandroidtextview_p.h index de83bd9..5e85e5f 100644 --- a/src/qmlandroid/widget/qqmlandroidtextview_p.h +++ b/src/qmlandroid/widget/qqmlandroidtextview_p.h @@ -65,7 +65,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidTextView : public QQmlAndroidView Q_PROPERTY(int inputType READ inputType WRITE setInputType NOTIFY inputTypeChanged) public: - explicit QQmlAndroidTextView(QQmlAndroidView *parent = 0); + explicit QQmlAndroidTextView(QQmlAndroidView *parent = nullptr); QString text() const; void setText(const QString &text); diff --git a/src/qmlandroid/widget/qqmlandroidtimepicker_p.h b/src/qmlandroid/widget/qqmlandroidtimepicker_p.h index 0b54c04..e8ed115 100644 --- a/src/qmlandroid/widget/qqmlandroidtimepicker_p.h +++ b/src/qmlandroid/widget/qqmlandroidtimepicker_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidTimePicker : public QQmlAndroidFrameLayout Q_OBJECT public: - explicit QQmlAndroidTimePicker(QQmlAndroidView *parent = 0); + explicit QQmlAndroidTimePicker(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidtoast_p.h b/src/qmlandroid/widget/qqmlandroidtoast_p.h index f6e182e..9e9f256 100644 --- a/src/qmlandroid/widget/qqmlandroidtoast_p.h +++ b/src/qmlandroid/widget/qqmlandroidtoast_p.h @@ -62,7 +62,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidToast : public QQmlAndroidObject Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged) public: - explicit QQmlAndroidToast(QObject *parent = 0); + explicit QQmlAndroidToast(QObject *parent = nullptr); QString text() const; void setText(const QString &text); diff --git a/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h b/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h index 674b2a1..4ce5a1d 100644 --- a/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h +++ b/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h @@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidToggleButton : public QQmlAndroidCompoundBu Q_PROPERTY(QString textOff READ textOff WRITE setTextOff NOTIFY textOffChanged) public: - explicit QQmlAndroidToggleButton(QQmlAndroidView *parent = 0); + explicit QQmlAndroidToggleButton(QQmlAndroidView *parent = nullptr); QString textOn() const; void setTextOn(const QString &text); diff --git a/src/qmlandroid/widget/qqmlandroidviewanimator_p.h b/src/qmlandroid/widget/qqmlandroidviewanimator_p.h index daa4745..a037b50 100644 --- a/src/qmlandroid/widget/qqmlandroidviewanimator_p.h +++ b/src/qmlandroid/widget/qqmlandroidviewanimator_p.h @@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidViewAnimator : public QQmlAndroidFrameLayou Q_PROPERTY(int outAnimation READ outAnimation WRITE setOutAnimation NOTIFY outAnimationChanged) public: - explicit QQmlAndroidViewAnimator(QQmlAndroidView *parent = 0); + explicit QQmlAndroidViewAnimator(QQmlAndroidView *parent = nullptr); int displayedChild() const; void setDisplayedChild(int child); diff --git a/src/qmlandroid/widget/qqmlandroidviewflipper_p.h b/src/qmlandroid/widget/qqmlandroidviewflipper_p.h index 26587d6..d3682e9 100644 --- a/src/qmlandroid/widget/qqmlandroidviewflipper_p.h +++ b/src/qmlandroid/widget/qqmlandroidviewflipper_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidViewFlipper : public QQmlAndroidViewAnimato Q_OBJECT public: - explicit QQmlAndroidViewFlipper(QQmlAndroidView *parent = 0); + explicit QQmlAndroidViewFlipper(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h b/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h index b4ed68d..975fef2 100644 --- a/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h +++ b/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h @@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidViewSwitcher : public QQmlAndroidViewAnimat Q_OBJECT public: - explicit QQmlAndroidViewSwitcher(QQmlAndroidView *parent = 0); + explicit QQmlAndroidViewSwitcher(QQmlAndroidView *parent = nullptr); protected: QAndroidJniObject onCreate() Q_DECL_OVERRIDE; diff --git a/tools/anc/main.cpp b/tools/anc/main.cpp index 627e5b9..2647b43 100644 --- a/tools/anc/main.cpp +++ b/tools/anc/main.cpp @@ -108,7 +108,7 @@ private: writePropertyMacros(out, properties); out << endl; out << "public:" << endl; - out << " explicit QQmlAndroid" << cls << "(QObject *parent = 0);" << endl; + out << " explicit QQmlAndroid" << cls << "(QObject *parent = nullptr);" << endl; out << endl; writePropertyDeclarations(out, properties); out << "Q_SIGNALS:" << endl; |