summaryrefslogtreecommitdiff
path: root/src/opengl/qglpaintdevice.cpp
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-09-08 18:03:00 +0200
committerTom Cooksey <thomas.cooksey@nokia.com>2009-09-08 18:36:17 +0200
commitf6f099e33773e5739ef89681bc97a1a91ff168c8 (patch)
treea5278ef2151debe525b23700e04dd2f3cfd3b0c6 /src/opengl/qglpaintdevice.cpp
parent31d8058a32a1d2d2d6bc1ba3d48f5a382d7b87a7 (diff)
downloadqt4-tools-f6f099e33773e5739ef89681bc97a1a91ff168c8.tar.gz
Cleanup of QGLPaintDevice before it goes in
This is the last patch in the QGLPaintDevice series. Although previous patches have not been reviewed individually, Samuel's reviewed QGLPaintDevice API and all the changes as the code stands with this patch. Reviewed-by: Samuel
Diffstat (limited to 'src/opengl/qglpaintdevice.cpp')
-rw-r--r--src/opengl/qglpaintdevice.cpp66
1 files changed, 18 insertions, 48 deletions
diff --git a/src/opengl/qglpaintdevice.cpp b/src/opengl/qglpaintdevice.cpp
index 15ea2175bb..a89b884570 100644
--- a/src/opengl/qglpaintdevice.cpp
+++ b/src/opengl/qglpaintdevice.cpp
@@ -9,8 +9,8 @@
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** contained in the Technology Preview License Agreement accompanying
+** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
** package.
**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -46,6 +46,8 @@
#include <private/qwindowsurface_gl_p.h>
#include <private/qpixmapdata_gl_p.h>
+QT_BEGIN_NAMESPACE
+
QGLPaintDevice::QGLPaintDevice()
: m_thisFBO(0)
{
@@ -94,33 +96,16 @@ void QGLPaintDevice::endPaint()
}
}
-//QColor QGLPaintDevice::backgroundColor() const
-//{
-// return QApplication::palette().brush(QPalette::Background).color();
-//}
-
-//bool QGLPaintDevice::autoFillBackground() const
-//{
-// return false;
-//}
-
-//bool QGLPaintDevice::hasTransparentBackground() const
-//{
-// return false;
-//}
-
QGLFormat QGLPaintDevice::format() const
{
return context()->format();
}
-//QSize QGLPaintDevice::size() const
-//{
-// return QSize();
-//}
+////////////////// QGLWidgetGLPaintDevice //////////////////
+
QGLWidgetGLPaintDevice::QGLWidgetGLPaintDevice()
{
}
@@ -130,21 +115,6 @@ QPaintEngine* QGLWidgetGLPaintDevice::paintEngine() const
return glWidget->paintEngine();
}
-//QColor QGLWidgetGLPaintDevice::backgroundColor() const
-//{
-// return glWidget->palette().brush(glWidget->backgroundRole()).color();
-//}
-
-//bool QGLWidgetGLPaintDevice::autoFillBackground() const
-//{
-// return glWidget->autoFillBackground();
-//}
-
-//bool QGLWidgetGLPaintDevice::hasTransparentBackground() const
-//{
-// return glWidget->testAttribute(Qt::WA_TranslucentBackground);
-//}
-
void QGLWidgetGLPaintDevice::setWidget(QGLWidget* w)
{
glWidget = w;
@@ -214,4 +184,4 @@ QGLPaintDevice* QGLPaintDevice::getDevice(QPaintDevice* pd)
return glpd;
}
-
+QT_END_NAMESPACE