summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-04-13 00:18:24 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-04-13 00:18:24 -0500
commit1f0b774c59ea917f069fc5be95124afd89a8dd4c (patch)
tree73397bbe8e3f696c1ec3e120bcb72485ec97accd
parent7837f2ddb80e14ae851f95d4a86d8246d1d8db4f (diff)
downloadtdegames-1f0b774c59ea917f069fc5be95124afd89a8dd4c.tar.gz
tdegames-1f0b774c59ea917f069fc5be95124afd89a8dd4c.zip
Fix inadvertent "TQ" changes.
-rw-r--r--kpat/freecell-solver/fcs.h2
-rw-r--r--kpat/freecell-solver/intrface.c2
-rw-r--r--kpat/freecell-solver/main.c4
-rw-r--r--kpat/freecell-solver/pqueue.c10
-rw-r--r--kpat/freecell-solver/pqueue.h20
-rw-r--r--kpat/freecell-solver/scans.c2
-rw-r--r--kpoker/poker.h4
-rw-r--r--ksokoban/Queue.h6
-rw-r--r--libtdegames/kgame/kgameproperty.h4
-rw-r--r--twin4/index.html2
10 files changed, 28 insertions, 28 deletions
diff --git a/kpat/freecell-solver/fcs.h b/kpat/freecell-solver/fcs.h
index 63db42a6..47b4b89d 100644
--- a/kpat/freecell-solver/fcs.h
+++ b/kpat/freecell-solver/fcs.h
@@ -582,7 +582,7 @@ struct freecell_solver_soft_thread_struct
/*
* The priority queue of the A* scan */
- PTQUEUE * a_star_pqueue;
+ PQUEUE * a_star_pqueue;
double a_star_initial_cards_under_sequences;
/*
diff --git a/kpat/freecell-solver/intrface.c b/kpat/freecell-solver/intrface.c
index 9fb09840..6551652b 100644
--- a/kpat/freecell-solver/intrface.c
+++ b/kpat/freecell-solver/intrface.c
@@ -214,7 +214,7 @@ static freecell_solver_soft_thread_t * alloc_soft_thread(
freecell_solver_initialize_bfs_queue(soft_thread);
/* Initialize the priotity queue of the A* scan */
- soft_thread->a_star_pqueue = malloc(sizeof(PTQUEUE));
+ soft_thread->a_star_pqueue = malloc(sizeof(PQUEUE));
freecell_solver_PQueueInitialise(
soft_thread->a_star_pqueue,
1024
diff --git a/kpat/freecell-solver/main.c b/kpat/freecell-solver/main.c
index 4a47f300..d16468c4 100644
--- a/kpat/freecell-solver/main.c
+++ b/kpat/freecell-solver/main.c
@@ -658,12 +658,12 @@ int main(int argc, char * argv[])
if ((arg == argc) || (!strcmp(argv[arg], "-")))
{
file = stdin;
- if (!getenv("FREECELL_SOLVER_TQUIET"))
+ if (!getenv("FREECELL_SOLVER_QUIET"))
{
fprintf(stderr, "%s",
"Reading the board from the standard input.\n"
"Type \"fc-solve --help\" for more usage information.\n"
- "To cancel this message set the FREECELL_SOLVER_TQUIET environment variable.\n"
+ "To cancel this message set the FREECELL_SOLVER_QUIET environment variable.\n"
);
}
}
diff --git a/kpat/freecell-solver/pqueue.c b/kpat/freecell-solver/pqueue.c
index 47e6280d..0e4df49b 100644
--- a/kpat/freecell-solver/pqueue.c
+++ b/kpat/freecell-solver/pqueue.c
@@ -33,7 +33,7 @@
the list is sorted ascending or descending... */
void freecell_solver_PQueueInitialise(
- PTQUEUE *pq,
+ PQUEUE *pq,
int32 MaxElements
)
{
@@ -53,7 +53,7 @@ void freecell_solver_PQueueInitialise(
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( PTQUEUE *pq, void *item, pq_rating_t r)
+int freecell_solver_PQueuePush( PQUEUE *pq, void *item, pq_rating_t r)
{
uint32 i;
pq_element_t * Elements = pq->Elements;
@@ -83,7 +83,7 @@ int freecell_solver_PQueuePush( PTQUEUE *pq, void *item, pq_rating_t r)
{
while( ( i==PTQ_FIRST_ENTRY ?
- (PTQUEUE_MaxRating) /* return biggest possible rating if first element */
+ (PQUEUE_MaxRating) /* return biggest possible rating if first element */
:
(PGetRating(Elements[ PTQ_PARENT_INDEX(i) ]) )
)
@@ -110,14 +110,14 @@ int freecell_solver_PQueuePush( PTQUEUE *pq, void *item, pq_rating_t r)
#define PQueueIsEmpty(pq) ((pq)->CurrentSize == 0)
/* free up memory for pqueue */
-void freecell_solver_PQueueFree( PTQUEUE *pq )
+void freecell_solver_PQueueFree( PQUEUE *pq )
{
free( pq->Elements );
}
/* remove the first node from the pqueue and provide a pointer to it */
-void *freecell_solver_PQueuePop( PTQUEUE *pq)
+void *freecell_solver_PQueuePop( PQUEUE *pq)
{
int32 i;
int32 child;
diff --git a/kpat/freecell-solver/pqueue.h b/kpat/freecell-solver/pqueue.h
index cef1b854..f74068a8 100644
--- a/kpat/freecell-solver/pqueue.h
+++ b/kpat/freecell-solver/pqueue.h
@@ -11,8 +11,8 @@
http://www.geocities.com/jheyesjones/astar.html
*/
-#ifndef FC_SOLVE__PTQUEUE_H
-#define FC_SOLVE__PTQUEUE_H
+#ifndef FC_SOLVE__PQUEUE_H
+#define FC_SOLVE__PQUEUE_H
#ifdef __cplusplus
extern "C" {
@@ -22,7 +22,7 @@ extern "C" {
#include "jhjtypes.h"
-#define PTQUEUE_MaxRating INT_MAX
+#define PQUEUE_MaxRating INT_MAX
typedef int32 pq_rating_t;
@@ -32,13 +32,13 @@ typedef struct struct_pq_element_t
pq_rating_t rating;
} pq_element_t;
-typedef struct _PTQUEUE
+typedef struct _PQUEUE
{
int32 MaxSize;
int32 CurrentSize;
pq_element_t * Elements; /* pointer to void pointers */
pq_rating_t MaxRating; /* biggest element possible */
-} PTQUEUE;
+} PQUEUE;
/* given an index to any element in a binary tree stored in a linear array with the root at 1 and
a "sentinel" value at 0 these macros are useful in making the code clearer */
@@ -52,15 +52,15 @@ typedef struct _PTQUEUE
#define PTQ_RIGHT_CHILD_INDEX(i) (((i)<<1)+1)
void freecell_solver_PQueueInitialise(
- PTQUEUE *pq,
+ PQUEUE *pq,
int32 MaxElements
);
-void freecell_solver_PQueueFree( PTQUEUE *pq );
+void freecell_solver_PQueueFree( PQUEUE *pq );
-int freecell_solver_PQueuePush( PTQUEUE *pq, void *item, pq_rating_t);
+int freecell_solver_PQueuePush( PQUEUE *pq, void *item, pq_rating_t);
-void *freecell_solver_PQueuePop( PTQUEUE *pq);
+void *freecell_solver_PQueuePop( PQUEUE *pq);
#define PGetRating(elem) ((elem).rating)
@@ -68,4 +68,4 @@ void *freecell_solver_PQueuePop( PTQUEUE *pq);
}
#endif
-#endif /* #ifdef FC_SOLVE__PTQUEUE_H */
+#endif /* #ifdef FC_SOLVE__PQUEUE_H */
diff --git a/kpat/freecell-solver/scans.c b/kpat/freecell-solver/scans.c
index a4368873..23279275 100644
--- a/kpat/freecell-solver/scans.c
+++ b/kpat/freecell-solver/scans.c
@@ -945,7 +945,7 @@ int freecell_solver_a_star_or_bfs_do_solve_or_resume(
);
int scans_synergy = instance->scans_synergy;
fcs_states_linked_list_item_t * bfs_queue = soft_thread->bfs_queue;
- PTQUEUE * a_star_pqueue = soft_thread->a_star_pqueue;
+ PQUEUE * a_star_pqueue = soft_thread->a_star_pqueue;
fcs_states_linked_list_item_t * bfs_queue_last_item = soft_thread->bfs_queue_last_item;
derived.num_states = 0;
diff --git a/kpoker/poker.h b/kpoker/poker.h
index d139ea2b..ff388950 100644
--- a/kpoker/poker.h
+++ b/kpoker/poker.h
@@ -43,7 +43,7 @@ typedef enum {
C_NINE, D_NINE, S_NINE, H_NINE,
C_TEN, D_TEN, S_TEN, H_TEN,
C_JACK, D_JACK, S_JACK, H_JACK,
- C_TQUEEN, D_TQUEEN, S_TQUEEN, H_TQUEEN,
+ C_QUEEN, D_QUEEN, S_QUEEN, H_QUEEN,
C_KING, D_KING, S_KING, H_KING,
C_ACE, D_ACE, S_ACE, H_ACE,
ROOF // to get a roof on the value.
@@ -73,7 +73,7 @@ typedef enum {
NINE,
TEN,
JACK,
- TQUEEN,
+ QUEEN,
KING,
ACE // The most valuable rank
} CardRank;
diff --git a/ksokoban/Queue.h b/ksokoban/Queue.h
index 4e193f54..cab9db90 100644
--- a/ksokoban/Queue.h
+++ b/ksokoban/Queue.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef TQUEUE_H
-#define TQUEUE_H
+#ifndef QUEUE_H
+#define QUEUE_H
#include <assert.h>
@@ -53,4 +53,4 @@ public:
}
};
-#endif /* TQUEUE_H */
+#endif /* QUEUE_H */
diff --git a/libtdegames/kgame/kgameproperty.h b/libtdegames/kgame/kgameproperty.h
index 0bb117b8..ba465d20 100644
--- a/libtdegames/kgame/kgameproperty.h
+++ b/libtdegames/kgame/kgameproperty.h
@@ -117,7 +117,7 @@ public:
/**
* Constructs a KGamePropertyBase object and calls registerData.
- * @param id The id of this property. MUST be UNITQUE! Used to send and
+ * @param id The id of this property. MUST be UNIQUE! Used to send and
* receive changes in the property of the playere automatically via
* network.
* @param owner The owner of the object. Must be a KGamePropertyHandler which manages
@@ -585,7 +585,7 @@ public:
* Constructs a KGameProperty object. A KGameProperty object will transmit
* any changes to the KMessageServer and then to all clients in the
* game (including the one that has sent the new value)
- * @param id The id of this property. <em>MUST be UNITQUE</em>! Used to send and
+ * @param id The id of this property. <em>MUST be UNIQUE</em>! Used to send and
* receive changes in the property of the playere automatically via
* network.
* @param owner The parent of the object. Must be a KGame which manages
diff --git a/twin4/index.html b/twin4/index.html
index 13d28255..ea969510 100644
--- a/twin4/index.html
+++ b/twin4/index.html
@@ -1,6 +1,6 @@
<HTML>
<HEAD>
-<META HTTP-ETQUIV="Content-Type" CONTENT="text/html";>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html";>
<TITLE>Four wins manual</TITLE>
</HEAD>