summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/ntqgl.h30
-rw-r--r--src/opengl/qgl.cpp24
-rw-r--r--src/opengl/qgl_x11.cpp2
3 files changed, 28 insertions, 28 deletions
diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h
index 4b065716..858a9649 100644
--- a/src/opengl/ntqgl.h
+++ b/src/opengl/ntqgl.h
@@ -61,11 +61,11 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() {
}
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
# include "qt_windows.h"
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
#if !defined( TQMAC_OPENGL_DOUBLEBUFFER )
/* This macro is different now. If the macro is not defined TQGLWidget will
* try to determine when you need double buffering. If set to 0 it will
@@ -83,12 +83,12 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() {
# include <GL/glu.h>
#endif
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined(TQ_WS_WIN) || defined(TQ_WS_MAC)
class TQGLCmap;
#endif
class TQPixmap;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
class TQGLOverlayWidget;
#endif
@@ -202,14 +202,14 @@ protected:
virtual bool chooseContext( const TQGLContext* shareContext = 0 );
virtual void doneCurrent(); // ### 4.0: make this public - needed for multithreading stuff
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
virtual int choosePixelFormat( void* pfd, HDC pdc );
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
virtual void* tryVisual( const TQGLFormat& f, int bufDepth = 1 );
virtual void* chooseVisual();
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
virtual void* chooseMacVisual(GDHandle);
#endif
@@ -225,16 +225,16 @@ protected:
void setDevice( TQPaintDevice *pDev );
protected:
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HGLRC rc;
HDC dc;
WId win;
int pixelFormatId;
TQGLCmap* cmap;
-#elif defined(Q_WS_X11) || defined(Q_WS_MAC)
+#elif defined(TQ_WS_X11) || defined(TQ_WS_MAC)
void* vi;
void* cx;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQ_UINT32 gpm;
#endif
#endif
@@ -252,14 +252,14 @@ private:
bool crWin;
TQPaintDevice* paintDevice;
TQColor transpColor;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
TQRect oldR;
#endif
};
Private* d;
friend class TQGLWidget;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
void fixBufferRect();
#endif
@@ -359,9 +359,9 @@ private:
TQGLColormap cmap;
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined(TQ_WS_WIN) || defined(TQ_WS_MAC)
TQGLContext* olcx;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
TQGLOverlayWidget* olw;
friend class TQGLOverlayWidget;
#endif
@@ -372,7 +372,7 @@ private: // Disabled copy constructor and operator=
TQGLWidget& operator=( const TQGLWidget& );
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
private:
const TQGLContext *slcx;
uint pending_fix : 1,
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 0732bca0..83b27a0c 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -48,7 +48,7 @@
static TQGLFormat* qgl_default_format = 0;
static TQGLFormat* qgl_default_overlay_format = 0;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#include "private/qt_x11_p.h"
#define INT32 dummy_INT32
#define INT8 dummy_INT8
@@ -886,18 +886,18 @@ void TQGLContext::init( TQPaintDevice *dev )
{
d = new Private;
d->valid = FALSE;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
qt_resolve_gl_symbols();
gpm = 0;
#endif
setDevice( dev );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
dc = 0;
win = 0;
pixelFormatId = 0;
cmap = 0;
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
d->oldR = TQRect(1, 1, 1, 1);
#endif
d->crWin = FALSE;
@@ -1408,7 +1408,7 @@ TQGLWidget::~TQGLWidget()
if ( doRelease )
glXReleaseBuffersMESA( x11Display(), winId() );
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
if(gl_pix) {
delete gl_pix;
gl_pix = NULL;
@@ -1500,7 +1500,7 @@ bool TQGLWidget::isSharing() const
void TQGLWidget::makeCurrent()
{
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
macInternalDoubleBuffer(); //make sure the correct context is used
#endif
glcx->makeCurrent();
@@ -1535,7 +1535,7 @@ void TQGLWidget::doneCurrent()
void TQGLWidget::swapBuffers()
{
glcx->swapBuffers();
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
if(macInternalDoubleBuffer() && gl_pix)
bitBlt(this, 0, 0, gl_pix);
#endif
@@ -1824,7 +1824,7 @@ TQPixmap TQGLWidget::renderPixmap( int w, int h, bool useContext )
if ( (w > 0) && (h > 0) )
sz = TQSize( w, h );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQPixmap pm( sz.width(), sz.height(), x11Depth() );
bool needConversion = x11Visual() != TQPaintDevice::x11AppVisual();
@@ -1869,7 +1869,7 @@ TQPixmap TQGLWidget::renderPixmap( int w, int h, bool useContext )
ocx->makeCurrent();
if ( success ) {
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( needConversion ) {
TQImage image = pm.convertToImage();
TQPixmap p;
@@ -1894,7 +1894,7 @@ TQPixmap TQGLWidget::renderPixmap( int w, int h, bool useContext )
*/
TQImage TQGLWidget::grabFrameBuffer( bool withAlpha )
{
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
if(dblbuf == macInternalDoubleBuffer(FALSE) && gl_pix) //why not optimize?
return ((TQPixmap*)gl_pix)->convertToImage();
#endif
@@ -1928,7 +1928,7 @@ TQImage TQGLWidget::grabFrameBuffer( bool withAlpha )
res.setAlphaBuffer( withAlpha && format().alpha() );
}
else {
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
res = TQImage( w, h, 8 );
glReadPixels( 0, 0, w, h, GL_COLOR_INDEX, GL_UNSIGNED_BYTE,
res.bits() );
@@ -1987,7 +1987,7 @@ void TQGLWidget::glDraw()
swapBuffers();
} else {
glFlush();
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
if(dblbuf && gl_pix)
bitBlt(this, 0, 0, gl_pix);
#endif
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 6a74127d..51daa176 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -40,7 +40,7 @@
#include "ntqgl.h"
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#include "ntqmap.h"
#include "ntqpixmap.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 18:40:27 +0000