From 36863a0e699b5a7cba346bca8a26e729be5a2f87 Mon Sep 17 00:00:00 2001
From: Jan Lingscheid <jan.linscheid@auticon.de>
Date: Tue, 12 Sep 2017 10:13:54 +0200
Subject: Remove remaining usage of GString in ui/tools/*

---
 src/ui/tools/star-tool.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/ui/tools/star-tool.cpp')

diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 32f0e6d92..05a1f8f7c 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -389,14 +389,12 @@ void StarTool::drag(Geom::Point p, guint state)
 
     /* status text */
     Inkscape::Util::Quantity q = Inkscape::Util::Quantity(r1, "px");
-    GString *rads = g_string_new(q.string(desktop->namedview->display_units).c_str());
+    Glib::ustring rads = q.string(desktop->namedview->display_units);
     this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE,
                                ( this->isflatsided?
                                  _("<b>Polygon</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle")
                                  : _("<b>Star</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle") ),
-                               rads->str, sp_round((arg1) * 180 / M_PI, 0.0001));
-
-    g_string_free(rads, FALSE);
+                               rads.c_str(), sp_round((arg1) * 180 / M_PI, 0.0001));
 }
 
 void StarTool::finishItem() {
-- 
cgit v1.2.3


From 6a03015b016c177e0657fc6274a571db16e48b64 Mon Sep 17 00:00:00 2001
From: Stefano Facchini <stefano.facchini@gmail.com>
Date: Sat, 23 Sep 2017 10:02:16 +0200
Subject: Remove unused parameter in SPItem::doWriteTransform

---
 src/ui/tools/star-tool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools/star-tool.cpp')

diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 32f0e6d92..d5e782f68 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -415,7 +415,7 @@ void StarTool::finishItem() {
         this->star->setCenter(this->center);
         this->star->set_shape();
         this->star->updateRepr(SP_OBJECT_WRITE_EXT);
-        this->star->doWriteTransform(this->star->getRepr(), this->star->transform, NULL, true);
+        this->star->doWriteTransform(this->star->transform, NULL, true);
 
         desktop->canvas->endForcedFullRedraws();
 
-- 
cgit v1.2.3


From 525c6c0c7ea39c6bdb0013c546d08b6e94e51e61 Mon Sep 17 00:00:00 2001
From: Andrey Mozzhuhin <amozzhuhin@yandex.ru>
Date: Fri, 6 Oct 2017 00:46:14 +0300
Subject: Rename get_group0_keyval to get_latin_keyval

---
 src/ui/tools/star-tool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/tools/star-tool.cpp')

diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index cda3389f9..ed25503c4 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -246,7 +246,7 @@ bool StarTool::root_handler(GdkEvent* event) {
         break;
 
     case GDK_KEY_PRESS:
-        switch (get_group0_keyval(&event->key)) {
+        switch (get_latin_keyval(&event->key)) {
         case GDK_KEY_Alt_R:
         case GDK_KEY_Control_L:
         case GDK_KEY_Control_R:
@@ -306,7 +306,7 @@ bool StarTool::root_handler(GdkEvent* event) {
         break;
 
     case GDK_KEY_RELEASE:
-        switch (get_group0_keyval (&event->key)) {
+        switch (get_latin_keyval (&event->key)) {
         case GDK_KEY_Alt_L:
         case GDK_KEY_Alt_R:
         case GDK_KEY_Control_L:
-- 
cgit v1.2.3