Replace LString.h with support/std_string.h,

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

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index cbe41393303b03f93522eb263919924af0d35318..9759643ccbaaa09003859d01f7a90d0f291bcf13 100644 (file)
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -1,25 +1,25 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsParams.h
- *  Copyright 2002 the LyX Team
- *  Read the file COPYING
+ * \file GraphicsParams.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming
  *
- *  Used internally by the GraphicsCache.
+ * Full author contact details are available in file CREDITS.
+ *
+ * Used internally by the lyx::graphics::Image.
  */
 
 #ifndef GRAPHICSPARAMS_H
 #define GRAPHICSPARAMS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "LString.h"
+#include "GraphicsTypes.h"
+#include "support/std_string.h"
 
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
 
 /** Parse a string of the form "200pt 500pt 300mm 5in" into a
  *  usable bounding box.
@@ -33,29 +33,21 @@ struct BoundingBox {
        /// 0 0 0 0 is empty!
        bool empty() const;
 
-       int xl;
-       int yb;
-       int xr;
-       int yt;
+       unsigned int xl;
+       unsigned int yb;
+       unsigned int xr;
+       unsigned int yt;
 };
 
 bool operator==(BoundingBox const &, BoundingBox const &);
 bool operator!=(BoundingBox const &, BoundingBox const &);
 
-struct GParams
+struct Params
 {
-       GParams();
-
-       /// How is the image to be displayed on the LyX screen?
-       enum DisplayType {
-               COLOR,
-               GRAYSCALE,
-               MONOCHROME,
-               /// We aren't going to display it at all!
-               NONE
-       };
+       Params();
 
        DisplayType display;
+       unsigned int scale;
 
        /// The image filename.
        string filename;
@@ -69,17 +61,14 @@ struct GParams
        /** The size of the view inside lyx in pixels or the scaling of the
         *  image.
         */
-       unsigned int width;
-       unsigned int height;
-       unsigned int scale;
-
        /// Rotation angle.
-       int angle;
+       float angle;
 };
 
-bool operator==(GParams const &, GParams const &);
-bool operator!=(GParams const &, GParams const &);
+bool operator==(Params const &, Params const &);
+bool operator!=(Params const &, Params const &);
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSPARAMS_H