diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/clipboard.cpp | 8 | ||||
| -rw-r--r-- | src/ui/dialog/align-and-distribute.cpp | 3 | ||||
| -rw-r--r-- | src/ui/interface.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tools/eraser-tool.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tools/measure-tool.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tools/mesh-tool.cpp | 7 |
6 files changed, 13 insertions, 11 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index ce792383b..58a276090 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -1060,17 +1060,19 @@ bool ClipboardManagerImpl::_pasteText(SPDesktop *desktop) } } - for (int i = 0; i < text.length(); ++i) + for (unsigned int i = 0; i < text.length(); ++i) it.prevCharacter(); + it_next = layout->charIndexToIterator(layout->iteratorToCharIndex(it)); for (int i = 0; i < nr_blocks; ++i) { - for (int j = te_selected_style_positions[i]; j < te_selected_style_positions[i+1]; ++j) + for (unsigned int j = te_selected_style_positions[i]; j < te_selected_style_positions[i+1]; ++j) it_next.nextCharacter(); + sp_te_apply_style(tc->text, it, it_next, te_selected_style[i]); te_update_layout_now_recursive(tc->text); - for (int j = te_selected_style_positions[i]; j < te_selected_style_positions[i+1]; ++j) + for (unsigned int j = te_selected_style_positions[i]; j < te_selected_style_positions[i+1]; ++j) it.nextCharacter(); } } diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 045b4a98e..75c217af9 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -169,7 +169,7 @@ void ActionAlign::do_action(SPDesktop *desktop, int index) Geom::Point mp = Geom::Point(a.mx0 * b->min()[Geom::X] + a.mx1 * b->max()[Geom::X], a.my0 * b->min()[Geom::Y] + a.my1 * b->max()[Geom::Y]); - if (sel_as_group) + if (sel_as_group) { if (focus) { // use bounding box of all selected elements except the "focused" element Inkscape::ObjectSet copy; @@ -180,6 +180,7 @@ void ActionAlign::do_action(SPDesktop *desktop, int index) // use bounding box of all selected elements b = selection->preferredBounds(); } + } //Move each item in the selected list separately bool changed = false; diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 0be3ef684..4ae0f4a6d 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -1308,7 +1308,7 @@ static void sp_ui_import_files(gchar *buffer) { gchar** l = g_uri_list_extract_uris(buffer); - for (int i = 0; i< g_strv_length (l); i++) { + for (unsigned int i=0; i < g_strv_length(l); i++) { gchar *f = g_filename_from_uri (l[i], NULL, NULL); sp_ui_import_one_file_with_check(f, NULL); g_free(f); diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index 07c9c118b..c95cc8b47 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -786,7 +786,7 @@ void EraserTool::set_to_accumulated() { selection->raiseToTop(true); selection->add(dup_clip); selection->pathDiff(true); - SPItem * clip = SP_ITEM(*(selection->items().begin())); + //SPItem * clip = SP_ITEM(*(selection->items().begin())); } } } diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index ba3e767b7..c2bc23d8b 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -613,7 +613,7 @@ bool MeasureTool::root_handler(GdkEvent* event) } } else { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Util::Unit const * unit = desktop->getNamedView()->getDisplayUnit(); + //Inkscape::Util::Unit const * unit = desktop->getNamedView()->getDisplayUnit(); for (size_t idx = 0; idx < measure_item.size(); ++idx) { sp_canvas_item_destroy(measure_item[idx]); } diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp index 703e57ac8..e94da4813 100644 --- a/src/ui/tools/mesh-tool.cpp +++ b/src/ui/tools/mesh-tool.cpp @@ -73,14 +73,14 @@ const std::string MeshTool::prefsPath = "/tools/mesh"; MeshTool::MeshTool() : ToolBase(cursor_gradient_xpm) +// TODO: Why are these connections stored as pointers? + , selcon(NULL) + , subselcon(NULL) , cursor_addnode(false) , node_added(false) , show_handles(true) , edit_fill(true) , edit_stroke(true) -// TODO: Why are these connections stored as pointers? - , selcon(NULL) - , subselcon(NULL) { // TODO: This value is overwritten in the root handler this->tolerance = 6; @@ -1060,7 +1060,6 @@ static void sp_mesh_new_default(MeshTool &rc) { SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop; Inkscape::Selection *selection = desktop->getSelection(); SPDocument *document = desktop->getDocument(); - ToolBase *ec = SP_EVENT_CONTEXT(&rc); if (!selection->isEmpty()) { |