summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-13 17:43:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-13 17:43:39 -0600
commit359640943bcf155faa9a067dde9e00a123276290 (patch)
treefb3d55ea5e18949042fb0064123fb73d2b1eb932 /src/opengl
parenta829bcdc533e154000803d517200d32fe762e85c (diff)
downloadtqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz
tqt3-359640943bcf155faa9a067dde9e00a123276290.zip
Automated update from Qt3
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/ntqgl.h6
-rw-r--r--src/opengl/ntqglcolormap.h2
-rw-r--r--src/opengl/qgl.cpp6
-rw-r--r--src/opengl/qgl_x11.cpp4
4 files changed, 9 insertions, 9 deletions
diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h
index 0476dfef..7388c41e 100644
--- a/src/opengl/ntqgl.h
+++ b/src/opengl/ntqgl.h
@@ -46,7 +46,7 @@
#include "ntqglcolormap.h"
#endif // QT_H
-#if !defined( QT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
#define TQM_EXPORT_OPENGL
#else
#define TQM_EXPORT_OPENGL Q_EXPORT
@@ -274,7 +274,7 @@ private: // Disabled copy constructor and operator=
class TQM_EXPORT_OPENGL TQGLWidget : public TQWidget, public TQGL
{
- Q_OBJECT
+ TQ_OBJECT
public:
TQGLWidget( TQWidget* parent=0, const char* name=0,
const TQGLWidget* shareWidget = 0, WFlags f=0 );
@@ -367,7 +367,7 @@ private:
#endif
private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
TQGLWidget( const TQGLWidget& );
TQGLWidget& operator=( const TQGLWidget& );
#endif
diff --git a/src/opengl/ntqglcolormap.h b/src/opengl/ntqglcolormap.h
index 23e33410..8fb24921 100644
--- a/src/opengl/ntqglcolormap.h
+++ b/src/opengl/ntqglcolormap.h
@@ -47,7 +47,7 @@
#include "ntqshared.h"
#endif // QT_H
-#if !defined( QT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
#define TQM_EXPORT_OPENGL
#else
#define TQM_EXPORT_OPENGL Q_EXPORT
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 612448d5..95cbae5d 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1165,7 +1165,7 @@ bool TQGLContext::create( const TQGLContext* shareContext )
\code
class MyGLDrawer : public TQGLWidget
{
- Q_OBJECT // must include this if you use TQt signals/slots
+ TQ_OBJECT // must include this if you use TQt signals/slots
public:
MyGLDrawer( TQWidget *parent, const char *name )
@@ -2220,7 +2220,7 @@ void TQGLWidget::renderText( int x, int y, const TQString & str, const TQFont &
glBitmap(0, 0, 0, 0, x, -y, NULL);
glListBase( displayListBase( fnt, listBase ) );
const char *cstr = str.latin1();
- glCallLists( qstrlen(cstr), GL_UNSIGNED_BYTE, cstr );
+ glCallLists( tqstrlen(cstr), GL_UNSIGNED_BYTE, cstr );
// restore the matrix stacks and GL state
glPopMatrix();
@@ -2246,7 +2246,7 @@ void TQGLWidget::renderText( double x, double y, double z, const TQString & str,
glPushAttrib( GL_LIST_BIT );
glListBase( displayListBase( fnt, listBase ) );
const char *cstr = str.latin1();
- glCallLists( qstrlen(cstr), GL_UNSIGNED_BYTE, cstr );
+ glCallLists( tqstrlen(cstr), GL_UNSIGNED_BYTE, cstr );
glPopAttrib();
}
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index a8f317a4..caa76398 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -974,7 +974,7 @@ void TQGLContext::generateFontDisplayLists( const TQFont & fnt, int listBase )
class TQGLOverlayWidget : public TQGLWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TQGLOverlayWidget( const TQGLFormat& format, TQGLWidget* parent,
const char* name=0, const TQGLWidget* shareWidget=0 );
@@ -988,7 +988,7 @@ private:
TQGLWidget* realWidget;
private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
TQGLOverlayWidget( const TQGLOverlayWidget& );
TQGLOverlayWidget& operator=( const TQGLOverlayWidget& );
#endif