GNOME.org
 

[librsvg] Rename state.rs to properties.rs

commit 20d6e8e9fba8ccd1db1e876df305cdb2060c00a1
Author: Paolo Borelli <pborelli gnome org>
Date:   Fri Jan 18 16:59:14 2019 +0100

    Rename state.rs to properties.rs

 Makefile.am                                    | 2 +-
 rsvg_internals/src/css.rs                      | 2 +-
 rsvg_internals/src/drawing_ctx.rs              | 4 ++--
 rsvg_internals/src/filters/context.rs          | 2 +-
 rsvg_internals/src/filters/light/lighting.rs   | 2 +-
 rsvg_internals/src/filters/mod.rs              | 2 +-
 rsvg_internals/src/filters/turbulence.rs       | 2 +-
 rsvg_internals/src/font_props.rs               | 2 +-
 rsvg_internals/src/gradient.rs                 | 2 +-
 rsvg_internals/src/length.rs                   | 2 +-
 rsvg_internals/src/lib.rs                      | 2 +-
 rsvg_internals/src/marker.rs                   | 2 +-
 rsvg_internals/src/mask.rs                     | 2 +-
 rsvg_internals/src/node.rs                     | 2 +-
 rsvg_internals/src/paint_server.rs             | 2 +-
 rsvg_internals/src/pattern.rs                  | 2 +-
 rsvg_internals/src/{state.rs => properties.rs} | 0
 rsvg_internals/src/shapes.rs                   | 2 +-
 rsvg_internals/src/structure.rs                | 2 +-
 rsvg_internals/src/svg.rs                      | 2 +-
 rsvg_internals/src/text.rs                     | 6 +++---
 rsvg_internals/src/viewport.rs                 | 2 +-
 22 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index db9309fa..eed1e64b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,6 +94,7 @@ RUST_SRC =                                                    \
        rsvg_internals/src/path_parser.rs                       \
        rsvg_internals/src/pattern.rs                           \
        rsvg_internals/src/pixbuf_utils.rs                      \
+       rsvg_internals/src/properties.rs                        \
        rsvg_internals/src/property_bag.rs                      \
        rsvg_internals/src/property_macros.rs                   \
        rsvg_internals/src/rect.rs                              \
@@ -103,7 +104,6 @@ RUST_SRC =                                                  \
        rsvg_internals/src/surface_utils/shared_surface.rs      \
        rsvg_internals/src/space.rs                             \
        rsvg_internals/src/srgb.rs                              \
-       rsvg_internals/src/state.rs                             \
        rsvg_internals/src/stop.rs                              \
        rsvg_internals/src/structure.rs                         \
        rsvg_internals/src/style.rs                             \
diff --git a/rsvg_internals/src/css.rs b/rsvg_internals/src/css.rs
index 48b21ab3..dfa09da9 100644
--- a/rsvg_internals/src/css.rs
+++ b/rsvg_internals/src/css.rs
@@ -14,7 +14,7 @@ use attributes::Attribute;
 use croco::*;
 use error::LoadingError;
 use io::{self, BinaryData};
