Reference Examples: Use nullptr
Change-Id: I325cfdcf488e9d238e618ca23ef40aedf7c5eec1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
parent
66fabff253
commit
3cc226ffe7
|
@ -58,7 +58,7 @@ class Person : public QObject
|
|||
Q_PROPERTY(QString name READ name WRITE setName)
|
||||
Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
|
||||
public:
|
||||
Person(QObject *parent = 0);
|
||||
Person(QObject *parent = nullptr);
|
||||
|
||||
QString name() const;
|
||||
void setName(const QString &);
|
||||
|
|
|
@ -76,7 +76,7 @@ class BirthdayParty : public QObject
|
|||
Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
|
||||
Q_CLASSINFO("DefaultProperty", "guests")
|
||||
public:
|
||||
BirthdayParty(QObject *parent = 0);
|
||||
BirthdayParty(QObject *parent = nullptr);
|
||||
|
||||
Person *host() const;
|
||||
void setHost(Person *);
|
||||
|
|
|
@ -87,7 +87,7 @@ class Person : public QObject
|
|||
Q_PROPERTY(QString name READ name WRITE setName)
|
||||
Q_PROPERTY(ShoeDescription *shoe READ shoe)
|
||||
public:
|
||||
Person(QObject *parent = 0);
|
||||
Person(QObject *parent = nullptr);
|
||||
|
||||
QString name() const;
|
||||
void setName(const QString &);
|
||||
|
@ -102,14 +102,14 @@ class Boy : public Person
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Boy(QObject * parent = 0);
|
||||
Boy(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
class Girl : public Person
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Girl(QObject * parent = 0);
|
||||
Girl(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
#endif // PERSON_H
|
||||
|
|
|
@ -83,7 +83,7 @@ class BirthdayParty : public QObject
|
|||
Q_PROPERTY(QString announcement READ announcement WRITE setAnnouncement)
|
||||
Q_CLASSINFO("DefaultProperty", "guests")
|
||||
public:
|
||||
BirthdayParty(QObject *parent = 0);
|
||||
BirthdayParty(QObject *parent = nullptr);
|
||||
|
||||
Person *host() const;
|
||||
void setHost(Person *);
|
||||
|
|
|
@ -61,7 +61,7 @@ class HappyBirthdaySong : public QObject, public QQmlPropertyValueSource
|
|||
Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
|
||||
Q_INTERFACES(QQmlPropertyValueSource)
|
||||
public:
|
||||
HappyBirthdaySong(QObject *parent = 0);
|
||||
HappyBirthdaySong(QObject *parent = nullptr);
|
||||
|
||||
virtual void setTarget(const QQmlProperty &);
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ class ShoeDescription : public QObject
|
|||
Q_PROPERTY(QString brand READ brand WRITE setBrand NOTIFY shoeChanged)
|
||||
Q_PROPERTY(qreal price READ price WRITE setPrice NOTIFY shoeChanged)
|
||||
public:
|
||||
ShoeDescription(QObject *parent = 0);
|
||||
ShoeDescription(QObject *parent = nullptr);
|
||||
|
||||
int size() const;
|
||||
void setSize(int);
|
||||
|
@ -92,7 +92,7 @@ class Person : public QObject
|
|||
Q_PROPERTY(ShoeDescription *shoe READ shoe CONSTANT)
|
||||
// ![0]
|
||||
public:
|
||||
Person(QObject *parent = 0);
|
||||
Person(QObject *parent = nullptr);
|
||||
|
||||
QString name() const;
|
||||
void setName(const QString &);
|
||||
|
@ -110,14 +110,14 @@ class Boy : public Person
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Boy(QObject * parent = 0);
|
||||
Boy(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
class Girl : public Person
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Girl(QObject * parent = 0);
|
||||
Girl(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
#endif // PERSON_H
|
||||
|
|
|
@ -62,7 +62,7 @@ class BirthdayParty : public QObject
|
|||
Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
|
||||
// ![0]
|
||||
public:
|
||||
BirthdayParty(QObject *parent = 0);
|
||||
BirthdayParty(QObject *parent = nullptr);
|
||||
|
||||
Person *host() const;
|
||||
void setHost(Person *);
|
||||
|
|
|
@ -58,7 +58,7 @@ class Person : public QObject
|
|||
Q_PROPERTY(QString name READ name WRITE setName)
|
||||
Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
|
||||
public:
|
||||
Person(QObject *parent = 0);
|
||||
Person(QObject *parent = nullptr);
|
||||
|
||||
QString name() const;
|
||||
void setName(const QString &);
|
||||
|
@ -76,7 +76,7 @@ class Boy : public Person
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Boy(QObject * parent = 0);
|
||||
Boy(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
//! [girl class]
|
||||
|
@ -84,7 +84,7 @@ class Girl : public Person
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Girl(QObject * parent = 0);
|
||||
Girl(QObject * parent = nullptr);
|
||||
};
|
||||
//! [girl class]
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@ class BirthdayParty : public QObject
|
|||
Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
|
||||
Q_CLASSINFO("DefaultProperty", "guests")
|
||||
public:
|
||||
BirthdayParty(QObject *parent = 0);
|
||||
BirthdayParty(QObject *parent = nullptr);
|
||||
|
||||
Person *host() const;
|
||||
void setHost(Person *);
|
||||
|
|
|
@ -58,7 +58,7 @@ class Person : public QObject
|
|||
Q_PROPERTY(QString name READ name WRITE setName)
|
||||
Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
|
||||
public:
|
||||
Person(QObject *parent = 0);
|
||||
Person(QObject *parent = nullptr);
|
||||
|
||||
QString name() const;
|
||||
void setName(const QString &);
|
||||
|
@ -74,14 +74,14 @@ class Boy : public Person
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Boy(QObject * parent = 0);
|
||||
Boy(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
class Girl : public Person
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Girl(QObject * parent = 0);
|
||||
Girl(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
#endif // PERSON_H
|
||||
|
|
|
@ -61,7 +61,7 @@ class BirthdayParty : public QObject
|
|||
Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
|
||||
Q_CLASSINFO("DefaultProperty", "guests")
|
||||
public:
|
||||
BirthdayParty(QObject *parent = 0);
|
||||
BirthdayParty(QObject *parent = nullptr);
|
||||
|
||||
Person *host() const;
|
||||
void setHost(Person *);
|
||||
|
|
|
@ -61,7 +61,7 @@ class ShoeDescription : public QObject
|
|||
Q_PROPERTY(QString brand READ brand WRITE setBrand)
|
||||
Q_PROPERTY(qreal price READ price WRITE setPrice)
|
||||
public:
|
||||
ShoeDescription(QObject *parent = 0);
|
||||
ShoeDescription(QObject *parent = nullptr);
|
||||
|
||||
int size() const;
|
||||
void setSize(int);
|
||||
|
@ -89,7 +89,7 @@ class Person : public QObject
|
|||
Q_PROPERTY(ShoeDescription *shoe READ shoe)
|
||||
// ![1]
|
||||
public:
|
||||
Person(QObject *parent = 0);
|
||||
Person(QObject *parent = nullptr);
|
||||
|
||||
QString name() const;
|
||||
void setName(const QString &);
|
||||
|
@ -104,14 +104,14 @@ class Boy : public Person
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Boy(QObject * parent = 0);
|
||||
Boy(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
class Girl : public Person
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Girl(QObject * parent = 0);
|
||||
Girl(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
#endif // PERSON_H
|
||||
|
|
|
@ -60,7 +60,7 @@ class BirthdayParty : public QObject
|
|||
Q_PROPERTY(Person *host READ host WRITE setHost)
|
||||
Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
|
||||
public:
|
||||
BirthdayParty(QObject *parent = 0);
|
||||
BirthdayParty(QObject *parent = nullptr);
|
||||
|
||||
Person *host() const;
|
||||
void setHost(Person *);
|
||||
|
|
|
@ -58,7 +58,7 @@ class Person : public QObject
|
|||
Q_PROPERTY(QString name READ name WRITE setName)
|
||||
Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
|
||||
public:
|
||||
Person(QObject *parent = 0);
|
||||
Person(QObject *parent = nullptr);
|
||||
|
||||
QString name() const;
|
||||
void setName(const QString &);
|
||||
|
|
|
@ -68,7 +68,7 @@ class BirthdayParty : public QObject
|
|||
// ![2]
|
||||
// ![3]
|
||||
public:
|
||||
BirthdayParty(QObject *parent = 0);
|
||||
BirthdayParty(QObject *parent = nullptr);
|
||||
|
||||
Person *host() const;
|
||||
void setHost(Person *);
|
||||
|
|
|
@ -58,7 +58,7 @@ class Person : public QObject
|
|||
Q_PROPERTY(QString name READ name WRITE setName)
|
||||
Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
|
||||
public:
|
||||
Person(QObject *parent = 0);
|
||||
Person(QObject *parent = nullptr);
|
||||
|
||||
QString name() const;
|
||||
void setName(const QString &);
|
||||
|
|
|
@ -76,7 +76,7 @@ class BirthdayParty : public QObject
|
|||
Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
|
||||
Q_CLASSINFO("DefaultProperty", "guests")
|
||||
public:
|
||||
BirthdayParty(QObject *parent = 0);
|
||||
BirthdayParty(QObject *parent = nullptr);
|
||||
|
||||
Person *host() const;
|
||||
void setHost(Person *);
|
||||
|
|
|
@ -61,7 +61,7 @@ class ShoeDescription : public QObject
|
|||
Q_PROPERTY(QString brand READ brand WRITE setBrand)
|
||||
Q_PROPERTY(qreal price READ price WRITE setPrice)
|
||||
public:
|
||||
ShoeDescription(QObject *parent = 0);
|
||||
ShoeDescription(QObject *parent = nullptr);
|
||||
|
||||
int size() const;
|
||||
void setSize(int);
|
||||
|
@ -87,7 +87,7 @@ class Person : public QObject
|
|||
Q_PROPERTY(QString name READ name WRITE setName)
|
||||
Q_PROPERTY(ShoeDescription *shoe READ shoe)
|
||||
public:
|
||||
Person(QObject *parent = 0);
|
||||
Person(QObject *parent = nullptr);
|
||||
|
||||
QString name() const;
|
||||
void setName(const QString &);
|
||||
|
@ -102,14 +102,14 @@ class Boy : public Person
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Boy(QObject * parent = 0);
|
||||
Boy(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
class Girl : public Person
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Girl(QObject * parent = 0);
|
||||
Girl(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
#endif // PERSON_H
|
||||
|
|
|
@ -80,7 +80,7 @@ class BirthdayParty : public QObject
|
|||
// ![0]
|
||||
Q_CLASSINFO("DefaultProperty", "guests")
|
||||
public:
|
||||
BirthdayParty(QObject *parent = 0);
|
||||
BirthdayParty(QObject *parent = nullptr);
|
||||
|
||||
Person *host() const;
|
||||
void setHost(Person *);
|
||||
|
|
|
@ -65,7 +65,7 @@ class HappyBirthdaySong : public QObject, public QQmlPropertyValueSource
|
|||
Q_PROPERTY(QString name READ name WRITE setName)
|
||||
// ![1]
|
||||
public:
|
||||
HappyBirthdaySong(QObject *parent = 0);
|
||||
HappyBirthdaySong(QObject *parent = nullptr);
|
||||
|
||||
virtual void setTarget(const QQmlProperty &);
|
||||
// ![1]
|
||||
|
|
|
@ -61,7 +61,7 @@ class ShoeDescription : public QObject
|
|||
Q_PROPERTY(QString brand READ brand WRITE setBrand)
|
||||
Q_PROPERTY(qreal price READ price WRITE setPrice)
|
||||
public:
|
||||
ShoeDescription(QObject *parent = 0);
|
||||
ShoeDescription(QObject *parent = nullptr);
|
||||
|
||||
int size() const;
|
||||
void setSize(int);
|
||||
|
@ -87,7 +87,7 @@ class Person : public QObject
|
|||
Q_PROPERTY(QString name READ name WRITE setName)
|
||||
Q_PROPERTY(ShoeDescription *shoe READ shoe)
|
||||
public:
|
||||
Person(QObject *parent = 0);
|
||||
Person(QObject *parent = nullptr);
|
||||
|
||||
QString name() const;
|
||||
void setName(const QString &);
|
||||
|
@ -102,14 +102,14 @@ class Boy : public Person
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Boy(QObject * parent = 0);
|
||||
Boy(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
class Girl : public Person
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Girl(QObject * parent = 0);
|
||||
Girl(QObject * parent = nullptr);
|
||||
};
|
||||
|
||||
#endif // PERSON_H
|
||||
|
|
Loading…
Reference in New Issue