summaryrefslogtreecommitdiffstats
path: root/src/document.h
diff options
context:
space:
mode:
authorMatthew Petroff <matthew@mpetroff.net>2013-08-06 18:54:40 +0000
committerMatthew Petroff <matthew@mpetroff.net>2013-08-06 18:54:40 +0000
commitbb88a2cb94ec34ee838a972bab17ca05ba92d1da (patch)
tree4b4580dbe1bec0968254d1b362611ab57ad3c223 /src/document.h
parentinit SPStyle better: fixes a bunch of bugs resulting from improper re-init of... (diff)
parentFixed bug in page sizer. (diff)
downloadinkscape-bb88a2cb94ec34ee838a972bab17ca05ba92d1da.tar.gz
inkscape-bb88a2cb94ec34ee838a972bab17ca05ba92d1da.zip
Merge Google Summer of Code unit refactor.
(bzr r12471)
Diffstat (limited to 'src/document.h')
-rw-r--r--src/document.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/document.h b/src/document.h
index d49067250..6782c6206 100644
--- a/src/document.h
+++ b/src/document.h
@@ -35,7 +35,6 @@ class SPItem;
class SPObject;
struct SPGroup;
struct SPRoot;
-struct SPUnit;
namespace Inkscape {
struct Application;
@@ -47,6 +46,9 @@ namespace Inkscape {
struct Document;
class Node;
}
+ namespace Util {
+ class Quantity;
+ }
}
class SPDefs;
@@ -229,8 +231,8 @@ public:
gdouble getHeight() const;
Geom::Point getDimensions() const;
Geom::OptRect preferredBounds() const;
- void setWidth(gdouble width, const SPUnit *unit);
- void setHeight(gdouble height, const SPUnit *unit);
+ void setWidth(const Inkscape::Util::Quantity &width);
+ void setHeight(const Inkscape::Util::Quantity &height);
void requestModified();
gint ensureUpToDate();
bool addResource(const gchar *key, SPObject *object);
@@ -254,8 +256,6 @@ private:
void setupViewport(SPItemCtx *ctx);
};
-struct SPUnit;
-
/*
* Ideas: How to overcome style invalidation nightmare
*