summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-09-13 23:43:40 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-09-13 23:51:40 (GMT)
commited5588f6e9ab11d61fb770eb76509a33962cf571 (patch)
tree03de01ddc588bab5e96b6606bf15493ad982c1bc /src/opengl
parentdcbafc17a0fff2a7de7d4eb61e7fd665e59aae18 (diff)
downloadQt-ed5588f6e9ab11d61fb770eb76509a33962cf571.zip
Qt-ed5588f6e9ab11d61fb770eb76509a33962cf571.tar.gz
Qt-ed5588f6e9ab11d61fb770eb76509a33962cf571.tar.bz2
qdoc: QGLWidgets -> QGLWidget, etc, for proper doc linking.
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl.cpp20
-rw-r--r--src/opengl/qglcolormap.cpp4
2 files changed, 12 insertions, 12 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index e545c2c..bd9b5a5 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -228,7 +228,7 @@ bool qt_gl_preferGL2Engine()
\since 4.6
Sets the preferred OpenGL paint engine that is used to draw onto
- QGLWidgets, QGLPixelBuffers and QGLFrameBufferObjects with QPainter
+ QGLWidget, QGLPixelBuffer and QGLFramebufferObject targets with QPainter
in Qt.
The \a engineType parameter specifies which of the GL engines to
@@ -1265,8 +1265,8 @@ QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags()
/*!
- Returns the default QGLFormat for the application. All QGLWidgets
- that are created use this format unless another format is
+ Returns the default QGLFormat for the application. All QGLWidget
+ objects that are created use this format unless another format is
specified, e.g. when they are constructed.
If no special default format has been set using
@@ -1353,7 +1353,7 @@ void QGLFormat::setDefaultOverlayFormat(const QGLFormat &f)
/*!
- Returns true if all the options of the two QGLFormats are equal;
+ Returns true if all the options of the two QGLFormat objects are equal;
otherwise returns false.
*/
@@ -1371,7 +1371,7 @@ bool operator==(const QGLFormat& a, const QGLFormat& b)
/*!
- Returns false if all the options of the two QGLFormats are equal;
+ Returns false if all the options of the two QGLFormat objects are equal;
otherwise returns true.
*/
@@ -3100,7 +3100,7 @@ const QGLContext* QGLContext::currentContext()
QGLFormat format\endlink and you can also create widgets with
customized rendering \link QGLContext contexts\endlink.
- You can also share OpenGL display lists between QGLWidgets (see
+ You can also share OpenGL display lists between QGLWidget objects (see
the documentation of the QGLWidget constructors for details).
Note that under Windows, the QGLContext belonging to a QGLWidget
@@ -3382,7 +3382,7 @@ bool QGLWidget::isValid() const
Returns true if this widget's GL context is shared with another GL
context, otherwise false is returned. Context sharing might not be
- possible if the QGLWidgets use different formats.
+ possible if the widgets use different formats.
\sa format()
*/
@@ -3480,7 +3480,7 @@ void QGLWidget::swapBuffers()
resizeGL() or paintGL().
This method will try to keep display list and texture object sharing
- in effect with other QGLWidgets, but changing the format might make
+ in effect with other QGLWidget objects, but changing the format might make
sharing impossible. Use isSharing() to see if sharing is still in
effect.
@@ -3784,7 +3784,7 @@ void QGLWidget::paintEvent(QPaintEvent *)
/*!
Renders the current scene on a pixmap and returns the pixmap.
- You can use this method on both visible and invisible QGLWidgets.
+ You can use this method on both visible and invisible QGLWidget objects.
This method will create a pixmap and a temporary QGLContext to
render on the pixmap. It will then call initializeGL(),
@@ -4866,7 +4866,7 @@ QGLContextResource::~QGLContextResource()
if (m_resources.size()) {
qWarning("QtOpenGL: Resources are still available at program shutdown.\n"
" This is possibly caused by a leaked QGLWidget, \n"
- " QGLFrameBufferObject or QGLPixelBuffer.");
+ " QGLFramebufferObject or QGLPixelBuffer.");
}
#endif
}
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index 7edb250..edb5c4f 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -42,14 +42,14 @@
/*!
\class QGLColormap
\brief The QGLColormap class is used for installing custom colormaps into
- QGLWidgets.
+ a QGLWidget.
\module OpenGL
\ingroup painting-3D
\ingroup shared
QGLColormap provides a platform independent way of specifying and
- installing indexed colormaps into QGLWidgets. QGLColormap is
+ installing indexed colormaps for a QGLWidget. QGLColormap is
especially useful when using the OpenGL color-index mode.
Under X11 you must use an X server that supports either a \c