From 6a02dec0d72ba8a116d382a54d153d00b83d4c21 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 28 Oct 2013 20:12:23 +0100 Subject: unit display: fix typo (bzr r12741) --- src/util/units.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util/units.cpp') diff --git a/src/util/units.cpp b/src/util/units.cpp index 1023cfb6e..21f64fe72 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -463,7 +463,7 @@ double Quantity::value(char const *u) const } Glib::ustring Quantity::string(Unit const *u) const { - return Glib::ustring::format(std::fixed, std::setprecision(2), value(u)) + " " + unit->abbr; + return Glib::ustring::format(std::fixed, std::setprecision(2), value(u)) + " " + u->abbr; } Glib::ustring Quantity::string(Glib::ustring const &u) const { return string(unit_table.getUnit(u.c_str())); -- cgit v1.2.3 From b0cdbc7df760f9d7eef5365a01bf1d2ab7a4b4be Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Tue, 29 Oct 2013 22:15:47 +0100 Subject: "fix" some "unused parameter" warnings (bzr r12746) --- src/util/units.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/util/units.cpp') diff --git a/src/util/units.cpp b/src/util/units.cpp index 21f64fe72..61e7335ad 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -362,7 +362,7 @@ bool UnitTable::load(std::string const &filename) { return true; } -bool UnitTable::save(std::string const &filename) { +bool UnitTable::save(std::string const &/*filename*/) { g_warning("UnitTable::save(): not implemented"); @@ -371,7 +371,7 @@ bool UnitTable::save(std::string const &filename) { Inkscape::Util::UnitTable unit_table; -void UnitParser::on_start_element(Ctx &ctx, Glib::ustring const &name, AttrMap const &attrs) +void UnitParser::on_start_element(Ctx &/*ctx*/, Glib::ustring const &name, AttrMap const &attrs) { if (name == "unit") { // reset for next use @@ -413,7 +413,7 @@ void UnitParser::on_text(Ctx &ctx, Glib::ustring const &text) } } -void UnitParser::on_end_element(Ctx &ctx, Glib::ustring const &name) +void UnitParser::on_end_element(Ctx &/*ctx*/, Glib::ustring const &name) { if (name == "unit" && !skip) { tbl->addUnit(unit, primary); -- cgit v1.2.3 From 70a4eb83df77843d94cdb079d57705fd6c7a65af Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Tue, 29 Oct 2013 22:35:19 +0100 Subject: saving units is not implemented yet, and noone should call the save method (bzr r12750) --- src/util/units.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/util/units.cpp') diff --git a/src/util/units.cpp b/src/util/units.cpp index 61e7335ad..40cce028d 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -362,12 +362,13 @@ bool UnitTable::load(std::string const &filename) { return true; } -bool UnitTable::save(std::string const &/*filename*/) { - +/* +bool UnitTable::save(std::string const &filename) { g_warning("UnitTable::save(): not implemented"); - return true; + return false; } +*/ Inkscape::Util::UnitTable unit_table; -- cgit v1.2.3