diff options
| author | Markus Engel <markus.engel@tum.de> | 2014-07-22 19:16:52 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2014-07-22 19:16:52 +0000 |
| commit | d7c36cd293ee35f53a5b47f2795b061888d4f79b (patch) | |
| tree | de6360804cfdec65afcd11945db38051bd760817 /src/ui | |
| parent | Replaced some abs/fabs with std::abs. (diff) | |
| download | inkscape-d7c36cd293ee35f53a5b47f2795b061888d4f79b.tar.gz inkscape-d7c36cd293ee35f53a5b47f2795b061888d4f79b.zip | |
Fixed some logic errors; clang warnings.
(bzr r13460)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/template-widget.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/style-swatch.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp index ef91962d4..9758b35ac 100644 --- a/src/ui/dialog/template-widget.cpp +++ b/src/ui/dialog/template-widget.cpp @@ -120,7 +120,7 @@ void TemplateWidget::_displayTemplateDetails() if (_current_template.long_description != "") message += _("Description: ") + _current_template.long_description + "\n\n"; - if (~_current_template.keywords.empty()){ + if (!_current_template.keywords.empty()){ message += _("Keywords: "); for (std::set<Glib::ustring>::iterator it = _current_template.keywords.begin(); it != _current_template.keywords.end(); ++it) message += *it + " "; diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp index a33c1d09f..98f4e47cd 100644 --- a/src/ui/widget/style-swatch.cpp +++ b/src/ui/widget/style-swatch.cpp @@ -261,7 +261,7 @@ void StyleSwatch::setStyle(SPCSSAttr *css) Glib::ustring css_string; sp_repr_css_write_string (_css, css_string); SPStyle *temp_spstyle = sp_style_new(SP_ACTIVE_DOCUMENT); - if (~css_string.empty()) { + if (!css_string.empty()) { sp_style_merge_from_style_string (temp_spstyle, css_string.c_str()); } |