From 6608d626098f2df532c7423fc0043a51864d18ec Mon Sep 17 00:00:00 2001
From: joye <joye>
Date: Fri, 27 Jun 2014 18:18:19 +0000
Subject: *** empty log message ***

---
 src/bltGrAxis.h     | 11 +++++++----
 src/bltGrElem.h     | 11 +++++++----
 src/bltGrElemBar.h  | 10 +++++-----
 src/bltGrElemLine.h | 14 +++++++-------
 src/bltGrLegd.h     |  2 +-
 src/bltGrMarker.h   |  2 +-
 src/bltGrPSOutput.h |  6 +++---
 src/bltGrText.h     |  2 +-
 src/bltGraph.h      | 24 ++++++++++++------------
 9 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/bltGrAxis.h b/src/bltGrAxis.h
index 24e90c8..8f0c38e 100644
--- a/src/bltGrAxis.h
+++ b/src/bltGrAxis.h
@@ -40,7 +40,10 @@ extern "C" {
 };
 
 class Graph;
-class Postscript;
+
+namespace Blt {
+  class Postscript;
+};
 
 #include "bltGrMisc.h"
 #include "bltGrText.h"
@@ -227,9 +230,9 @@ class Axis {
   void draw(Drawable);
   void drawGrids(Drawable);
   void drawLimits(Drawable);
-  void print(PSOutput*);
-  void printGrids(PSOutput*);
-  void printLimits(PSOutput*);
+  void print(Blt::PSOutput*);
+  void printGrids(Blt::PSOutput*);
+  void printLimits(Blt::PSOutput*);
 
   void mapStacked(int, int);
   void mapGridlines();
diff --git a/src/bltGrElem.h b/src/bltGrElem.h
index 74b273c..03a17e1 100644
--- a/src/bltGrElem.h
+++ b/src/bltGrElem.h
@@ -40,7 +40,10 @@ extern "C" {
 class Axis;
 class Element;
 class Pen;
-class Postscript;
+
+namespace Blt {
+  class Postscript;
+};
 
 #include "bltGrMisc.h"
 #include "bltGrPen.h"
@@ -152,9 +155,9 @@ class Element {
   virtual void drawActive(Drawable) =0;
   virtual void drawSymbol(Drawable, int, int, int) =0;
   virtual void closest() =0;
-  virtual void print(PSOutput*) =0;
-  virtual void printActive(PSOutput*) =0;
-  virtual void printSymbol(PSOutput*, double, double, int) =0;
+  virtual void print(Blt::PSOutput*) =0;
+  virtual void printActive(Blt::PSOutput*) =0;
+  virtual void printSymbol(Blt::PSOutput*, double, double, int) =0;
 
   virtual ClassId classId() =0;
   virtual const char* className() =0;
diff --git a/src/bltGrElemBar.h b/src/bltGrElemBar.h
index fa2c495..cda696c 100644
--- a/src/bltGrElemBar.h
+++ b/src/bltGrElemBar.h
@@ -104,8 +104,8 @@ class BarElement : public Element {
   void mapErrorBars(BarStyle**);
   void drawSegments(Drawable, BarPen*, XRectangle*, int);
   void drawValues(Drawable, BarPen*, XRectangle*, int, int*);
-  void printSegments(PSOutput*, BarPen*, XRectangle*, int);
-  void printValues(PSOutput*, BarPen*, XRectangle*, int, int*);
+  void printSegments(Blt::PSOutput*, BarPen*, XRectangle*, int);
+  void printValues(Blt::PSOutput*, BarPen*, XRectangle*, int, int*);
 
  public:
   BarElement(Graph*, const char*, Tcl_HashEntry*);
@@ -122,9 +122,9 @@ class BarElement : public Element {
   void draw(Drawable);
   void drawActive(Drawable);
   void drawSymbol(Drawable, int, int, int);
-  void print(PSOutput*);
-  void printActive(PSOutput*);
-  void printSymbol(PSOutput*, double, double, int);
+  void print(Blt::PSOutput*);
+  void printActive(Blt::PSOutput*);
+  void printSymbol(Blt::PSOutput*, double, double, int);
 };
 
 #endif
diff --git a/src/bltGrElemLine.h b/src/bltGrElemLine.h
index 4db6137..37075ca 100644
--- a/src/bltGrElemLine.h
+++ b/src/bltGrElemLine.h
@@ -142,10 +142,10 @@ class LineElement : public Element {
   void drawSymbols(Drawable, LinePen*, int, int, Point2d*);
   void drawTraces(Drawable, LinePen*);
   void drawValues(Drawable, LinePen*, int, Point2d*, int*);
-  void setLineAttributes(PSOutput*, LinePen*);
-  void printTraces(PSOutput*, LinePen*);
-  void printValues(PSOutput*, LinePen*, int, Point2d*, int*);
-  void printSymbols(PSOutput*, LinePen*, int, int, Point2d*);
+  void setLineAttributes(Blt::PSOutput*, LinePen*);
+  void printTraces(Blt::PSOutput*, LinePen*);
+  void printValues(Blt::PSOutput*, LinePen*, int, Point2d*, int*);
+  void printSymbols(Blt::PSOutput*, LinePen*, int, int, Point2d*);
   double distanceToLine(int, int, Point2d*, Point2d*, Point2d*);
   double distanceToX(int, int, Point2d*, Point2d*, Point2d*);
   double distanceToY(int, int, Point2d*, Point2d*, Point2d*);
@@ -167,9 +167,9 @@ class LineElement : public Element {
   void draw(Drawable);
   void drawActive(Drawable);
   void drawSymbol(Drawable, int, int, int);
-  void print(PSOutput*);
-  void printActive(PSOutput*);
-  void printSymbol(PSOutput*, double, double, int);
+  void print(Blt::PSOutput*);
+  void printActive(Blt::PSOutput*);
+  void printSymbol(Blt::PSOutput*, double, double, int);
 };
 
 #endif
diff --git a/src/bltGrLegd.h b/src/bltGrLegd.h
index be48fb1..9dee8cb 100644
--- a/src/bltGrLegd.h
+++ b/src/bltGrLegd.h
@@ -151,7 +151,7 @@ class Legend : public Pick {
   int configure();
   void map(int, int);
   void draw(Drawable drawable);
-  void print(PSOutput* ps);
+  void print(Blt::PSOutput* ps);
   void eventuallyInvokeSelectCmd();
 
   void removeElement(Element*);
diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h
index 5b01579..77902ac 100644
--- a/src/bltGrMarker.h
+++ b/src/bltGrMarker.h
@@ -38,12 +38,12 @@ extern "C" {
 
 class Graph;
 class Axis;
-class Postscript;
 
 #include "bltGrMisc.h"
 #include "bltGrPSOutput.h"
 
 namespace Blt {
+  class Postscript;
 
   typedef struct {
     Point2d* points;
diff --git a/src/bltGrPSOutput.h b/src/bltGrPSOutput.h
index 1e629b2..a3e652f 100644
--- a/src/bltGrPSOutput.h
+++ b/src/bltGrPSOutput.h
@@ -27,17 +27,17 @@
  *	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _BLT_PS_H
-#define _BLT_PS_H
+#ifndef _BLT_PSOUTPUT_H
+#define _BLT_PSOUTPUT_H
 
 #include <tk.h>
 
 #define POSTSCRIPT_BUFSIZ ((BUFSIZ*2)-1)
 
 class Graph;
-class Postscript;
 
 namespace Blt {
+  class Postscript;
 
   class PSOutput {
   protected:
diff --git a/src/bltGrText.h b/src/bltGrText.h
index 090cf5f..851cc63 100644
--- a/src/bltGrText.h
+++ b/src/bltGrText.h
@@ -35,9 +35,9 @@
 #include "bltGrMisc.h"
 
 class Graph;
-class PSOutput;
 
 namespace Blt {
+  class PSOutput;
 
   typedef struct {
     Tk_Anchor anchor;
diff --git a/src/bltGraph.h b/src/bltGraph.h
index 8a1de1b..d13c890 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -46,8 +46,6 @@ class Axis;
 class Element;
 class Legend;
 class Pen;
-class Postscript;
-class PSOutput;
 
 class Pick {
  public:
@@ -55,7 +53,9 @@ class Pick {
 };
 
 namespace Blt {
-class Marker;
+  class Marker;
+  class Postscript;
+  class PSOutput;
 };
 
 typedef struct Ensemble {
@@ -150,7 +150,7 @@ class Graph : public Pick {
 
   Legend* legend_;
   Crosshairs* crosshairs_;
-  Postscript* postscript_;
+  Blt::Postscript* postscript_;
 
   int inset_;
   short int titleX_;
@@ -180,7 +180,7 @@ class Graph : public Pick {
   void layoutGraph();
   
   void drawMargins(Drawable);
-  void printMargins(PSOutput*);
+  void printMargins(Blt::PSOutput*);
   int getMarginGeometry(Margin*);
 
   void destroyPens();
@@ -190,14 +190,14 @@ class Graph : public Pick {
   virtual void mapElements();
   void drawElements(Drawable);
   void drawActiveElements(Drawable);
-  void printElements(PSOutput*);
-  void printActiveElements(PSOutput*);
+  void printElements(Blt::PSOutput*);
+  void printActiveElements(Blt::PSOutput*);
 
   void destroyMarkers();
   void configureMarkers();
   void mapMarkers();
   void drawMarkers(Drawable, int);
-  void printMarkers(PSOutput*, int);
+  void printMarkers(Blt::PSOutput*, int);
 
   int createAxes();
   void destroyAxes();
@@ -216,15 +216,15 @@ class Graph : public Pick {
   void map();
   void draw();
   void eventuallyRedraw();
-  int print(const char*, PSOutput*);
+  int print(const char*, Blt::PSOutput*);
   void extents(Region2d*);
   int invoke(const Ensemble*, int, int, Tcl_Obj* const []);
   void reconfigure();
 
   int createAxis(int, Tcl_Obj* const []);
-  void printAxes(PSOutput*);
-  void printAxesGrids(PSOutput*);
-  void printAxesLimits(PSOutput*);
+  void printAxes(Blt::PSOutput*);
+  void printAxesGrids(Blt::PSOutput*);
+  void printAxesLimits(Blt::PSOutput*);
   int getAxis(Tcl_Obj*, Axis**);
   ClientData axisTag(const char*);
   Point2d map2D(double, double, Axis*, Axis*);
-- 
cgit v0.12