diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2017-09-27 08:15:49 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2017-09-27 08:15:49 +0000 |
| commit | 40d24d185b7e050deac650960464630f9af4b073 (patch) | |
| tree | ec019942c30f0ae0ee010a86c2fdc6f04af713c2 /src/sp-text.cpp | |
| parent | Fix error when vertical text has 'text-orientation' value 'sideways'. (diff) | |
| parent | Remove usage of GString in sp-object.cpp (diff) | |
| download | inkscape-40d24d185b7e050deac650960464630f9af4b073.tar.gz inkscape-40d24d185b7e050deac650960464630f9af4b073.zip | |
Merge branch 'jali/inkscape-ustring_refactor'
Removes usage of GString.
Diffstat (limited to 'src/sp-text.cpp')
| -rw-r--r-- | src/sp-text.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sp-text.cpp b/src/sp-text.cpp index 2a88c5009..a13adbf0b 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -359,7 +359,7 @@ gchar* SPText::description() const { int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT); Inkscape::Util::Quantity q = Inkscape::Util::Quantity(style->font_size.computed, "px"); q.quantity *= this->i2doc_affine().descrim(); - GString *xs = g_string_new(q.string(sp_style_get_css_unit_string(unit)).c_str()); + Glib::ustring xs = q.string(sp_style_get_css_unit_string(unit)); char const *trunc = ""; Inkscape::Text::Layout const *layout = te_get_layout((SPItem *) this); @@ -369,8 +369,8 @@ gchar* SPText::description() const { } char *ret = ( SP_IS_TEXT_TEXTPATH(this) - ? g_strdup_printf(_("on path%s (%s, %s)"), trunc, n, xs->str) - : g_strdup_printf(_("%s (%s, %s)"), trunc, n, xs->str) ); + ? g_strdup_printf(_("on path%s (%s, %s)"), trunc, n, xs.c_str()) + : g_strdup_printf(_("%s (%s, %s)"), trunc, n, xs.c_str()) ); return ret; } |