summaryrefslogtreecommitdiffstats
path: root/examples/demo/opengl
diff options
context:
space:
mode:
Diffstat (limited to 'examples/demo/opengl')
-rw-r--r--examples/demo/opengl/fbm.h3
-rw-r--r--examples/demo/opengl/glbox.cpp2
-rw-r--r--examples/demo/opengl/glcontrolwidget.cpp4
-rw-r--r--examples/demo/opengl/glgear.cpp2
-rw-r--r--examples/demo/opengl/gllandscape.cpp16
-rw-r--r--examples/demo/opengl/gltexobj.cpp2
-rw-r--r--examples/demo/opengl/glworkspace.cpp16
-rw-r--r--examples/demo/opengl/printpreview.ui.h4
8 files changed, 23 insertions, 26 deletions
diff --git a/examples/demo/opengl/fbm.h b/examples/demo/opengl/fbm.h
index 474cd3c2d..423e44c5c 100644
--- a/examples/demo/opengl/fbm.h
+++ b/examples/demo/opengl/fbm.h
@@ -17,9 +17,6 @@
extern "C" {
#endif
-#define TRUE 1
-#define FALSE 0
-
typedef struct {
double x;
double y;
diff --git a/examples/demo/opengl/glbox.cpp b/examples/demo/opengl/glbox.cpp
index f065888b5..5250d49e4 100644
--- a/examples/demo/opengl/glbox.cpp
+++ b/examples/demo/opengl/glbox.cpp
@@ -68,7 +68,7 @@ void GLBox::paintGL()
glVertex3f( 0.98, 0.98, 0.98 );
}
glEnd();
- renderText( 1.0, 1.0, 1.0, "Wirebox", TQFont( "helvetica", 12, TQFont::Bold, TRUE ) );
+ renderText( 1.0, 1.0, 1.0, "Wirebox", TQFont( "helvetica", 12, TQFont::Bold, true ) );
}
diff --git a/examples/demo/opengl/glcontrolwidget.cpp b/examples/demo/opengl/glcontrolwidget.cpp
index 33f3bafda..8da48258a 100644
--- a/examples/demo/opengl/glcontrolwidget.cpp
+++ b/examples/demo/opengl/glcontrolwidget.cpp
@@ -7,7 +7,7 @@
GLControlWidget::GLControlWidget( TQWidget *parent, const char *name, TQGLWidget *share, WFlags f )
: TQGLWidget( parent, name, share, f ),
- xRot(0),yRot(0),zRot(0),xTrans(0),yTrans(0),zTrans(-10.0),scale(5.0), animation(TRUE), wasAnimated(FALSE), delay( 50 )
+ xRot(0),yRot(0),zRot(0),xTrans(0),yTrans(0),zTrans(-10.0),scale(5.0), animation(true), wasAnimated(false), delay( 50 )
{
setCursor( pointingHandCursor );
timer = new TQTimer( this );
@@ -189,7 +189,7 @@ void GLControlWidget::setAnimationDelay( int ms )
timer->stop();
delay = ms;
if ( animation ) {
- wasAnimated = TRUE;
+ wasAnimated = true;
timer->start( delay );
}
}
diff --git a/examples/demo/opengl/glgear.cpp b/examples/demo/opengl/glgear.cpp
index 07c5f3694..6f3d4f0e7 100644
--- a/examples/demo/opengl/glgear.cpp
+++ b/examples/demo/opengl/glgear.cpp
@@ -258,7 +258,7 @@ void GLGear::paintGL()
glVertex3f( 2.98, 2.98, 2.98 );
}
glEnd();
- renderText( 3.0, 3.0, 3.0, "Gears", TQFont( "helvetica", 12, TQFont::Bold, TRUE ) );
+ renderText( 3.0, 3.0, 3.0, "Gears", TQFont( "helvetica", 12, TQFont::Bold, true ) );
glPopMatrix();
glPopAttrib();
}
diff --git a/examples/demo/opengl/gllandscape.cpp b/examples/demo/opengl/gllandscape.cpp
index 1de9102b0..612f8c264 100644
--- a/examples/demo/opengl/gllandscape.cpp
+++ b/examples/demo/opengl/gllandscape.cpp
@@ -18,8 +18,8 @@
GLLandscape::GLLandscape( TQWidget * parent, const char * name )
: TQGLWidget( parent, name )
{
- mouseButtonDown = FALSE;
- animationRunning = FALSE;
+ mouseButtonDown = false;
+ animationRunning = false;
oldX = oldY = oldZ = 0.0;
landscape = 0;
vertexNormals = 0;
@@ -308,7 +308,7 @@ void GLLandscape::createGrid( int size )
size++;
gridSize = size;
gridHalf = gridSize / 2;
- initFractals = TRUE;
+ initFractals = true;
landscape = new double*[gridSize];
normals = new gridNormals*[gridSize];
vertexNormals = new avgNormals*[gridSize];
@@ -425,7 +425,7 @@ void GLLandscape::fractalize()
p.x = p.y = p.z = 0;
// Initialise fbm routine
if ( initFractals ) {
- initFractals = FALSE;
+ initFractals = false;
value = fBm( p, roughness, 2.0, 8.0, 1 );
}
@@ -650,13 +650,13 @@ void GLLandscape::setLandscape( int state )
void GLLandscape::mousePressEvent( TQMouseEvent *e )
{
oldPos = e->pos();
- mouseButtonDown = TRUE;
+ mouseButtonDown = true;
}
void GLLandscape::mouseReleaseEvent( TQMouseEvent *e )
{
oldPos = e->pos();
- mouseButtonDown = FALSE;
+ mouseButtonDown = false;
}
void GLLandscape::mouseMoveEvent( TQMouseEvent *e )
@@ -742,10 +742,10 @@ void GLLandscape::toggleWaveAnimation( bool state )
{
if (state) {
animTimer = startTimer(20);
- animationRunning = TRUE;
+ animationRunning = true;
} else {
killTimer(animTimer);
- animationRunning = FALSE;
+ animationRunning = false;
}
}
diff --git a/examples/demo/opengl/gltexobj.cpp b/examples/demo/opengl/gltexobj.cpp
index 183940b42..77b1301db 100644
--- a/examples/demo/opengl/gltexobj.cpp
+++ b/examples/demo/opengl/gltexobj.cpp
@@ -63,7 +63,7 @@ void GLTexobj::paintGL()
glVertex3f( 0.98f, 0.98f, 0.98f );
}
glEnd();
- renderText( 1.0, 1.0, 1.0, "Can", TQFont( "helvetica", 12, TQFont::Bold, TRUE ) );
+ renderText( 1.0, 1.0, 1.0, "Can", TQFont( "helvetica", 12, TQFont::Bold, true ) );
glPopAttrib();
glPopMatrix();
}
diff --git a/examples/demo/opengl/glworkspace.cpp b/examples/demo/opengl/glworkspace.cpp
index 32c491be6..04db7c4b5 100644
--- a/examples/demo/opengl/glworkspace.cpp
+++ b/examples/demo/opengl/glworkspace.cpp
@@ -46,8 +46,8 @@ void GLWorkspace::setupSceneActions()
TQActionGroup *newGroup = new TQActionGroup( this );
newGroup->setMenuText( tr( "&New" ) );
newGroup->setText( tr( "New" ) );
- newGroup->setUsesDropDown( TRUE );
- newGroup->setExclusive( FALSE );
+ newGroup->setUsesDropDown( true );
+ newGroup->setExclusive( false );
newGroup->setIconSet( TQPixmap( "textdrawing/filenew.png" ) );
a = new TQAction( tr( "Wirebox" ), TQPixmap( "opengl/wirebox.xpm" ), tr( "&Wirebox" ), 0, newGroup );
connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( newWirebox() ) );
@@ -64,8 +64,8 @@ void GLWorkspace::setupSceneActions()
TQActionGroup *printGroup = new TQActionGroup( this );
printGroup->setMenuText( tr( "&Print" ) );
printGroup->setText( tr( "Print" ) );
- printGroup->setUsesDropDown( TRUE );
- printGroup->setExclusive( FALSE );
+ printGroup->setUsesDropDown( true );
+ printGroup->setExclusive( false );
printGroup->setIconSet( TQPixmap( "textdrawing/print.png" ) );
TQAction *da = new TQAction( tr( "Window Size" ), TQPixmap( "textdrawing/print.png" ), tr( "&Window Size" ), CTRL + Key_P, printGroup );
connect( da, TQ_SIGNAL( activated() ), this, TQ_SLOT( filePrintWindowRes() ) );
@@ -148,10 +148,10 @@ void GLWorkspace::filePrint( int x, int y )
img.invertPixels();
}
if ( view.checkMirror->isChecked() ) {
- img = img.mirror( TRUE, FALSE );
+ img = img.mirror( true, false );
}
if ( view.checkFlip->isChecked() ) {
- img = img.mirror( FALSE, TRUE );
+ img = img.mirror( false, true );
}
if ( view.checkLeft->isEnabled() && view.checkLeft->isChecked() ) {
}
@@ -196,13 +196,13 @@ bool GLWorkspace::filePrintSetup()
if ( !printer )
printer = new TQPrinter;
if ( printer->setup() ) {
- return TRUE;
+ return true;
} else {
if ( newPrinter ) {
delete printer;
printer = 0;
}
- return FALSE;
+ return false;
}
}
diff --git a/examples/demo/opengl/printpreview.ui.h b/examples/demo/opengl/printpreview.ui.h
index 6f7b9dae7..87ffdb46f 100644
--- a/examples/demo/opengl/printpreview.ui.h
+++ b/examples/demo/opengl/printpreview.ui.h
@@ -24,10 +24,10 @@ void PrintPreview::updatePreview()
img.invertPixels();
}
if ( checkMirror->isChecked() ) {
- img = img.mirror( TRUE, FALSE );
+ img = img.mirror( true, false );
}
if ( checkFlip->isChecked() ) {
- img = img.mirror( FALSE, TRUE );
+ img = img.mirror( false, true );
}
if ( checkLeft->isEnabled() && checkLeft->isChecked() ) {
}