update to trunk

(bzr r14504.1.7)

7 files changed, 15 insertions, 14 deletions

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 354fa45dc..f04d8a591 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -682,11 +682,11 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
 
     //remove already copied elements from cloned_elements
     std::vector<SPItem*>tr;
-    for(std::set<SPItem*>::iterator it = cloned_elements.begin();it!=cloned_elements.end();it++){
+    for(std::set<SPItem*>::iterator it = cloned_elements.begin();it!=cloned_elements.end();++it){
         if(std::find(sorted_items.begin(),sorted_items.end(),*it)!=sorted_items.end())
             tr.push_back(*it);
     }
-    for(std::vector<SPItem*>::iterator it = tr.begin();it!=tr.end();it++){
+    for(std::vector<SPItem*>::iterator it = tr.begin();it!=tr.end();++it){
         cloned_elements.erase(*it);
     }
 
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 53c25c3d5..639e463ea 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -305,7 +305,7 @@ g_print("\n row = %f     col = %f selection x= %f selection y = %f", total_row_h
 
              GSList *current_row = NULL;
              col_cnt = 0;
-             for(;it!=sorted.end()&&col_cnt<NoOfCols;it++) {
+             for(;it!=sorted.end()&&col_cnt<NoOfCols;++it) {
                  current_row = g_slist_append (current_row, *it);
                  col_cnt++;
              }
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 9855b59a3..cbaf8d376 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -239,7 +239,7 @@ sp_create_window(SPViewWidget *vw, bool editable)
         }
         int pos = nui_drop_target_entries;
 
-        for (std::vector<gchar*>::iterator it = types.begin() ; it != types.end() ; it++) {
+        for (std::vector<gchar*>::iterator it = types.begin() ; it != types.end() ; ++it) {
             completeDropTargets[pos].target = *it;
             completeDropTargets[pos].flags = 0;
             completeDropTargets[pos].info = IMAGE_DATA;
@@ -2070,7 +2070,7 @@ void ContextMenu::ImageEdit(void)
 #endif
 
     std::vector<SPItem*> itemlist=_desktop->selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();++i){
         Inkscape::XML::Node *ir = (*i)->getRepr();
         const gchar *href = ir->attribute("xlink:href");
         
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 06f32ba5c..4d17a7ed5 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -1108,7 +1108,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         r->stop();
     }
     std::vector<double> intersection_times;
-    for (std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); i++) {
+    for (std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); ++i) {
         SPItem *item = *i;
         if (SP_IS_SHAPE(item)) {
             calculate_intersections(desktop, item, lineseg, SP_SHAPE(item)->getCurve(), intersection_times);
@@ -1155,7 +1155,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
 
     std::vector<Geom::Point> intersections;
     std::sort(intersection_times.begin(), intersection_times.end());
-    for (std::vector<double>::iterator iter_t = intersection_times.begin(); iter_t != intersection_times.end(); iter_t++) {
+    for (std::vector<double>::iterator iter_t = intersection_times.begin(); iter_t != intersection_times.end(); ++iter_t) {
         if(show_in_between) {
             intersections.push_back(lineseg[0].pointAt(*iter_t));
         }
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index e000307ee..7db4e09d8 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -471,7 +471,7 @@ bool MeshTool::root_handler(GdkEvent* event) {
             } else {
                 // Create a new gradient with default coordinates.
             	std::vector<SPItem*> items=selection->itemList();
-                for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+                for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
                     SPItem *item = *i;
                     SPGradientType new_type = SP_GRADIENT_TYPE_MESH;
                     Inkscape::PaintTarget fsmode = (prefs->getInt("/tools/gradient/newfillorstroke", 1) != 0) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE;
@@ -956,7 +956,7 @@ static void sp_mesh_end_drag(MeshTool &rc) {
         sp_repr_css_set_property(css, "fill-opacity", "1.0");
 
         std::vector<SPItem*> items=selection->itemList();
-        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
 
             //FIXME: see above
             sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 6a6ca0b26..cceaca7cb 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -413,7 +413,7 @@ void NodeTool::selection_changed(Inkscape::Selection *sel) {
     std::set<ShapeRecord> shapes;
 
     std::vector<SPItem*> items=sel->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
         SPObject *obj = *i;
 
         if (SP_IS_ITEM(obj)) {
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 051df691e..036659661 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -244,12 +244,13 @@ void UXManagerImpl::delTrack( SPDesktopWidget* dtw )
 
 void UXManagerImpl::connectToDesktop( vector<GtkWidget *> const & toolboxes, SPDesktop *desktop )
 {
-    TrackItem &tracker = trackedBoxes[desktop];
-    vector<GtkWidget*>& tracked = tracker.boxes;
-    if (desktop)
+    if (!desktop)
     {
-        tracker.destroyConn = desktop->connectDestroy(&desktopDestructHandler);
+        return;
     }
+    TrackItem &tracker = trackedBoxes[desktop];
+    vector<GtkWidget*>& tracked = tracker.boxes;
+    tracker.destroyConn = desktop->connectDestroy(&desktopDestructHandler);
 
     for (vector<GtkWidget*>::const_iterator it = toolboxes.begin(); it != toolboxes.end(); ++it ) {
         GtkWidget* toolbox = *it;