Change the data type of size/width/height of the controls to unsigned int

4 files changed, 31 insertions, 34 deletions

diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index c1e4d857c..153799f2a 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -26,8 +26,6 @@ using Inkscape::ControlFlags;
 
 namespace {
 
-std::map<Inkscape::ControlType, std::vector<int> > sizeTable;
-
 // Note: The following operator overloads are local to this file at the moment to discourage flag manipulation elsewhere.
 /*
 ControlFlags operator |(ControlFlags lhs, ControlFlags rhs)
@@ -110,7 +108,7 @@ private:
     int _size;   // Size from the grabsize preference
     int _resize; // Way size should change from grabsize
     std::vector<SPCanvasItem *> _itemList;
-    std::map<Inkscape::ControlType, std::vector<int> > _sizeTable;
+    std::map<Inkscape::ControlType, std::vector<unsigned int> > _sizeTable;
     std::map<Inkscape::ControlType, GType> _typeTable;
     std::map<Inkscape::ControlType, SPCtrlShapeType> _ctrlToShape;
     std::set<Inkscape::ControlType> _resizeOnSelect;
@@ -168,37 +166,37 @@ ControlManagerImpl::ControlManagerImpl(ControlManager &manager) :
     // or guides, which are 1 px wide. It is not possible to accurately center a control to them if the
     // control has an even width).
     {
-        int sizes[] = {7, 7, 7, 7, 7, 7, 7};
-        _sizeTable[CTRL_TYPE_UNKNOWN] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        unsigned int sizes[] = {7, 7, 7, 7, 7, 7, 7};
+        _sizeTable[CTRL_TYPE_UNKNOWN] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
     }
     {
-        int sizes[] = {3, 5, 7, 9, 11, 13, 15};
-        _sizeTable[CTRL_TYPE_ANCHOR] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        unsigned int sizes[] = {3, 5, 7, 9, 11, 13, 15};
+        _sizeTable[CTRL_TYPE_ANCHOR] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
     }
     {
-        int sizes[] = {3, 5, 7, 9, 11, 13, 15};
-        _sizeTable[CTRL_TYPE_ADJ_HANDLE] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        unsigned int sizes[] = {3, 5, 7, 9, 11, 13, 15};
+        _sizeTable[CTRL_TYPE_ADJ_HANDLE] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
     }
     {
-        int sizes[] = {5, 7, 9, 11, 13, 15, 17};
-        _sizeTable[CTRL_TYPE_POINT] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
-        _sizeTable[CTRL_TYPE_ROTATE] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
-        _sizeTable[CTRL_TYPE_SIZER] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
-        _sizeTable[CTRL_TYPE_SHAPER] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        unsigned int sizes[] = {5, 7, 9, 11, 13, 15, 17};
+        _sizeTable[CTRL_TYPE_POINT] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        _sizeTable[CTRL_TYPE_ROTATE] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        _sizeTable[CTRL_TYPE_SIZER] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        _sizeTable[CTRL_TYPE_SHAPER] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
     }
     {
-        int sizes[] = {5, 7, 9, 11, 13, 15, 17};
-        _sizeTable[CTRL_TYPE_NODE_AUTO] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
-        _sizeTable[CTRL_TYPE_NODE_CUSP] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        unsigned int sizes[] = {5, 7, 9, 11, 13, 15, 17};
+        _sizeTable[CTRL_TYPE_NODE_AUTO] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        _sizeTable[CTRL_TYPE_NODE_CUSP] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
     }
     {
-        int sizes[] = {3, 5, 7, 9, 11, 13, 15};
-        _sizeTable[CTRL_TYPE_NODE_SMOOTH] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
-        _sizeTable[CTRL_TYPE_NODE_SYMETRICAL] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        unsigned int sizes[] = {3, 5, 7, 9, 11, 13, 15};
+        _sizeTable[CTRL_TYPE_NODE_SMOOTH] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        _sizeTable[CTRL_TYPE_NODE_SYMETRICAL] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
     }
     {
-        int sizes[] = {1, 1, 1, 1, 1, 1, 1};
-        _sizeTable[CTRL_TYPE_INVISIPOINT] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+        unsigned int sizes[] = {1, 1, 1, 1, 1, 1, 1};
+        _sizeTable[CTRL_TYPE_INVISIPOINT] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
     }
 }
 
@@ -224,7 +222,7 @@ void ControlManagerImpl::setControlSize(int size, bool force)
 SPCanvasItem *ControlManagerImpl::createControl(SPCanvasGroup *parent, ControlType type)
 {
     SPCanvasItem *item = nullptr;
-    double targetSize = _sizeTable[type][_size - 1];
+    unsigned int targetSize = _sizeTable[type][_size - 1];
     switch (type)
     {
         case CTRL_TYPE_ADJ_HANDLE:
@@ -291,7 +289,7 @@ sigc::connection ControlManagerImpl::connectCtrlSizeChanged(const sigc::slot<voi
 void ControlManagerImpl::updateItem(SPCanvasItem *item)
 {
     if (item) {
-        double target = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
+        unsigned int target = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
         g_object_set(item, "size", target, NULL);
 
         sp_canvas_item_request_update(item);
@@ -306,7 +304,7 @@ bool ControlManagerImpl::setControlType(SPCanvasItem *item, ControlType type)
         accepted = true;
     } else if (item) {
         if (_ctrlToShape.count(type) && (_typeTable[type] == _typeTable[item->ctrlType])) { // compatible?
-            double targetSize = _sizeTable[type][_size - 1] + item->ctrlResize;
+            unsigned int targetSize = _sizeTable[type][_size - 1] + item->ctrlResize;
             SPCtrlShapeType targetShape = _ctrlToShape[type];
 
             g_object_set(item, "shape", targetShape, "size", targetSize, NULL);
@@ -326,7 +324,7 @@ bool ControlManagerImpl::setControlResize(SPCanvasItem *item, int ctrlResize)
     // is also odd
     if(item) {
         item->ctrlResize = ctrlResize;
-        double targetSize = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
+        unsigned int targetSize = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
         g_object_set(item, "size", targetSize, NULL);
         return true;
     }
@@ -345,7 +343,7 @@ void ControlManagerImpl::setSelected(SPCanvasItem *item, bool selected)
         }
 
         // TODO refresh colors
-        double targetSize = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
+        unsigned int targetSize = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
         g_object_set(item, "size", targetSize, NULL);
     }
 }
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index dfa165804..f47951c2c 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -80,7 +80,7 @@ ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, SPAncho
 {
     _canvas_item = sp_canvas_item_new(
         group ? group : _desktop->getControls(), SP_TYPE_CTRL,
-        "anchor", (SPAnchorType) anchor, "size", (gdouble) pixbuf->get_width(),
+        "anchor", (SPAnchorType) anchor, "size", (unsigned int) pixbuf->get_width(),
         "shape", SP_CTRL_SHAPE_BITMAP, "pixbuf", pixbuf->gobj(),
         "filled", TRUE, "fill_color", _cset.normal.fill,
         "stroked", TRUE, "stroke_color", _cset.normal.stroke,
@@ -167,9 +167,9 @@ Glib::ustring ControlPoint::format_tip(char const *format, ...)
 
 unsigned int ControlPoint::_size() const
 {
-    double ret;
+    unsigned int ret;
     g_object_get(_canvas_item, "size", &ret, NULL);
-    return static_cast<unsigned int>(ret);
+    return ret;
 }
 
 SPCtrlShapeType ControlPoint::_shape() const
@@ -197,7 +197,7 @@ Glib::RefPtr<Gdk::Pixbuf> ControlPoint::_pixbuf()
 
 void ControlPoint::_setSize(unsigned int size)
 {
-    g_object_set(_canvas_item, "size", (gdouble) size, NULL);
+    g_object_set(_canvas_item, "size", size, NULL);
 }
 
 bool ControlPoint::_setControlType(Inkscape::ControlType type)
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index f54e07784..9df0ef34e 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -397,8 +397,7 @@ bool Box3dTool::root_handler(GdkEvent* event) {
         /* FOR DEBUGGING PURPOSES
         case GDK_O:
             if (MOD__CTRL(event) && MOD__SHIFT(event)) {
-                Box3D::create_canvas_point(persp3d_get_VP(document()->getCurrentPersp3D(), Proj::W).affine(),
-                                           7, 0xff00ff00);
+                Box3D::create_canvas_point(persp3d_get_VP(document()->getCurrentPersp3D(), Proj::W).affine(), 7, 0xff00ff00);
             }
             ret = true;
             break;
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 3c706fbc6..e2dae85a5 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -1080,7 +1080,7 @@ void MeasureTool::setMeasureCanvasItem(Geom::Point position, bool to_item, bool
     SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
         SP_TYPE_CTRL,
         "anchor", SP_ANCHOR_CENTER,
-        "size", 9.0,
+        "size", 9,
         "stroked", TRUE,
         "stroke_color", color,
         "mode", SP_KNOT_MODE_XOR,