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/box3d-side.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/box3d-side.cpp')
| -rw-r--r-- | src/box3d-side.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp index 14b457ea6..3eea8855c 100644 --- a/src/box3d-side.cpp +++ b/src/box3d-side.cpp @@ -210,29 +210,28 @@ void Box3DSide::set_shape() { c->unref(); } -gchar *box3d_side_axes_string(Box3DSide *side) +Glib::ustring box3d_side_axes_string(Box3DSide *side) { - GString *pstring = g_string_new(""); - g_string_printf (pstring, "%s", Box3D::string_from_axes ((Box3D::Axis) (side->dir1 ^ side->dir2))); + Glib::ustring result(Box3D::string_from_axes((Box3D::Axis) (side->dir1 ^ side->dir2))); switch ((Box3D::Axis) (side->dir1 ^ side->dir2)) { case Box3D::XY: - g_string_append_printf (pstring, (side->front_or_rear == Box3D::FRONT) ? "front" : "rear"); + result += ((side->front_or_rear == Box3D::FRONT) ? "front" : "rear"); break; case Box3D::XZ: - g_string_append_printf (pstring, (side->front_or_rear == Box3D::FRONT) ? "top" : "bottom"); + result += ((side->front_or_rear == Box3D::FRONT) ? "top" : "bottom"); break; case Box3D::YZ: - g_string_append_printf (pstring, (side->front_or_rear == Box3D::FRONT) ? "right" : "left"); + result += ((side->front_or_rear == Box3D::FRONT) ? "right" : "left"); break; default: break; } - return pstring->str; + return result; } static void |