From b76d7592902d9e27cb442e203ebffed4a915b8e6 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Mon, 12 Oct 2015 12:05:07 +0200
Subject: Fix from Johan to prevent referencing null C++ pointer. Found via
 Clang scan build.

(bzr r14404)
---
 src/ui/clipboard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/clipboard.cpp')

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 816daf2e5..0792fb9c5 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -565,7 +565,7 @@ bool ClipboardManagerImpl::pastePathEffect(SPDesktop *desktop)
     }
 
     Inkscape::Selection *selection = desktop->getSelection();
-    if (selection && selection->isEmpty()) {
+    if (!selection || selection->isEmpty()) {
         _userWarn(desktop, _("Select <b>object(s)</b> to paste live path effect to."));
         return false;
     }
-- 
cgit v1.2.3


From 23935ad410a79d6f82e0ce90e5efba32a55cda4c Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Thu, 5 Nov 2015 22:27:44 +0100
Subject: static code analysis

(bzr r14446)
---
 src/ui/clipboard.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/ui/clipboard.cpp')

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 0792fb9c5..354fa45dc 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -525,7 +525,7 @@ bool ClipboardManagerImpl::pasteSize(SPDesktop *desktop, bool separately, bool a
         // resize each object in the selection
         if (separately) {
             std::vector<SPItem*> itemlist=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){
                 SPItem *item = *i;
                 if (item) {
                     Geom::OptRect obj_size = item->desktopVisualBounds();
@@ -581,7 +581,7 @@ bool ClipboardManagerImpl::pastePathEffect(SPDesktop *desktop)
                 // make sure all selected items are converted to paths first (i.e. rectangles)
                 sp_selected_to_lpeitems(desktop);
                 std::vector<SPItem*> itemlist=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){
                     SPItem *item = *i;
                     _applyPathEffect(item, effectstack);
                 }
@@ -665,7 +665,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
     // copy the defs used by all items
     std::vector<SPItem*> itemlist=selection->itemList();
     cloned_elements.clear();
-    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){
         SPItem *item = *i;
         if (item) {
             _copyUsedDefs(item);
@@ -676,7 +676,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
 
     // copy the representation of the items
     std::vector<SPObject*> sorted_items;
-    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)
         sorted_items.push_back(*i);
     sort(sorted_items.begin(),sorted_items.end(),sp_object_compare_position_bool);
 
@@ -692,7 +692,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
 
     sorted_items.insert(sorted_items.end(),cloned_elements.begin(),cloned_elements.end());
 
-    for(std::vector<SPObject*>::const_iterator i=sorted_items.begin();i!=sorted_items.end();i++){
+    for(std::vector<SPObject*>::const_iterator i=sorted_items.begin();i!=sorted_items.end();++i){
         SPItem *item = dynamic_cast<SPItem*>(*i);
         if (item) {
             Inkscape::XML::Node *obj = item->getRepr();
-- 
cgit v1.2.3


From 25fbd2cc032dd472c3f85468c957b52e2a10d446 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Mon, 7 Dec 2015 21:20:33 +0100
Subject: static code analysis

(bzr r14510)
---
 src/ui/clipboard.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/clipboard.cpp')

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);
     }
 
-- 
cgit v1.2.3