Make public headers compile with -Wzero-as-null-pointer-constant

... or equivalent.

Also mark some ctors explicit.

Change-Id: I9fb029fb6cc5eccee30f8eff81e0a1b2616da465
Task-number: QTBUG-45291
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Marc Mutz 2016-03-01 02:13:35 +01:00
parent c620bbc805
commit 8d6a2dcffd
11 changed files with 26 additions and 26 deletions

View File

@ -57,7 +57,7 @@ class QT3DINPUTSHARED_EXPORT QKeyboardDevice : public Qt3DInput::QAbstractPhysic
Q_PROPERTY(Qt3DInput::QKeyboardHandler *activeInput READ activeInput NOTIFY activeInputChanged)
public:
explicit QKeyboardDevice(QNode *parent = 0);
explicit QKeyboardDevice(QNode *parent = nullptr);
QKeyboardHandler *activeInput() const;
@ -69,7 +69,7 @@ public:
int buttonIdentifier(const QString &name) const Q_DECL_FINAL;
protected:
QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent = 0);
explicit QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent = nullptr);
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
Q_SIGNALS:

View File

@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QClearBuffers : public QFrameGraphNode
Q_PROPERTY(float clearDepthValue READ clearDepthValue WRITE setClearDepthValue NOTIFY clearDepthValueChanged)
Q_PROPERTY(int clearStencilValue READ clearStencilValue WRITE setClearStencilValue NOTIFY clearStencilValueChanged)
public:
explicit QClearBuffers(Qt3DCore::QNode *parent = 0);
explicit QClearBuffers(Qt3DCore::QNode *parent = nullptr);
enum BufferType {
None = 0,
@ -91,7 +91,7 @@ Q_SIGNALS:
void clearStencilValueChanged(int clearStencilValue);
protected:
QClearBuffers(QClearBuffersPrivate &dd, Qt3DCore::QNode *parent = 0);
explicit QClearBuffers(QClearBuffersPrivate &dd, Qt3DCore::QNode *parent = nullptr);
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
private:

View File

@ -54,14 +54,14 @@ class QT3DRENDERSHARED_EXPORT QRenderStateSet : public QFrameGraphNode
Q_OBJECT
public:
explicit QRenderStateSet(Qt3DCore::QNode *parent = 0);
explicit QRenderStateSet(Qt3DCore::QNode *parent = nullptr);
void addRenderState(QRenderState *state);
void removeRenderState(QRenderState *state);
QVector<QRenderState *> renderStates() const;
protected:
QRenderStateSet(QRenderStateSetPrivate &dd, Qt3DCore::QNode *parent = 0);
explicit QRenderStateSet(QRenderStateSetPrivate &dd, Qt3DCore::QNode *parent = nullptr);
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
private:

View File

@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QSortPolicy : public QFrameGraphNode
Q_OBJECT
Q_PROPERTY(QVariantList sortTypes READ sortTypeList WRITE setSortTypes NOTIFY sortTypesChanged)
public:
explicit QSortPolicy(Qt3DCore::QNode *parent = 0);
explicit QSortPolicy(Qt3DCore::QNode *parent = nullptr);
enum SortType {
StateChangeCost = (1 << 0),
@ -76,7 +76,7 @@ Q_SIGNALS:
void sortTypesChanged(QVariantList sortTypes);
protected:
QSortPolicy(QSortPolicyPrivate &dd, Qt3DCore::QNode *parent = 0);
explicit QSortPolicy(QSortPolicyPrivate &dd, Qt3DCore::QNode *parent = nullptr);
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
private:

View File

@ -84,7 +84,7 @@ public:
};
Q_ENUM(AttachmentPoint)
explicit QRenderTargetOutput(Qt3DCore::QNode *parent = 0);
explicit QRenderTargetOutput(Qt3DCore::QNode *parent = nullptr);
AttachmentPoint attachmentPoint() const;
QAbstractTexture *texture() const;
@ -107,7 +107,7 @@ Q_SIGNALS:
void faceChanged(QAbstractTexture::CubeMapFace face);
protected:
QRenderTargetOutput(QRenderTargetOutputPrivate &dd, Qt3DCore::QNode *parent = 0);
explicit QRenderTargetOutput(QRenderTargetOutputPrivate &dd, Qt3DCore::QNode *parent = nullptr);
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
private:

View File

@ -81,7 +81,7 @@ Q_SIGNALS:
protected:
QT3D_CLONEABLE(QSceneLoader)
QSceneLoader(QSceneLoaderPrivate &dd, Qt3DCore::QNode *parent = 0);
explicit QSceneLoader(QSceneLoaderPrivate &dd, Qt3DCore::QNode *parent = nullptr);
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
private:

View File

@ -84,7 +84,7 @@ public:
};
Q_ENUM(Blending)
explicit QBlendEquationArguments(Qt3DCore::QNode *parent = 0);
explicit QBlendEquationArguments(Qt3DCore::QNode *parent = nullptr);
Blending sourceRgb() const;
Blending destinationRgb() const;

