diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2009-02-10 07:30:56 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2009-02-10 07:30:56 +0000 |
| commit | e903e021e4b6c7adabea47682c861dcb3326bc19 (patch) | |
| tree | ef8f2d3e613f21648ca8b17631cc94bcbe002e42 /src | |
| parent | prevent hotkey clash (at least for english) (diff) | |
| download | inkscape-e903e021e4b6c7adabea47682c861dcb3326bc19.tar.gz inkscape-e903e021e4b6c7adabea47682c861dcb3326bc19.zip | |
Adding explicit parenthesis to remove warnings
(bzr r7261)
Diffstat (limited to 'src')
| -rw-r--r-- | src/helper/units.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/layer-selector.cpp | 2 | ||||
| -rw-r--r-- | src/xml/repr-util.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/helper/units.cpp b/src/helper/units.cpp index 3e632a0ca..47c4746ac 100644 --- a/src/helper/units.cpp +++ b/src/helper/units.cpp @@ -137,8 +137,8 @@ sp_convert_distance(gdouble *distance, SPUnit const *from, SPUnit const *to) if ((from->base == SP_UNIT_VOLATILE) || (to->base == SP_UNIT_VOLATILE)) return FALSE; if ((from->base == to->base) - || (from->base == SP_UNIT_DEVICE) && (to->base == SP_UNIT_ABSOLUTE) - || (from->base == SP_UNIT_ABSOLUTE) && (to->base == SP_UNIT_DEVICE)) + || ((from->base == SP_UNIT_DEVICE) && (to->base == SP_UNIT_ABSOLUTE)) + || ((from->base == SP_UNIT_ABSOLUTE) && (to->base == SP_UNIT_DEVICE))) { *distance = *distance * from->unittobase / to->unittobase; return TRUE; diff --git a/src/widgets/layer-selector.cpp b/src/widgets/layer-selector.cpp index 65f64fa4f..d51b31e67 100644 --- a/src/widgets/layer-selector.cpp +++ b/src/widgets/layer-selector.cpp @@ -539,7 +539,7 @@ void LayerSelector::_prepareLabelRenderer( SPObject *layer=( _desktop ? _desktop->currentLayer() : NULL ); SPObject *root=( _desktop ? _desktop->currentRoot() : NULL ); - bool isancestor = !( layer && SP_OBJECT_PARENT(object) == SP_OBJECT_PARENT(layer) || layer == root && SP_OBJECT_PARENT(object) == root); + bool isancestor = !( (layer && (SP_OBJECT_PARENT(object) == SP_OBJECT_PARENT(layer))) || ((layer == root) && (SP_OBJECT_PARENT(object) == root))); bool iscurrent = ( object == layer && object != root ); diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp index 528902fef..0a2997437 100644 --- a/src/xml/repr-util.cpp +++ b/src/xml/repr-util.cpp @@ -416,8 +416,8 @@ sp_repr_lookup_child(Inkscape::XML::Node *repr, g_return_val_if_fail(repr != NULL, NULL); for ( Inkscape::XML::Node *child = repr->firstChild() ; child ; child = child->next() ) { gchar const *child_value = child->attribute(key); - if ( child_value == value || - value && child_value && !strcmp(child_value, value) ) + if ( (child_value == value) || + (value && child_value && !strcmp(child_value, value)) ) { return child; } |