diff options
| author | Jan Lingscheid <jan.linscheid@auticon.de> | 2017-09-12 06:39:29 +0000 |
|---|---|---|
| committer | Jan Lingscheid <jan.lingscheid@auticon.de> | 2017-09-21 05:46:22 +0000 |
| commit | 279cc8bbb41cf03be62a5fd3913787d36ccd9635 (patch) | |
| tree | f84ba9e7b496f28dbd9e6bb5d6f166d4acf8b731 /src | |
| parent | Add missing include. (diff) | |
| download | inkscape-279cc8bbb41cf03be62a5fd3913787d36ccd9635.tar.gz inkscape-279cc8bbb41cf03be62a5fd3913787d36ccd9635.zip | |
Remove usage of GString from seltrans.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/seltrans.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/seltrans.cpp b/src/seltrans.cpp index 9e18bbe90..dd76b679f 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -1309,12 +1309,10 @@ gboolean Inkscape::SelTrans::centerRequest(Geom::Point &pt, guint state) // status text Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(pt[Geom::X], "px"); Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(pt[Geom::Y], "px"); - GString *xs = g_string_new(x_q.string(_desktop->namedview->display_units).c_str()); - GString *ys = g_string_new(y_q.string(_desktop->namedview->display_units).c_str()); - _message_context.setF(Inkscape::NORMAL_MESSAGE, _("Move <b>center</b> to %s, %s"), xs->str, ys->str); - g_string_free(xs, FALSE); - g_string_free(ys, FALSE); - + Glib::ustring xs(x_q.string(_desktop->namedview->display_units)); + Glib::ustring ys(y_q.string(_desktop->namedview->display_units)); + _message_context.setF(Inkscape::NORMAL_MESSAGE, _("Move <b>center</b> to %s, %s"), + xs.c_str(), ys.c_str()); return TRUE; } @@ -1455,11 +1453,11 @@ void Inkscape::SelTrans::moveTo(Geom::Point const &xy, guint state) // status text Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(dxy[Geom::X], "px"); Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(dxy[Geom::Y], "px"); - GString *xs = g_string_new(x_q.string(_desktop->namedview->display_units).c_str()); - GString *ys = g_string_new(y_q.string(_desktop->namedview->display_units).c_str()); - _message_context.setF(Inkscape::NORMAL_MESSAGE, _("<b>Move</b> by %s, %s; with <b>Ctrl</b> to restrict to horizontal/vertical; with <b>Shift</b> to disable snapping"), xs->str, ys->str); - g_string_free(xs, TRUE); - g_string_free(ys, TRUE); + Glib::ustring xs(x_q.string(_desktop->namedview->display_units)); + Glib::ustring ys(y_q.string(_desktop->namedview->display_units)); + _message_context.setF(Inkscape::NORMAL_MESSAGE, + _("<b>Move</b> by %s, %s; with <b>Ctrl</b> to restrict to horizontal/vertical; with <b>Shift</b> to disable snapping"), + xs.c_str(), ys.c_str()); } // Given a location of a handle at the visual bounding box, find the corresponding location at the |