diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-06-02 12:49:59 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-06-02 12:49:59 +0000 |
| commit | dc64efe3d0371dde617a1327568116601fe8375a (patch) | |
| tree | bd1f47c94435886d632fe4a966e6f88414969187 /src | |
| parent | Merge branch 'CSSDialogSimplify' (diff) | |
| download | inkscape-dc64efe3d0371dde617a1327568116601fe8375a.tar.gz inkscape-dc64efe3d0371dde617a1327568116601fe8375a.zip | |
Fix codestyle
Diffstat (limited to 'src')
| -rw-r--r-- | src/attributes.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/styledialog.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/attributes.cpp b/src/attributes.cpp index 3fa8c0fff..7353c35ed 100644 --- a/src/attributes.cpp +++ b/src/attributes.cpp @@ -618,7 +618,7 @@ std::vector<Glib::ustring> sp_attribute_name_list(bool cssattr, bool attr) } } if (add) { - result.push_back(Glib::ustring(prop.name)); + result.emplace_back(prop.name); } } std::sort(result.begin(), result.end()); diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp index 65a6f24b6..503fe6d99 100644 --- a/src/ui/dialog/styledialog.cpp +++ b/src/ui/dialog/styledialog.cpp @@ -617,7 +617,7 @@ void StyleDialog::_readStyleElement() guint32 r2 = 0; // if there's no color, return black r2 = sp_svg_read_color(iter->get_value().c_str(), r2); if (attr_prop.count(iter->name) || - (value != iter->get_value() && (r1 & 0xff == 0 || r1 != r2))) { + (value != iter->get_value() && ((r1 & (0xff) == 0) || r1 != r2))) { row[_mColumns._colStrike] = true; } else { row[_mColumns._colStrike] = false; |