From 12e2c29153a0f55ac23bdeec06b404638672985b Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 19 Jun 2000 19:04:05 +0000 Subject: [PATCH] r109: reorganized header files --- include/Makefile.am | 2 +- include/array2d.h | 8 +++- include/ascii.h | 81 ------------------------------------ include/ct.h | 7 +--- include/ctsupport.h | 44 +++++++++++++++++++- include/ezplot.h | 8 ++-- include/imagefile.h | 5 ++- include/sgp.h | 7 ++-- libctgraphics/circle.cpp | 7 +++- libctgraphics/ctm.cpp | 19 +-------- libctgraphics/drawbox.cpp | 19 +-------- libctgraphics/driver_x11.cpp | 9 ++-- libctgraphics/ezplot.cpp | 11 ++--- libctgraphics/ezpol.cpp | 20 +++++---- libctgraphics/ezset.cpp | 9 ++-- libctgraphics/ezsupport.cpp | 4 +- libctgraphics/sgp.cpp | 44 +++++--------------- libctgraphics/sgpdrive.cpp | 43 ++----------------- libctgraphics/sgptext.cpp | 22 ++-------- libctsupport/audio.cpp | 7 +--- libctsupport/byteorder.cpp | 3 +- libctsupport/clip.cpp | 5 +-- libctsupport/consoleio.cpp | 7 +--- libctsupport/filefuncs.cpp | 6 +-- libctsupport/normangle.cpp | 4 +- libctsupport/simpson.cpp | 4 +- libctsupport/strfuncs.cpp | 4 +- libctsupport/syserror.cpp | 5 +-- libctsupport/timedate.cpp | 28 ++----------- libctsupport/xform.cpp | 5 ++- 30 files changed, 141 insertions(+), 306 deletions(-) delete mode 100644 include/ascii.h diff --git a/include/Makefile.am b/include/Makefile.am index 64baad3..0b7826d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,4 +1,4 @@ -noinst_HEADERS=ascii.h cio.h ct.h ezplot.h keyboard.h kmath.h kstddef.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h byteorder.h phantom.h timer.h sstream scanner.h projections.h +noinst_HEADERS=ct.h ezplot.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h byteorder.h phantom.h timer.h sstream scanner.h projections.h ctsupport.h diff --git a/include/array2d.h b/include/array2d.h index c4d4200..5eb23b3 100644 --- a/include/array2d.h +++ b/include/array2d.h @@ -9,8 +9,11 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: array2d.h,v 1.4 2000/06/09 11:03:08 kevin Exp $ +** $Id: array2d.h,v 1.5 2000/06/19 19:04:05 kevin Exp $ ** $Log: array2d.h,v $ +** Revision 1.5 2000/06/19 19:04:05 kevin +** reorganized header files +** ** Revision 1.4 2000/06/09 11:03:08 kevin ** Made ImageFile inherit from Array2dFile ** @@ -35,7 +38,8 @@ #ifndef ARRAY2D_H #define ARRAY2D_H -#include +#include "ctsupport.h" + template class Array2d { diff --git a/include/ascii.h b/include/ascii.h deleted file mode 100644 index f74fe1c..0000000 --- a/include/ascii.h +++ /dev/null @@ -1,81 +0,0 @@ -/***************************************************************************** -** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg -** -** $Id: ascii.h,v 1.2 2000/04/28 14:14:16 kevin Exp $ -** $Log: ascii.h,v $ -** Revision 1.2 2000/04/28 14:14:16 kevin -** *** empty log message *** -** -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License (version 2) as -** published by the Free Software Foundation. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -******************************************************************************/ -/****************************************************************************** - * - * FILE IDENTIFICATION - * - * File Name: ASCII.H - * Author: Kevin Rosenberg - * Purpose: Header file with definitions for ASCII characrers - * Date Started: Jan 84 - * - * DESCRIPTION - * Header file contains values for ASCII characters - * - * MODIFICATION LOG - * - *****************************************************************************/ - -#ifndef ASCII_H -#define ASCII_H - -#define BACKSPACE 8 -#define LF 0x0A -#define CR 0x0D -#define BELL 0x07 - -#define SQUOTE '\'' -#define DQUOTE '\"' -#define BSLASH '\\' -#define BACKSLASH '\\' -#define SHARP '#' -#define SLASH '/' -#define ASTERICK '*' -#define COLON ':' -#define LBRACE '{' -#define RBRACE '}' -#define LPAREN '(' -#define RPAREN ')' -#define LBRACK '[' -#define RBRACK ']' -#define LANBRACK '<' -#define RANBRACK '>' -#define SEMICOL ';' -#define UNDERLIN '_' -#define COMMA ',' -#define CARET '^' -#define TILDE '~' -#define ATSIGN '@' -#define AMPERSAND '&' -#define EXCLAM '!' -#define DOLLAR '$' -#define PERCENT '%' -#define PLUS '+' -#define HYPHEN '-' -#define EQUALS '=' -#define QUESTION '?' -#define PERIOD '.' -#define VERTBAR '|' - -#endif /* #ifndef ASCII_H */ diff --git a/include/ct.h b/include/ct.h index c3ec83d..016a4f8 100644 --- a/include/ct.h +++ b/include/ct.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ct.h,v 1.18 2000/06/19 17:58:20 kevin Exp $ +** $Id: ct.h,v 1.19 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -114,10 +114,7 @@ extern "C" { #include "mpiworld.h" #endif -#include "kstddef.h" -#include "kmath.h" -#include "keyboard.h" -#include "cio.h" +#include "ctsupport.h" #include "byteorder.h" #ifdef HAVE_SGP diff --git a/include/ctsupport.h b/include/ctsupport.h index 708d161..349aaf5 100644 --- a/include/ctsupport.h +++ b/include/ctsupport.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsupport.h,v 1.1 2000/06/19 18:49:00 kevin Exp $ +** $Id: ctsupport.h,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** ** This program is free software; you can redistribute it and/or modify @@ -319,4 +319,44 @@ unsigned int cio_kb_waitc(const char *astr, int beep); #define KEY_RETURN 13 #define KEY_ESCAPE 27 -#endif +// ASCII Section + +#define BACKSPACE 8 +#define LF 0x0A +#define CR 0x0D +#define BELL 0x07 + +#define SQUOTE '\'' +#define DQUOTE '\"' +#define BSLASH '\\' +#define BACKSLASH '\\' +#define SHARP '#' +#define SLASH '/' +#define ASTERICK '*' +#define COLON ':' +#define LBRACE '{' +#define RBRACE '}' +#define LPAREN '(' +#define RPAREN ')' +#define LBRACK '[' +#define RBRACK ']' +#define LANBRACK '<' +#define RANBRACK '>' +#define SEMICOL ';' +#define UNDERLIN '_' +#define COMMA ',' +#define CARET '^' +#define TILDE '~' +#define ATSIGN '@' +#define AMPERSAND '&' +#define EXCLAM '!' +#define DOLLAR '$' +#define PERCENT '%' +#define PLUS '+' +#define HYPHEN '-' +#define EQUALS '=' +#define QUESTION '?' +#define PERIOD '.' +#define VERTBAR '|' + +#endif /* #ifndef ASCII_H */ diff --git a/include/ezplot.h b/include/ezplot.h index 4beb8ff..40e05f4 100644 --- a/include/ezplot.h +++ b/include/ezplot.h @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ezplot.h,v 1.6 2000/06/18 10:27:11 kevin Exp $ +** $Id: ezplot.h,v 1.7 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -29,12 +29,10 @@ #include #include -#include "kstddef.h" #include -#include "sgp.h" #include -#include "kmath.h" -#include "cio.h" +#include "ctsupport.h" +#include "sgp.h" #define MAXLABEL 40 /* maximum length of axis label */ #define MAXTITLE 40 /* maximum length of a title */ diff --git a/include/imagefile.h b/include/imagefile.h index ccf3769..5d36219 100644 --- a/include/imagefile.h +++ b/include/imagefile.h @@ -2,13 +2,14 @@ #define IDF_H #include -#include "kstddef.h" #include #include -#include +#include "ctsupport.h" +#include "array2d.h" using namespace std; + class Array2dFileLabel { private: diff --git a/include/sgp.h b/include/sgp.h index ee95681..15f0c35 100644 --- a/include/sgp.h +++ b/include/sgp.h @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: sgp.h,v 1.9 2000/06/15 19:07:10 kevin Exp $ +** $Id: sgp.h,v 1.10 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -25,13 +25,12 @@ #ifndef __H_SGP #define __H_SGP -#include "kstddef.h" -#include "kmath.h" - #if HAVE_CONFIG_H #include "config.h" #endif +#include "ctsupport.h" + #if HAVE_G2_H extern "C" { #include "g2.h" diff --git a/libctgraphics/circle.cpp b/libctgraphics/circle.cpp index 373edae..5c74dee 100644 --- a/libctgraphics/circle.cpp +++ b/libctgraphics/circle.cpp @@ -2,8 +2,11 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: circle.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $ +** $Id: circle.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** $Log: circle.cpp,v $ +** Revision 1.2 2000/06/19 19:04:05 kevin +** reorganized header files +** ** Revision 1.1 2000/06/19 18:05:03 kevin ** initial cvs import ** @@ -37,7 +40,7 @@ */ #include "math.h" -#include "kmath.h" +#include "ctsupport.h" #include "sgp.h" void diff --git a/libctgraphics/ctm.cpp b/libctgraphics/ctm.cpp index 4f88c77..ec61c29 100644 --- a/libctgraphics/ctm.cpp +++ b/libctgraphics/ctm.cpp @@ -2,21 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctm.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $ -** $Log: ctm.cpp,v $ -** Revision 1.1 2000/06/19 18:05:03 kevin -** initial cvs import -** -** Revision 1.1 2000/06/13 16:20:31 kevin -** finished c++ conversions -** -** Revision 1.2 2000/05/11 14:07:23 kevin -** Fixed compilation warnings -** -** Revision 1.1.1.1 2000/04/28 13:02:44 kevin -** Initial CVS import for first public release -** -** +** $Id: ctm.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -54,9 +40,8 @@ * column *---------------------------------------------------------------------------*/ -#include "kstddef.h" +#include "ctsupport.h" #include -#include "kmath.h" #include "sgp.h" diff --git a/libctgraphics/drawbox.cpp b/libctgraphics/drawbox.cpp index 9d9eff6..f0bc899 100644 --- a/libctgraphics/drawbox.cpp +++ b/libctgraphics/drawbox.cpp @@ -2,24 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: drawbox.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $ -** $Log: drawbox.cpp,v $ -** Revision 1.1 2000/06/19 18:05:03 kevin -** initial cvs import -** -** Revision 1.1 2000/06/13 16:20:31 kevin -** finished c++ conversions -** -** Revision 1.3 2000/05/24 22:49:01 kevin -** Updated SGP: first function X-windows version -** -** Revision 1.2 2000/05/11 14:07:23 kevin -** Fixed compilation warnings -** -** Revision 1.1.1.1 2000/04/28 13:02:44 kevin -** Initial CVS import for first public release -** -** +** $Id: drawbox.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as diff --git a/libctgraphics/driver_x11.cpp b/libctgraphics/driver_x11.cpp index c48a4d2..7992ee6 100644 --- a/libctgraphics/driver_x11.cpp +++ b/libctgraphics/driver_x11.cpp @@ -2,8 +2,11 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: driver_x11.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $ +** $Id: driver_x11.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** $Log: driver_x11.cpp,v $ +** Revision 1.2 2000/06/19 19:04:05 kevin +** reorganized header files +** ** Revision 1.1 2000/06/19 18:05:03 kevin ** initial cvs import ** @@ -28,10 +31,8 @@ #include #include #include -#include "kstddef.h" +#include "ctsupport.h" #include "sgp.h" -#include "kmath.h" -#include "cio.h" #include #include diff --git a/libctgraphics/ezplot.cpp b/libctgraphics/ezplot.cpp index 73db34d..dfd0baf 100644 --- a/libctgraphics/ezplot.cpp +++ b/libctgraphics/ezplot.cpp @@ -1,8 +1,12 @@ /***************************************************************************** +** FILE IDENTIFICATION +** +** EZPLOT +** ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ezplot.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $ +** $Id: ezplot.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -17,18 +21,15 @@ ** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -/*----------------------------------------------------------------------*/ -/* EZPLOT */ -/*----------------------------------------------------------------------*/ #include "ezplot.h" #include "algo.h" + static int plot (SGP_ID *gid); static void drawaxis(void); static void symbol (int sym, double symwidth, double symheight); - /*-------------------------------------*/ /* GLOBAL variables for EZPLOT & EZSET */ /*-------------------------------------*/ diff --git a/libctgraphics/ezpol.cpp b/libctgraphics/ezpol.cpp index 54932f3..ff07991 100644 --- a/libctgraphics/ezpol.cpp +++ b/libctgraphics/ezpol.cpp @@ -1,8 +1,12 @@ /***************************************************************************** +** FILE IDENTIFICATION +** +** POL - Problem Oriented Language +** ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ezpol.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $ +** $Id: ezpol.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -17,22 +21,20 @@ ** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -/*----------------------------------------------------------------------*/ -/* POL - Problem Oriented Language */ /* */ /*----------------------------------------------------------------------*/ #include -#include "ascii.h" -#include "stdio.h" -#include "kstddef.h" -#include "ctype.h" +#include +#include +#include "ctsupport.h" #include "pol.h" -#define HASHSIZE 20 -/* Tables words stored with install() & found with lookup() */ +static const int HASHSIZE=20; + +/* Tables words stored with install() & found with lookup() */ static SYMBOL *skiptable[HASHSIZE]; /* words to ignore and skip */ static SYMBOL *cmdtable[HASHSIZE]; /* pol parameter commands */ static SYMBOL *usertable[HASHSIZE]; /* user defined symbols */ diff --git a/libctgraphics/ezset.cpp b/libctgraphics/ezset.cpp index b850f56..1bc08c8 100644 --- a/libctgraphics/ezset.cpp +++ b/libctgraphics/ezset.cpp @@ -1,8 +1,12 @@ /***************************************************************************** +** FILE IDENTIFICATION +** +** EZSET - Parameter control for EZPLOT +** ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ezset.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $ +** $Id: ezset.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -18,13 +22,12 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ /*----------------------------------------------------------------------*/ -/* EZSET - Parameter control for EZPLOT */ /* */ /*----------------------------------------------------------------------*/ +#include "ctsupport.h" #include "ezplot.h" #include "pol.h" -#include "cio.h" static int ezcmd (char *comm); static int do_cmd(int lx); diff --git a/libctgraphics/ezsupport.cpp b/libctgraphics/ezsupport.cpp index 51f9742..8945787 100644 --- a/libctgraphics/ezsupport.cpp +++ b/libctgraphics/ezsupport.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ezsupport.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $ +** $Id: ezsupport.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -20,7 +20,7 @@ #include #include -#include "kstddef.h" +#include "ctsupport.h" #include "ezplot.h" diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp index e3241a8..55d3c0e 100644 --- a/libctgraphics/sgp.cpp +++ b/libctgraphics/sgp.cpp @@ -1,28 +1,13 @@ /***************************************************************************** -** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg -** -** $Id: sgp.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $ -** $Log: sgp.cpp,v $ -** Revision 1.1 2000/06/19 18:05:03 kevin -** initial cvs import -** -** Revision 1.1 2000/06/13 16:20:31 kevin -** finished c++ conversions -** -** Revision 1.4 2000/05/24 22:49:01 kevin -** Updated SGP: first function X-windows version -** -** Revision 1.3 2000/05/11 14:07:23 kevin -** Fixed compilation warnings -** -** Revision 1.2 2000/05/08 20:08:15 kevin -** *** empty log message *** +** FILE IDENTIFICATION ** -** Revision 1.1.1.1 2000/04/28 13:02:44 kevin -** Initial CVS import for first public release +** Name: sgp.c Simple Graphics Package +** Programmer: Kevin Rosenberg ** +** This is part of the CTSim program +** Copyright (C) 1983-2000 Kevin Rosenberg ** +** $Id: sgp.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -38,19 +23,12 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -/*----------------------------------------------------------------------------- - * FILE IDENTIFICATION - * - * Name: sgp.c Simple Graphics Package - * Programmer: Kevin Rosenberg - * - *---------------------------------------------------------------------------*/ - -#include "stdio.h" -#include "kstddef.h" -#include "math.h" -#include "kmath.h" +#include +#include +#include "ctsupport.h" #include "sgp.h" + + static SGP_ID _sgp2_cwin = NULL; extern CHARSPEC cspec; diff --git a/libctgraphics/sgpdrive.cpp b/libctgraphics/sgpdrive.cpp index fad8475..09445ba 100644 --- a/libctgraphics/sgpdrive.cpp +++ b/libctgraphics/sgpdrive.cpp @@ -2,42 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: sgpdrive.cpp,v 1.2 2000/06/19 18:44:51 kevin Exp $ -** $Log: sgpdrive.cpp,v $ -** Revision 1.2 2000/06/19 18:44:51 kevin -** *** empty log message *** -** -** Revision 1.1 2000/06/19 18:05:03 kevin -** initial cvs import -** -** Revision 1.2 2000/06/15 19:07:10 kevin -** *** empty log message *** -** -** Revision 1.1 2000/06/13 16:20:31 kevin -** finished c++ conversions -** -** Revision 1.7 2000/06/03 06:29:22 kevin -** Finished g2 conditional compilation -** -** Revision 1.6 2000/05/24 22:49:01 kevin -** Updated SGP: first function X-windows version -** -** Revision 1.5 2000/05/11 14:07:23 kevin -** Fixed compilation warnings -** -** Revision 1.4 2000/05/08 20:08:15 kevin -** *** empty log message *** -** -** Revision 1.3 2000/04/28 18:35:23 kevin -** removed unused files -** -** Revision 1.2 2000/04/28 13:50:45 kevin -** Removed Makefile Makefile.in that are automatically generated by autoconf -** -** Revision 1.1.1.1 2000/04/28 13:02:44 kevin -** Initial CVS import for first public release -** -** +** $Id: sgpdrive.cpp,v 1.3 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -52,15 +17,15 @@ ** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ + /* Device Driver for IBM PC Kevin Rosenberg March 84 */ #include #include #include -#include "kstddef.h" +#include "ctsupport.h" #include "sgp.h" -#include "kmath.h" -#include "cio.h" + static int init_prt(void); static void term_prt(void); diff --git a/libctgraphics/sgptext.cpp b/libctgraphics/sgptext.cpp index a4cb1a3..9657a07 100644 --- a/libctgraphics/sgptext.cpp +++ b/libctgraphics/sgptext.cpp @@ -2,21 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: sgptext.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $ -** $Log: sgptext.cpp,v $ -** Revision 1.1 2000/06/19 18:05:03 kevin -** initial cvs import -** -** Revision 1.1 2000/06/13 16:20:31 kevin -** finished c++ conversions -** -** Revision 1.2 2000/04/28 18:35:23 kevin -** removed unused files -** -** Revision 1.1.1.1 2000/04/28 13:02:44 kevin -** Initial CVS import for first public release -** -** +** $Id: sgptext.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -31,14 +17,14 @@ ** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ + /* FILE * sgptext.c Text routines for graphics package */ -#include "kstddef.h" -#include "sgp.h" #include -#include "cio.h" +#include "ctsupport.h" +#include "sgp.h" /* Pixel patterns of marker symbols (1x1 to 5x5 matrix) */ diff --git a/libctsupport/audio.cpp b/libctsupport/audio.cpp index ad46a6d..2def9d2 100644 --- a/libctsupport/audio.cpp +++ b/libctsupport/audio.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: audio.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $ +** $Id: audio.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -25,7 +25,7 @@ * beep() */ -#include "cio.h" +#include "ctsupport.h" void cio_beep (void) { @@ -41,9 +41,6 @@ void cio_beep (void) * double length duration to play note in seconds */ -#include -#include "cio.h" - void cio_tone (double freq, double length) { diff --git a/libctsupport/byteorder.cpp b/libctsupport/byteorder.cpp index f7734fa..6a2ddc9 100644 --- a/libctsupport/byteorder.cpp +++ b/libctsupport/byteorder.cpp @@ -6,9 +6,10 @@ #include #endif -#include "kstddef.h" +#include "ctsupport.h" #include "byteorder.h" + inline void SwapBytes2 (void* buffer) { diff --git a/libctsupport/clip.cpp b/libctsupport/clip.cpp index 4aa6f01..9c2abbc 100644 --- a/libctsupport/clip.cpp +++ b/libctsupport/clip.cpp @@ -14,7 +14,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: clip.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $ +** $Id: clip.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -30,8 +30,7 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -#include "kstddef.h" -#include "kmath.h" +#include "ctsupport.h" /* NAME diff --git a/libctsupport/consoleio.cpp b/libctsupport/consoleio.cpp index 93d3160..bc6df45 100644 --- a/libctsupport/consoleio.cpp +++ b/libctsupport/consoleio.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: consoleio.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $ +** $Id: consoleio.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -20,10 +20,7 @@ #include #include -#include "cio.h" -#include "kstddef.h" -#include "cio.h" - +#include "ctsupport.h" /* NAME diff --git a/libctsupport/filefuncs.cpp b/libctsupport/filefuncs.cpp index 100960a..511251d 100644 --- a/libctsupport/filefuncs.cpp +++ b/libctsupport/filefuncs.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: filefuncs.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $ +** $Id: filefuncs.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** Revision 1.1.1.1 2000/04/28 13:02:44 kevin ** Initial CVS import for first public release @@ -26,9 +26,7 @@ #include #include #include -#include "kstddef.h" -#include "cio.h" - +#include "ctsupport.h" const char* diff --git a/libctsupport/normangle.cpp b/libctsupport/normangle.cpp index b04ee93..1263801 100644 --- a/libctsupport/normangle.cpp +++ b/libctsupport/normangle.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: normangle.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $ +** $Id: normangle.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -18,7 +18,7 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -#include "kmath.h" +#include "ctsupport.h" /* NAME diff --git a/libctsupport/simpson.cpp b/libctsupport/simpson.cpp index 234e062..e7a5270 100644 --- a/libctsupport/simpson.cpp +++ b/libctsupport/simpson.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: simpson.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $ +** $Id: simpson.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -18,7 +18,7 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -#include "kmath.h" +#include "ctsupport.h" /* NAME diff --git a/libctsupport/strfuncs.cpp b/libctsupport/strfuncs.cpp index 21dabb5..414faea 100644 --- a/libctsupport/strfuncs.cpp +++ b/libctsupport/strfuncs.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: strfuncs.cpp,v 1.2 2000/06/19 18:16:44 kevin Exp $ +** $Id: strfuncs.cpp,v 1.3 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -19,7 +19,7 @@ ******************************************************************************/ #include -#include "kstddef.h" +#include "ctsupport.h" /* NAME diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp index b5981b1..28ccba4 100644 --- a/libctsupport/syserror.cpp +++ b/libctsupport/syserror.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: syserror.cpp,v 1.2 2000/06/19 17:58:20 kevin Exp $ +** $Id: syserror.cpp,v 1.3 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -23,8 +23,7 @@ #include #include #include -#include "kstddef.h" -#include "cio.h" +#include "ctsupport.h" /* NAME diff --git a/libctsupport/timedate.cpp b/libctsupport/timedate.cpp index 0b920e0..458066f 100644 --- a/libctsupport/timedate.cpp +++ b/libctsupport/timedate.cpp @@ -2,30 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: timedate.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $ -** $Log: timedate.cpp,v $ -** Revision 1.1 2000/06/19 02:58:08 kevin -** *** empty log message *** -** -** Revision 1.1 2000/06/13 16:20:31 kevin -** finished c++ conversions -** -** Revision 1.5 2000/06/05 01:33:11 kevin -** *** empty log message *** -** -** Revision 1.4 2000/05/11 01:05:51 kevin -** Changed sprintf to snprintf, changed index to strchr -** -** Revision 1.3 2000/04/28 18:00:55 kevin -** remove unused files -** -** Revision 1.2 2000/04/28 17:38:26 kevin -** Removed unused files -** -** Revision 1.1.1.1 2000/04/28 13:02:44 kevin -** Initial CVS import for first public release -** -** +** $Id: timedate.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -46,8 +23,9 @@ /*----------------------------------------------------------------------*/ #include -#include "kstddef.h" #include +#include "ctsupport.h" + /* NAME * td_get_time Return time of day diff --git a/libctsupport/xform.cpp b/libctsupport/xform.cpp index 8d58f76..abf4750 100644 --- a/libctsupport/xform.cpp +++ b/libctsupport/xform.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: xform.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $ +** $Id: xform.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -18,7 +18,8 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -#include "kmath.h" +#include "ctsupport.h" + /* NAME * rotate2d Rotates an array of 2 dimensional vectors -- 2.34.1