-use state::SpecifiedValues;
+use properties::SpecifiedValues;
 use util::utf8_cstr;
 
 struct Declaration {
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index 45084ffc..03c01f56 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -18,8 +18,7 @@ use mask::NodeMask;
 use node::{CascadedValues, NodeType, RsvgNode};
 use paint_server::{PaintServer, PaintSource};
 use pattern::NodePattern;
-use rect::RectangleExt;
-use state::{
+use properties::{
     ClipRule,
     ComputedValues,
     EnableBackground,
@@ -29,6 +28,7 @@ use state::{
     StrokeLinecap,
     StrokeLinejoin,
 };
+use rect::RectangleExt;
 use surface_utils::shared_surface::SharedImageSurface;
 use svg::Svg;
 use unit_interval::UnitInterval;
diff --git a/rsvg_internals/src/filters/context.rs b/rsvg_internals/src/filters/context.rs
index 4231b42d..92e8479b 100644
--- a/rsvg_internals/src/filters/context.rs
+++ b/rsvg_internals/src/filters/context.rs
@@ -10,8 +10,8 @@ use drawing_ctx::DrawingCtx;
 use length::Length;
 use node::RsvgNode;
 use paint_server::PaintServer;
+use properties::ComputedValues;
 use rect::IRect;
-use state::ComputedValues;
 use surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
 use unit_interval::UnitInterval;
 
diff --git a/rsvg_internals/src/filters/light/lighting.rs b/rsvg_internals/src/filters/light/lighting.rs
index d3580d2c..e5f664a4 100644
--- a/rsvg_internals/src/filters/light/lighting.rs
+++ b/rsvg_internals/src/filters/light/lighting.rs
@@ -31,8 +31,8 @@ use filters::{
 };
 use node::{NodeResult, NodeTrait, NodeType, RsvgNode};
 use parsers;
+use properties::ColorInterpolationFilters;
 use property_bag::PropertyBag;
-use state::ColorInterpolationFilters;
 use surface_utils::{
     shared_surface::{SharedImageSurface, SurfaceType},
     ImageSurfaceDataExt,
diff --git a/rsvg_internals/src/filters/mod.rs b/rsvg_internals/src/filters/mod.rs
index f8633107..9420ab34 100644
--- a/rsvg_internals/src/filters/mod.rs
+++ b/rsvg_internals/src/filters/mod.rs
@@ -12,8 +12,8 @@ use error::{RenderingError, ValueErrorKind};
 use length::{Length, LengthDir, LengthUnit};
 use node::{NodeResult, NodeTrait, NodeType, RsvgNode};
 use parsers::{ParseError, ParseValue};
+use properties::{ColorInterpolationFilters, ComputedValues};
 use property_bag::PropertyBag;
-use state::{ColorInterpolationFilters, ComputedValues};
 use surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
 
 mod bounds;
diff --git a/rsvg_internals/src/filters/turbulence.rs b/rsvg_internals/src/filters/turbulence.rs
index 622a2f51..30ac712b 100644
--- a/rsvg_internals/src/filters/turbulence.rs
+++ b/rsvg_internals/src/filters/turbulence.rs
@@ -7,8 +7,8 @@ use drawing_ctx::DrawingCtx;
 use error::NodeError;
 use node::{NodeResult, NodeTrait, RsvgNode};
 use parsers::{self, ParseError};
+use properties::ColorInterpolationFilters;
 use property_bag::PropertyBag;
-use state::ColorInterpolationFilters;
 use surface_utils::{
     shared_surface::{SharedImageSurface, SurfaceType},
     ImageSurfaceDataExt,
diff --git a/rsvg_internals/src/font_props.rs b/rsvg_internals/src/font_props.rs
index 317bd83b..ac9b5847 100644
--- a/rsvg_internals/src/font_props.rs
+++ b/rsvg_internals/src/font_props.rs
@@ -4,7 +4,7 @@ use drawing_ctx::ViewParams;
 use error::*;
 use length::{Length, LengthDir, LengthUnit, POINTS_PER_INCH};
 use parsers::{Parse, ParseError};
-use state::ComputedValues;
+use properties::ComputedValues;
 
 // https://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#propdef-font-size
 #[derive(Debug, Copy, Clone, PartialEq)]
diff --git a/rsvg_internals/src/gradient.rs b/rsvg_internals/src/gradient.rs
index 507ffac2..2edd2ae6 100644
--- a/rsvg_internals/src/gradient.rs
+++ b/rsvg_internals/src/gradient.rs
@@ -13,9 +13,9 @@ use length::*;
 use node::*;
 use paint_server::PaintSource;
 use parsers::{Parse, ParseError, ParseValue};
+use properties::{ComputedValues, StopColor};
 use property_bag::PropertyBag;
 use rect::RectangleExt;
-use state::{ComputedValues, StopColor};
 use stop::*;
 use unit_interval::UnitInterval;
 
diff --git a/rsvg_internals/src/length.rs b/rsvg_internals/src/length.rs
index d9caaf2d..5dd5b65a 100644
--- a/rsvg_internals/src/length.rs
+++ b/rsvg_internals/src/length.rs
@@ -5,7 +5,7 @@ use drawing_ctx::ViewParams;
 use error::*;
 use parsers::Parse;
 use parsers::ParseError;
-use state::ComputedValues;
+use properties::ComputedValues;
 
 #[derive(Debug, PartialEq, Copy, Clone)]
 pub enum LengthUnit {
diff --git a/rsvg_internals/src/lib.rs b/rsvg_internals/src/lib.rs
index fdafca77..4a976cf4 100644
--- a/rsvg_internals/src/lib.rs
+++ b/rsvg_internals/src/lib.rs
@@ -124,12 +124,12 @@ mod path_builder;
 mod path_parser;
 mod pattern;
 mod pixbuf_utils;
+mod properties;
 mod property_bag;
 mod rect;
 mod shapes;
 mod space;
 pub mod srgb;
-mod state;
 mod stop;
 mod structure;
 mod style;
diff --git a/rsvg_internals/src/marker.rs b/rsvg_internals/src/marker.rs
index 209ecbac..aeeccd63 100644
--- a/rsvg_internals/src/marker.rs
+++ b/rsvg_internals/src/marker.rs
@@ -17,8 +17,8 @@ use length::{Length, LengthDir};
 use node::*;
 use parsers::{Parse, ParseError, ParseValue};
 use path_builder::*;
+use properties::{ComputedValues, SpecifiedValue, SpecifiedValues};
 use property_bag::PropertyBag;
-use state::{ComputedValues, SpecifiedValue, SpecifiedValues};
 use viewbox::*;
 
 // markerUnits attribute: https://www.w3.org/TR/SVG/painting.html#MarkerElement
diff --git a/rsvg_internals/src/mask.rs b/rsvg_internals/src/mask.rs
index 726e49e3..6ea3d62a 100644
--- a/rsvg_internals/src/mask.rs
+++ b/rsvg_internals/src/mask.rs
@@ -8,9 +8,9 @@ use error::RenderingError;
 use length::{Length, LengthDir};
 use node::{NodeResult, NodeTrait, RsvgNode};
 use parsers::{Parse, ParseValue};
+use properties::Opacity;
 use property_bag::PropertyBag;
 use rect::IRect;
-use state::Opacity;
 use surface_utils::{
     iterators::Pixels,
     shared_surface::SharedImageSurface,
diff --git a/rsvg_internals/src/node.rs b/rsvg_internals/src/node.rs
index 084b6716..8378cd20 100644
--- a/rsvg_internals/src/node.rs
+++ b/rsvg_internals/src/node.rs
@@ -10,8 +10,8 @@ use css::CssStyles;
 use drawing_ctx::DrawingCtx;
 use error::*;
 use parsers::Parse;
+use properties::{ComputedValues, Overflow, SpecifiedValue, SpecifiedValues};
 use property_bag::PropertyBag;
-use state::{ComputedValues, Overflow, SpecifiedValue, SpecifiedValues};
 use tree_utils;
 
 // A *const RsvgNode is just a pointer for the C code's benefit: it
diff --git a/rsvg_internals/src/paint_server.rs b/rsvg_internals/src/paint_server.rs
index ebef8d77..63141d91 100644
--- a/rsvg_internals/src/paint_server.rs
+++ b/rsvg_internals/src/paint_server.rs
@@ -6,7 +6,7 @@ use drawing_ctx::DrawingCtx;
 use error::*;
 use node::RsvgNode;
 use parsers::Parse;
-use state::ComputedValues;
+use properties::ComputedValues;
 use unit_interval::UnitInterval;
 
 #[derive(Debug, Clone, PartialEq)]
diff --git a/rsvg_internals/src/pattern.rs b/rsvg_internals/src/pattern.rs
index 729db60c..a2030193 100644
--- a/rsvg_internals/src/pattern.rs
+++ b/rsvg_internals/src/pattern.rs
@@ -17,8 +17,8 @@ use length::*;
 use node::*;
 use paint_server::PaintSource;
 use parsers::ParseValue;
+use properties::ComputedValues;
 use property_bag::PropertyBag;
-use state::ComputedValues;
 use unit_interval::UnitInterval;
 use viewbox::*;
 
diff --git a/rsvg_internals/src/state.rs b/rsvg_internals/src/properties.rs
similarity index 100%
rename from rsvg_internals/src/state.rs
rename to rsvg_internals/src/properties.rs
diff --git a/rsvg_internals/src/shapes.rs b/rsvg_internals/src/shapes.rs
index 759565f6..9ce4c9d6 100644
--- a/rsvg_internals/src/shapes.rs
+++ b/rsvg_internals/src/shapes.rs
@@ -13,8 +13,8 @@ use node::*;
 use parsers::{CssParserExt, Parse, ParseValue};
 use path_builder::*;
 use path_parser;
+use properties::ComputedValues;
 use property_bag::PropertyBag;
-use state::ComputedValues;
 
 fn render_path_builder(
     builder: &PathBuilder,
diff --git a/rsvg_internals/src/structure.rs b/rsvg_internals/src/structure.rs
index a9044d5b..71eb5d41 100644
--- a/rsvg_internals/src/structure.rs
+++ b/rsvg_internals/src/structure.rs
@@ -12,8 +12,8 @@ use float_eq_cairo::ApproxEqCairo;
 use length::*;
 use node::*;
 use parsers::{Parse, ParseValue};
+use properties::Overflow;
 use property_bag::{OwnedPropertyBag, PropertyBag};
-use state::Overflow;
 use viewbox::*;
 use viewport::{draw_in_viewport, ClipMode};
 
diff --git a/rsvg_internals/src/svg.rs b/rsvg_internals/src/svg.rs
index a9a3151e..dc75d9d5 100644
--- a/rsvg_internals/src/svg.rs
+++ b/rsvg_internals/src/svg.rs
@@ -12,7 +12,7 @@ use error::LoadingError;
 use handle::LoadOptions;
 use io;
 use node::RsvgNode;
-use state::ComputedValues;
+use properties::ComputedValues;
 use surface_utils::shared_surface::SharedImageSurface;
 use xml::XmlState;
 use xml2_load::xml_state_load_from_possibly_compressed_stream;
diff --git a/rsvg_internals/src/text.rs b/rsvg_internals/src/text.rs
index 74466b6c..002c122c 100644
--- a/rsvg_internals/src/text.rs
+++ b/rsvg_internals/src/text.rs
@@ -14,9 +14,7 @@ use font_props::FontWeightSpec;
 use length::*;
 use node::{CascadedValues, NodeResult, NodeTrait, NodeType, RsvgNode};
 use parsers::ParseValue;
-use property_bag::PropertyBag;
-use space::{xml_space_normalize, NormalizeDefault, XmlSpaceNormalize};
-use state::{
+use properties::{
     ComputedValues,
     Direction,
     FontStretch,
@@ -29,6 +27,8 @@ use state::{
     XmlLang,
     XmlSpace,
 };
+use property_bag::PropertyBag;
+use space::{xml_space_normalize, NormalizeDefault, XmlSpaceNormalize};
 
 /// An absolutely-positioned array of `Span`s
 ///
diff --git a/rsvg_internals/src/viewport.rs b/rsvg_internals/src/viewport.rs
index 9d617eba..b5753247 100644
--- a/rsvg_internals/src/viewport.rs
+++ b/rsvg_internals/src/viewport.rs
@@ -6,7 +6,7 @@ use drawing_ctx::DrawingCtx;
 use error::RenderingError;
 use float_eq_cairo::ApproxEqCairo;
 use node::RsvgNode;
-use state::ComputedValues;
+use properties::ComputedValues;
 use viewbox::*;
 
 #[derive(Debug, Copy, Clone, PartialEq)]
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]