diff options
author | Harald Fernengel <harald@trolltech.com> | 2009-08-06 10:04:36 (GMT) |
---|---|---|
committer | Harald Fernengel <harald@trolltech.com> | 2009-08-06 10:04:36 (GMT) |
commit | e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7 (patch) | |
tree | c01e05d0ea5a42fa1ab5f2f5e686806bcd8e5280 /src/opengl/qgl.h | |
parent | 7588eaee83776b510eabdb9206e3cabcb3ee9dc2 (diff) | |
download | Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.zip Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.tar.gz Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.tar.bz2 |
Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE
Rationale: We're using template magic now to get the private
pointer in qglobal.h, so no need to have two macros. Also
keeps backward compatibility with outside (KDE) code.
Diffstat (limited to 'src/opengl/qgl.h')
-rw-r--r-- | src/opengl/qgl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index fee19a5..9ee200b 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -266,7 +266,7 @@ Q_OPENGL_EXPORT bool operator!=(const QGLFormat&, const QGLFormat&); class Q_OPENGL_EXPORT QGLContext { - Q_DECLARE_SCOPED_PRIVATE(QGLContext) + Q_DECLARE_PRIVATE(QGLContext) public: QGLContext(const QGLFormat& format, QPaintDevice* device); QGLContext(const QGLFormat& format); @@ -388,7 +388,7 @@ private: class Q_OPENGL_EXPORT QGLWidget : public QWidget { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QGLWidget) + Q_DECLARE_PRIVATE(QGLWidget) public: explicit QGLWidget(QWidget* parent=0, const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0); |