diff options
Diffstat (limited to 'tqtinterface/qt4/src/opengl/tqgl_x11.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/opengl/tqgl_x11.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tqtinterface/qt4/src/opengl/tqgl_x11.cpp b/tqtinterface/qt4/src/opengl/tqgl_x11.cpp index 2bedfd6..bc6bc0e 100644 --- a/tqtinterface/qt4/src/opengl/tqgl_x11.cpp +++ b/tqtinterface/qt4/src/opengl/tqgl_x11.cpp @@ -608,7 +608,7 @@ void *TQGLContext::tryVisual( const TQGLFormat& f, int bufDepth ) if ( useTranspExt ) { // bug workaround - some systems (eg. FireGL) refuses to return an overlay // visual if the GLX_TRANSPARENT_TYPE_EXT attribute is specfied, even if - // the implementation supports transtqparent overlays + // the implementation supports transparent overlays int tmpSpec[] = { GLX_LEVEL, f.plane(), GLX_TRANSPARENT_TYPE_EXT, f.rgba() ? GLX_TRANSPARENT_RGB_EXT : GLX_TRANSPARENT_INDEX_EXT, None }; @@ -623,7 +623,7 @@ void *TQGLContext::tryVisual( const TQGLFormat& f, int bufDepth ) useTranspExtChecked = TRUE; } if ( f.plane() && useTranspExt ) { - // Required to avoid non-transtqparent overlay visual(!) on some systems + // Required to avoid non-transparent overlay visual(!) on some systems spec[i++] = GLX_TRANSPARENT_TYPE_EXT; spec[i++] = f.rgba() ? GLX_TRANSPARENT_RGB_EXT : GLX_TRANSPARENT_INDEX_EXT; } @@ -985,7 +985,7 @@ class TQGLOverlayWidget : public TQGLWidget { TQ_OBJECT public: - TQGLOverlayWidget( const TQGLFormat& format, TQGLWidget* tqparent, + TQGLOverlayWidget( const TQGLFormat& format, TQGLWidget* parent, const char* name=0, const TQGLWidget* shareWidget=0 ); protected: @@ -1004,12 +1004,12 @@ private: // Disabled copy constructor and operator= }; -TQGLOverlayWidget::TQGLOverlayWidget( const TQGLFormat& format, TQGLWidget* tqparent, +TQGLOverlayWidget::TQGLOverlayWidget( const TQGLFormat& format, TQGLWidget* parent, const char* name, const TQGLWidget* shareWidget ) - : TQGLWidget( format, tqparent, name, shareWidget ? shareWidget->olw : 0 ) + : TQGLWidget( format, parent, name, shareWidget ? shareWidget->olw : 0 ) { - realWidget = tqparent; + realWidget = parent; } @@ -1020,7 +1020,7 @@ void TQGLOverlayWidget::initializeGL() if ( transparentColor.isValid() ) qglClearColor( transparentColor ); else - qWarning( "TQGLOverlayWidget::initializeGL(): Could not get transtqparent color" ); + qWarning( "TQGLOverlayWidget::initializeGL(): Could not get transparent color" ); realWidget->initializeOverlayGL(); } @@ -1077,12 +1077,12 @@ void TQGLWidget::init( TQGLContext *context, const TQGLWidget *shareWidget ) } /*! \reimp */ -void TQGLWidget::reparent( TQWidget* tqparent, WFlags f, const TQPoint& p, +void TQGLWidget::reparent( TQWidget* parent, WFlags f, const TQPoint& p, bool showIt ) { if (glcx) glcx->doneCurrent(); - TQWidget::reparent( tqparent, f, p, FALSE ); + TQWidget::reparent( parent, f, p, FALSE ); if ( showIt ) show(); } @@ -1308,15 +1308,15 @@ static bool qCanAllocColors( TQWidget * w ) { bool validVisual = FALSE; int numVisuals; - long tqmask; + long mask; XVisualInfo templ; XVisualInfo * visuals; VisualID id = XVisualIDFromVisual( (Visual *) w->tqtopLevelWidget()->x11Visual() ); - tqmask = VisualScreenMask; + mask = VisualScreenMask; templ.screen = w->x11Screen(); - visuals = XGetVisualInfo( w->x11Display(), tqmask, &templ, &numVisuals ); + visuals = XGetVisualInfo( w->x11Display(), mask, &templ, &numVisuals ); for ( int i = 0; i < numVisuals; i++ ) { if ( visuals[i].visualid == id ) { |