View File

@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QStencilOperation : public QRenderState
Q_PROPERTY(Qt3DRender::QStencilOperationArguments *back READ back CONSTANT)
public:
explicit QStencilOperation(Qt3DCore::QNode *parent = 0);
explicit QStencilOperation(Qt3DCore::QNode *parent = nullptr);
QStencilOperationArguments *front() const;
QStencilOperationArguments *back() const;

View File

@ -100,7 +100,7 @@ Q_SIGNALS:
void faceModeChanged(FaceMode faceMode);
private:
explicit QStencilOperationArguments(FaceMode mode, QObject *parent = 0);
explicit QStencilOperationArguments(FaceMode mode, QObject *parent = nullptr);
Q_DECLARE_PRIVATE(QStencilOperationArguments)
friend class QStencilOperationPrivate;

View File

@ -100,7 +100,7 @@ Q_SIGNALS:
void faceModeChanged(StencilFaceMode faceMode);
private:
explicit QStencilTestArguments(StencilFaceMode face, QObject *parent = 0);
explicit QStencilTestArguments(StencilFaceMode face, QObject *parent = nullptr);
friend class QStencilTestPrivate;

View File

@ -59,77 +59,77 @@ class QT3DRENDERSHARED_EXPORT QTexture1D : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTexture1D(Qt3DCore::QNode *parent = 0);
explicit QTexture1D(Qt3DCore::QNode *parent = nullptr);
};
class QT3DRENDERSHARED_EXPORT QTexture1DArray : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTexture1DArray(Qt3DCore::QNode *parent = 0);
explicit QTexture1DArray(Qt3DCore::QNode *parent = nullptr);
};
class QT3DRENDERSHARED_EXPORT QTexture2D : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTexture2D(Qt3DCore::QNode *parent = 0);
explicit QTexture2D(Qt3DCore::QNode *parent = nullptr);
};
class QT3DRENDERSHARED_EXPORT QTexture2DArray : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTexture2DArray(Qt3DCore::QNode *parent = 0);
explicit QTexture2DArray(Qt3DCore::QNode *parent = nullptr);
};
class QT3DRENDERSHARED_EXPORT QTexture3D : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTexture3D(Qt3DCore::QNode *parent = 0);
explicit QTexture3D(Qt3DCore::QNode *parent = nullptr);
};
class QT3DRENDERSHARED_EXPORT QTextureCubeMap : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTextureCubeMap(Qt3DCore::QNode *parent = 0);
explicit QTextureCubeMap(Qt3DCore::QNode *parent = nullptr);
};
class QT3DRENDERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTextureCubeMapArray(Qt3DCore::QNode *parent = 0);
explicit QTextureCubeMapArray(Qt3DCore::QNode *parent = nullptr);
};
class QT3DRENDERSHARED_EXPORT QTexture2DMultisample : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTexture2DMultisample(Qt3DCore::QNode *parent = 0);
explicit QTexture2DMultisample(Qt3DCore::QNode *parent = nullptr);
};
class QT3DRENDERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTexture2DMultisampleArray(Qt3DCore::QNode *parent = 0);
explicit QTexture2DMultisampleArray(Qt3DCore::QNode *parent = nullptr);
};
class QT3DRENDERSHARED_EXPORT QTextureRectangle : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTextureRectangle(Qt3DCore::QNode *parent = 0);
explicit QTextureRectangle(Qt3DCore::QNode *parent = nullptr);
};
class QT3DRENDERSHARED_EXPORT QTextureBuffer : public QAbstractTexture
{
Q_OBJECT
public:
explicit QTextureBuffer(Qt3DCore::QNode *parent = 0);
explicit QTextureBuffer(Qt3DCore::QNode *parent = nullptr);
};
class QTextureLoaderPrivate;