summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile_insert1
-rw-r--r--src/sp-metric.h28
-rw-r--r--src/sp-namedview.cpp13
-rw-r--r--src/sp-namedview.h2
-rw-r--r--src/util/units.cpp22
-rw-r--r--src/util/units.h1
7 files changed, 0 insertions, 68 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f975f16bf..b2af3809d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -135,7 +135,6 @@ set(sp_SRC
sp-mesh-row-fns.h
sp-mesh-row.h
sp-metadata.h
- sp-metric.h
sp-missing-glyph.h
sp-namedview.h
sp-object-group.h
diff --git a/src/Makefile_insert b/src/Makefile_insert
index ba14056e5..32771b99f 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -199,7 +199,6 @@ ink_common_sources += \
sp-mesh-patch.cpp sp-mesh-patch.h \
sp-mesh-row-fns.h \
sp-mesh-row.cpp sp-mesh-row.h \
- sp-metric.h \
sp-missing-glyph.cpp sp-missing-glyph.h \
sp-namedview.cpp sp-namedview.h \
sp-object.cpp sp-object.h \
diff --git a/src/sp-metric.h b/src/sp-metric.h
deleted file mode 100644
index 31f3330fa..000000000
--- a/src/sp-metric.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef INKSCAPE_SP_METRIC_H
-#define INKSCAPE_SP_METRIC_H
-
-/** Known metrics so far. (I don't know why this doesn't include pica.) */
-enum SPMetric {
- SP_NONE,
- SP_MM,
- SP_CM,
- SP_IN,
- SP_FT,
- SP_PT,
- SP_PC,
- SP_PX,
- SP_M
-};
-
-#endif /* !INKSCAPE_SP_METRIC_H */
-
-/*
- Local Variables:
- mode:c++
- c-file-style:"stroustrup"
- c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
- indent-tabs-mode:nil
- fill-column:99
- End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index d01185981..dde205eed 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -1125,19 +1125,6 @@ double SPNamedView::getMarginLength(gchar const * const key,
return value;
}
-
-/**
- * Returns namedview's default metric.
- */
-SPMetric SPNamedView::getDefaultMetric() const
-{
- if (doc_units) {
- return (SPMetric) doc_units->metric();
- } else {
- return SP_PT;
- }
-}
-
/**
* Returns namedview's default unit.
*/
diff --git a/src/sp-namedview.h b/src/sp-namedview.h
index 7f7e81f1f..26febd7d3 100644
--- a/src/sp-namedview.h
+++ b/src/sp-namedview.h
@@ -21,7 +21,6 @@
#define SP_IS_NAMEDVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_NAMEDVIEW))
#include "sp-object-group.h"
-#include "sp-metric.h"
#include "snap.h"
#include "document.h"
#include "util/units.h"
@@ -84,7 +83,6 @@ struct SPNamedView : public SPObjectGroup {
gchar const *getName() const;
guint getViewCount();
GSList const *getViewList() const;
- SPMetric getDefaultMetric() const;
Inkscape::Util::Unit const getDefaultUnit() const;
void translateGuides(Geom::Translate const &translation);
diff --git a/src/util/units.cpp b/src/util/units.cpp
index 01424520b..582c52090 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -187,28 +187,6 @@ int Unit::svgUnit() const
return 0;
}
-/** Temporary - get metric. */
-int Unit::metric() const
-{
- if (!abbr.compare("mm"))
- return 1;
- if (!abbr.compare("cm"))
- return 2;
- if (!abbr.compare("in"))
- return 3;
- if (!abbr.compare("ft"))
- return 4;
- if (!abbr.compare("pt"))
- return 5;
- if (!abbr.compare("pc"))
- return 6;
- if (!abbr.compare("px"))
- return 7;
- if (!abbr.compare("m"))
- return 8;
- return 0;
-}
-
UnitTable::UnitTable()
{
// if we swich to the xml file, don't forget to force locale to 'C'
diff --git a/src/util/units.h b/src/util/units.h
index 0bbe604ef..99ba93c6b 100644
--- a/src/util/units.h
+++ b/src/util/units.h
@@ -80,7 +80,6 @@ class Unit {
// temporary
int svgUnit() const;
- int metric() const;
};
class Quantity {