summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-06-18 13:07:51 +0000
committerjabiertxof <info@marker.es>2016-06-18 13:07:51 +0000
commitc5f642fbd66ccb150d361d2861d0b1baa744dcba (patch)
treec88c9325ef919b473c888fdcda2e5fcbaa85e624 /src/ui
parentupdate to trunk (diff)
downloadinkscape-c5f642fbd66ccb150d361d2861d0b1baa744dcba.tar.gz
inkscape-c5f642fbd66ccb150d361d2861d0b1baa744dcba.zip
Pre fixing selected points
(bzr r13645.1.161)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/lpe-fillet-chamfer-properties.cpp7
-rw-r--r--src/ui/tools/node-tool.cpp6
2 files changed, 7 insertions, 6 deletions
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
index c86fc4a20..098a84edf 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
@@ -117,7 +117,8 @@ FilletChamferPropertiesDialog::~FilletChamferPropertiesDialog()
}
void FilletChamferPropertiesDialog::showDialog(
- SPDesktop *desktop, double _amount,
+ SPDesktop *desktop,
+ double _amount,
const Inkscape::LivePathEffect::
FilletChamferKnotHolderEntity *pt,
bool _use_distance,
@@ -243,9 +244,9 @@ void FilletChamferPropertiesDialog::_setPt(
}
-void FilletChamferPropertiesDialog::_setAmount(double amm)
+void FilletChamferPropertiesDialog::_setAmount(double amount)
{
- _amount = amm;
+ _amount = amount;
}
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 60d4c807f..d02b8e6d3 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -293,14 +293,14 @@ void NodeTool::update_helperpath () {
Inkscape::LivePathEffect::Effect *lpe = SP_LPE_ITEM(selection->singleItem())->getCurrentLPE();
if (lpe && lpe->isVisible()/* && lpe->showOrigPath()*/) {
Inkscape::UI::ControlPointSelection::Set &selection_nodes = _selected_nodes->allPoints();
- std::vector<Geom::Point> selected_nodes_positions;
+ std::vector<Geom::Point> selected_nodes_pos;
for (Inkscape::UI::ControlPointSelection::Set::iterator i = selection_nodes.begin(); i != selection_nodes.end(); ++i) {
if ((*i)->selected()) {
Inkscape::UI::Node *n = dynamic_cast<Inkscape::UI::Node *>(*i);
- selected_nodes_positions.push_back(n->position());
+ selected_nodes_pos.push_back(n->position());
}
}
- lpe->setSelectedNodePoints(selected_nodes_positions);
+ lpe->setSelectedNodePoints(selected_nodes_pos);
lpe->setCurrentZoom(this->desktop->current_zoom());
SPCurve *c = new SPCurve();
SPCurve *cc = new SPCurve();