diff options
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 8c55cffbb3..99abdd2ad6 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -235,7 +235,7 @@ public: QGLContext(const QGLFormat& format); virtual ~QGLContext(); - virtual bool create(const QGLContext* shareContext = 0); + virtual bool create(const QGLContext* shareContext = Q_NULLPTR); bool isValid() const; bool isSharing() const; void reset(); @@ -303,7 +303,7 @@ public: QOpenGLContext *contextHandle() const; protected: - virtual bool chooseContext(const QGLContext* shareContext = 0); + virtual bool chooseContext(const QGLContext* shareContext = Q_NULLPTR); bool deviceIsPixmap() const; bool windowCreated() const; @@ -356,12 +356,12 @@ class Q_OPENGL_EXPORT QGLWidget : public QWidget Q_OBJECT Q_DECLARE_PRIVATE(QGLWidget) public: - explicit QGLWidget(QWidget* parent=0, - const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0); - explicit QGLWidget(QGLContext *context, QWidget* parent=0, - const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0); - explicit QGLWidget(const QGLFormat& format, QWidget* parent=0, - const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0); + explicit QGLWidget(QWidget* parent=Q_NULLPTR, + const QGLWidget* shareWidget = Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags()); + explicit QGLWidget(QGLContext *context, QWidget* parent=Q_NULLPTR, + const QGLWidget* shareWidget = Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags()); + explicit QGLWidget(const QGLFormat& format, QWidget* parent=Q_NULLPTR, + const QGLWidget* shareWidget = Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags()); ~QGLWidget(); void qglColor(const QColor& c) const; @@ -380,7 +380,7 @@ public: void setFormat(const QGLFormat& format); QGLContext* context() const; - void setContext(QGLContext* context, const QGLContext* shareContext = 0, + void setContext(QGLContext* context, const QGLContext* shareContext = Q_NULLPTR, bool deleteOldContext = true); QPixmap renderPixmap(int w = 0, int h = 0, bool useContext = false); @@ -442,9 +442,9 @@ protected: QGLWidget(QGLWidgetPrivate &dd, const QGLFormat &format = QGLFormat(), - QWidget *parent = 0, - const QGLWidget* shareWidget = 0, - Qt::WindowFlags f = 0); + QWidget *parent = Q_NULLPTR, + const QGLWidget* shareWidget = Q_NULLPTR, + Qt::WindowFlags f = Qt::WindowFlags()); private: Q_DISABLE_COPY(QGLWidget) |