From 47aa8306a659760d5967944af42da27a703dfc63 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Tue, 5 Jun 2012 22:40:25 +0200
Subject: various

(bzr r11461)
---
 src/color.cpp              |  4 ++++
 src/document.cpp           | 12 +++++-------
 src/profile-manager.cpp    |  2 +-
 src/ui/dialog/xml-tree.cpp | 10 +++++-----
 4 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/color.cpp b/src/color.cpp
index ca5d50f14..187a6ba6a 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -61,6 +61,10 @@ SPColor::~SPColor()
 
 SPColor& SPColor::operator= (SPColor const& other)
 {
+    if (this == &other){
+        return *this;
+    }
+    
     SVGICCColor* tmp_icc = other.icc ? new SVGICCColor(*other.icc) : 0;
 
     v.c[0] = other.v.c[0];
diff --git a/src/document.cpp b/src/document.cpp
index cc139aae0..b2ee5103d 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -103,7 +103,8 @@ SPDocument::SPDocument() :
     router(new Avoid::Router(Avoid::PolyLineRouting|Avoid::OrthogonalRouting)),
     _collection_queue(0),
     oldSignalsConnected(false),
-    current_persp3d(0)
+    current_persp3d(NULL),
+    current_persp3d_impl(NULL)
 {
     // Penalise libavoid for choosing paths with needless extra segments.
     // This results in much better looking orthogonal connector paths.
@@ -223,8 +224,7 @@ SPDefs *SPDocument::getDefs()
     return root->defs;
 }
 
-Persp3D *
-SPDocument::getCurrentPersp3D() {
+Persp3D *SPDocument::getCurrentPersp3D() {
     // Check if current_persp3d is still valid
     std::vector<Persp3D*> plist;
     getPerspectivesInDefs(plist);
@@ -239,13 +239,11 @@ SPDocument::getCurrentPersp3D() {
     return current_persp3d;
 }
 
-Persp3DImpl *
-SPDocument::getCurrentPersp3DImpl() {
+Persp3DImpl *SPDocument::getCurrentPersp3DImpl() {
     return current_persp3d_impl;
 }
 
-void
-SPDocument::setCurrentPersp3D(Persp3D * const persp) {
+void SPDocument::setCurrentPersp3D(Persp3D * const persp) {
     current_persp3d = persp;
     //current_persp3d_impl = persp->perspective_impl;
 }
diff --git a/src/profile-manager.cpp b/src/profile-manager.cpp
index e2a3e736d..90b124195 100644
--- a/src/profile-manager.cpp
+++ b/src/profile-manager.cpp
@@ -78,7 +78,7 @@ ColorProfile* ProfileManager::find(gchar const* name)
         for ( unsigned int index = 0; index < howMany; index++ ) {
             SPObject *obj = nthChildOf(NULL, index);
             ColorProfile* prof = reinterpret_cast<ColorProfile*>(obj);
-            if ( prof && prof->name && !strcmp(name, prof->name) ) {
+            if (prof && (prof->name && !strcmp(name, prof->name))) {
                 match = prof;
                 break;
             }
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index 03678d26d..1e5343d8b 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -450,7 +450,7 @@ void XmlTree::set_tree_select(Inkscape::XML::Node *repr)
 
 void XmlTree::propagate_tree_select(Inkscape::XML::Node *repr)
 {
-    if (repr && repr->type() == Inkscape::XML::ELEMENT_NODE) {
+    if (repr && (repr->type() == Inkscape::XML::ELEMENT_NODE)) {
         sp_xmlview_attr_list_set_repr(attributes, repr);
     } else {
         sp_xmlview_attr_list_set_repr(attributes, NULL);
@@ -631,7 +631,7 @@ void XmlTree::on_tree_select_row_enable(GtkTreeIter *node)
                   prev && prev->next() != repr ;
                   prev = prev->next() ){};
 
-            if (prev && prev->type() == Inkscape::XML::ELEMENT_NODE) {
+            if (prev && (prev->type() == Inkscape::XML::ELEMENT_NODE)) {
                 indentable = TRUE;
             }
         }
@@ -650,7 +650,7 @@ void XmlTree::on_tree_select_row_enable(GtkTreeIter *node)
 
     //on_tree_select_row_enable_if_not_last_child
     {
-        if ( parent && parent->parent() && repr->next() ) {
+        if ( parent && (parent->parent() && repr->next())) {
             lower_node_button.set_sensitive(true);
         } else {
             lower_node_button.set_sensitive(false);
@@ -1030,7 +1030,7 @@ void XmlTree::cmd_raise_node()
 
     Inkscape::XML::Node *ref = NULL;
     Inkscape::XML::Node *before = parent->firstChild();
-    while (before && before->next() != selected_repr) {
+    while (before && (before->next() != selected_repr)) {
         ref = before;
         before = before->next();
     }
@@ -1072,7 +1072,7 @@ void XmlTree::cmd_indent_node()
     g_return_if_fail(parent->firstChild() != repr);
 
     Inkscape::XML::Node* prev = parent->firstChild();
-    while (prev && prev->next() != repr) {
+    while (prev && (prev->next() != repr)) {
         prev = prev->next();
     }
     g_return_if_fail(prev != NULL);
-- 
cgit v1.2.3