From 2cbda78a2751b0f52a79f9cc904a252c05a88cfe Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Tue, 22 May 2018 16:07:53 +0200
Subject: [PATCH] Change TRUE/FALSE to true/false
---
t14/cannon.cpp | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/t14/cannon.cpp b/t14/cannon.cpp
index 6f8f4c3..5a3208c 100644
--- a/t14/cannon.cpp
+++ b/t14/cannon.cpp
@@ -21,12 +21,12 @@ CannonField::CannonField( QWidget *parent, const char *name )
{
ang = 45;
f = 0;
- shooting = FALSE;
+ shooting = false;
timerCount = 0;
shoot_ang = 0;
shoot_f = 0;
- gameEnded = FALSE;
- barrelPressed = FALSE;
+ gameEnded = false;
+ barrelPressed = false;
newTarget();
}
@@ -39,7 +39,7 @@ void CannonField::setAngle( int degrees )
if ( ang == degrees )
return;
ang = degrees;
- repaint( cannonRect(), FALSE );
+ repaint( cannonRect(), false );
emit angleChanged( ang );
}
@@ -60,15 +60,15 @@ void CannonField::shoot()
timerCount = 0;
shoot_ang = ang;
shoot_f = f;
- shooting = TRUE;
+ shooting = true;
startTimer( 50 );
}
void CannonField::newTarget()
{
- static bool first_time = TRUE;
+ static bool first_time = true;
if ( first_time ) {
- first_time = FALSE;
+ first_time = false;
QTime midnight( 0, 0, 0 );
srand( midnight.secsTo(QTime::currentTime()) );
}
@@ -84,7 +84,7 @@ void CannonField::setGameOver()
return;
if ( shooting )
stopShooting();
- gameEnded = TRUE;
+ gameEnded = true;
repaint();
}
@@ -92,7 +92,7 @@ void CannonField::restartGame()
{
if ( shooting )
stopShooting();
- gameEnded = FALSE;
+ gameEnded = false;
repaint();
}
@@ -114,7 +114,7 @@ void CannonField::timerEvent( QTimerEvent * )
emit missed();
return;
}
- repaint( shotR, FALSE );
+ repaint( shotR, false );
}
void CannonField::paintEvent( QPaintEvent *e )
@@ -145,7 +145,7 @@ void CannonField::mousePressEvent( QMouseEvent *e )
if ( e->button() != LeftButton )
return;
if ( barrelHit( e->pos() ) )
- barrelPressed = TRUE;
+ barrelPressed = true;
}
void CannonField::mouseMoveEvent( QMouseEvent *e )
@@ -164,12 +164,12 @@ void CannonField::mouseMoveEvent( QMouseEvent *e )
void CannonField::mouseReleaseEvent( QMouseEvent *e )
{
if ( e->button() == LeftButton )
- barrelPressed = FALSE;
+ barrelPressed = false;
}
void CannonField::stopShooting()
{
- shooting = FALSE;
+ shooting = false;
killTimers();
}
--
GitLab