3 files changed, 7 insertions, 11 deletions
diff --git a/kpat/card.cpp b/kpat/card.cpp
index d3dba426..09773711 100644
--- a/kpat/card.cpp
+++ b/kpat/card.cpp
@@ -288,7 +288,7 @@ void Card::flipTo(int x2, int y2, int steps)
     m_animSteps = steps;
     setVelocity(dx/m_animSteps, dy/m_animSteps-flipLift);
 
-    setAnimated(TRUE);
+    setAnimated(true);
 }
 
 
@@ -336,7 +336,7 @@ void Card::setAnimated(bool anim)
 	// Reset all things that might have changed during the animation.
         scaleX = 1.0;
         scaleY = 1.0;
-        m_flipping = FALSE;
+        m_flipping = false;
         setVelocity(0, 0);
 
 	// Move the card to its destination immediately.
@@ -374,7 +374,7 @@ void Card::getUp(int steps)
     // Animation
     m_animSteps = steps;
     setVelocity(0, 0);
-    setAnimated(TRUE);
+    setAnimated(true);
 }
 
 #include "card.moc"
diff --git a/kpat/freecell-solver/pqueue.c b/kpat/freecell-solver/pqueue.c
index 086cce96..e507a875 100644
--- a/kpat/freecell-solver/pqueue.c
+++ b/kpat/freecell-solver/pqueue.c
@@ -25,9 +25,6 @@
 #include "dmalloc.h"
 #endif
 
-#define TRUE 1
-#define FALSE 0
-
 /* initialise the priority queue with a maximum size of maxelements. maxrating is the highest or lowest value of an
    entry in the pqueue depending on whether it is ascending or descending respectively. Finally the bool32 tells you whether
    the list is sorted ascending or descending... */
@@ -50,10 +47,10 @@ void freecell_solver_PQueueInitialise(
 }
 
 /* join a priority queue
-   returns TRUE if successful, FALSE if fails. (You fail by filling the pqueue.)
+   returns true if successful, false if fails. (You fail by filling the pqueue.)
    PGetRating is a function which returns the rating of the item you're adding for sorting purposes */
 
-int freecell_solver_PQueuePush( PQUEUE *pq, void *item, pq_rating_t r)
+void freecell_solver_PQueuePush( PQUEUE *pq, void *item, pq_rating_t r)
 {
     uint32 i;
     pq_element_t * Elements = pq->Elements;
@@ -103,8 +100,7 @@ int freecell_solver_PQueuePush( PQUEUE *pq, void *item, pq_rating_t r)
 
     pq->CurrentSize = CurrentSize;
 
-    return TRUE;
-
+    return;
 }
 
 #define PQueueIsEmpty(pq) ((pq)->CurrentSize == 0)
diff --git a/kpat/freecell-solver/pqueue.h b/kpat/freecell-solver/pqueue.h
index cf5f5372..252653d6 100644
--- a/kpat/freecell-solver/pqueue.h
+++ b/kpat/freecell-solver/pqueue.h
@@ -58,7 +58,7 @@ void freecell_solver_PQueueInitialise(
 
 void freecell_solver_PQueueFree( PQUEUE *pq );
 
-int freecell_solver_PQueuePush( PQUEUE *pq, void *item, pq_rating_t);
+void freecell_solver_PQueuePush( PQUEUE *pq, void *item, pq_rating_t);
 
 void *freecell_solver_PQueuePop( PQUEUE *pq);