add <string> and other small fixes to make

[lyx.git] / src / graphics / GraphicsParams.h

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index 6da48f884389d8342a29fdcd0f482c6414ff3674..678566e2bdc387bd679746df286ed992cf7c7bc3 100644 (file)
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -15,7 +15,9 @@
 #define GRAPHICSPARAMS_H
 
 #include "GraphicsTypes.h"
-#include "support/std_string.h"
+
+#include <string>
+#include <iosfwd>
 
 
 namespace lyx {
@@ -28,14 +30,11 @@ struct BoundingBox {
        ///
        BoundingBox();
        ///
-       BoundingBox(string const &);
+       BoundingBox(std::string const &);
 
        /// 0 0 0 0 is empty!
        bool empty() const;
 
-       /// The bounding box as "xl yb xr yr"
-       string const asString() const;
-
        unsigned int xl;
        unsigned int yb;
        unsigned int xr;
@@ -45,6 +44,9 @@ struct BoundingBox {
 bool operator==(BoundingBox const &, BoundingBox const &);
 bool operator!=(BoundingBox const &, BoundingBox const &);
 
+std::ostream & operator<<(std::ostream &, BoundingBox const &);
+
+
 struct Params
 {
        Params();
@@ -53,7 +55,7 @@ struct Params
        unsigned int scale;
 
        /// The image filename.
-       string filename;
+       std::string filename;
 
        /** Note that the BoundingBox is always relative to the BoundingBox
         *  as stored in the EPS file.