diff options
| author | joye <joye> | 2014-03-31 19:48:42 (GMT) |
|---|---|---|
| committer | joye <joye> | 2014-03-31 19:48:42 (GMT) |
| commit | ed75dcb750c53a4df7291c74efe4c553e81a17aa (patch) | |
| tree | e5d4c4f51b4825b84478e139f6d3ed485f5603fd | |
| parent | 74de515e0daa1561923ae9271af40b4fb308f0a0 (diff) | |
| download | blt-ed75dcb750c53a4df7291c74efe4c553e81a17aa.zip blt-ed75dcb750c53a4df7291c74efe4c553e81a17aa.tar.gz blt-ed75dcb750c53a4df7291c74efe4c553e81a17aa.tar.bz2 | |
*** empty log message ***
| -rw-r--r-- | src/bltGrElem.h | 2 | ||||
| -rw-r--r-- | src/bltGrElemBar.C | 9 | ||||
| -rw-r--r-- | src/bltGrElemLine.C | 12 | ||||
| -rw-r--r-- | src/bltGrElemLine.h | 6 | ||||
| -rw-r--r-- | src/bltGrElemOp.h | 2 | ||||
| -rw-r--r-- | src/bltGrLegd.C | 1 |
6 files changed, 4 insertions, 28 deletions
diff --git a/src/bltGrElem.h b/src/bltGrElem.h index f9840b2..8d0c26f 100644 --- a/src/bltGrElem.h +++ b/src/bltGrElem.h @@ -30,8 +30,6 @@ #ifndef __bltgrelem_h__ #define __bltgrelem_h__ -#include "bltGrElemOp.h" - #include <iostream> #include <sstream> #include <iomanip> diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C index 8a323a1..e187549 100644 --- a/src/bltGrElemBar.C +++ b/src/bltGrElemBar.C @@ -27,21 +27,14 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <X11/Xlib.h> -#include <X11/Xutil.h> - -#include "bltC.h" #include "bltMath.h" extern "C" { -#include "bltInt.h" #include "bltGraph.h" }; -#include "bltGrElemOption.h" #include "bltGrElemBar.h" -#include "bltGrPenOp.h" -#include "bltConfig.h" +#include "bltGrElemOption.h" #define CLAMP(x,l,h) ((x) = (((x)<(l))? (l) : ((x)>(h)) ? (h) : (x))) diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index 7903af6..2755286 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -27,23 +27,15 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <X11/Xlib.h> -#include <X11/Xutil.h> - -#include "bltC.h" #include "bltMath.h" extern "C" { -#include "bltInt.h" -#include "bltSpline.h" #include "bltGraph.h" +#include "bltSpline.h" } -#include "bltGrElemOption.h" #include "bltGrElemLine.h" -#include "bltGrPenLine.h" -#include "bltGrPenOp.h" -#include "bltConfig.h" +#include "bltGrElemOption.h" #define SEARCH_X 0 #define SEARCH_Y 1 diff --git a/src/bltGrElemLine.h b/src/bltGrElemLine.h index 188afbd..d264d13 100644 --- a/src/bltGrElemLine.h +++ b/src/bltGrElemLine.h @@ -30,15 +30,9 @@ #ifndef __bltgrelemline_h__ #define __bltgrelemline_h__ -#include "bltGrElemOp.h" #include "bltGrElem.h" #include "bltGrPenLine.h" -#include <iostream> -#include <sstream> -#include <iomanip> -using namespace std; - typedef enum { PEN_SMOOTH_LINEAR, PEN_SMOOTH_STEP, PEN_SMOOTH_NATURAL, PEN_SMOOTH_QUADRATIC, PEN_SMOOTH_CATROM diff --git a/src/bltGrElemOp.h b/src/bltGrElemOp.h index b20fb5e..3b00e87 100644 --- a/src/bltGrElemOp.h +++ b/src/bltGrElemOp.h @@ -30,8 +30,6 @@ #ifndef __bltgrelemop_h__ #define __bltgrelemop_h__ - - extern int Blt_GetElement(Tcl_Interp* interp, Graph *graphPtr, Tcl_Obj *objPtr, Element **elemPtrPtr); #endif diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C index 946fc58..e881a3c 100644 --- a/src/bltGrLegd.C +++ b/src/bltGrLegd.C @@ -41,6 +41,7 @@ extern "C" { #include "bltConfig.h" #include "bltGrElem.h" +#include "bltGrElemOp.h" /* * Selection related flags: |