diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2012-04-04 18:36:46 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2012-04-04 18:36:46 +0000 |
| commit | d03872f4a6134627171a13e000c32648c412e100 (patch) | |
| tree | e59f7105214a786431c7dc8c38139d47cb4544f8 /src | |
| parent | png export dialog: memory leak fix (diff) | |
| download | inkscape-d03872f4a6134627171a13e000c32648c412e100.tar.gz inkscape-d03872f4a6134627171a13e000c32648c412e100.zip | |
cppcheck
(bzr r11149)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/swatches.cpp | 6 | ||||
| -rw-r--r-- | src/ui/dialog/xml-tree.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index 29492db55..a1768363c 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -420,11 +420,11 @@ void _loadPaletteFile( gchar const *filename ) inHeader = false; ptr = block; Glib::ustring name(""); - int r = 0; - int g = 0; - int b = 0; skipWhitespace(ptr); if ( *ptr ) { + int r = 0; + int g = 0; + int b = 0; hasErr = parseNum(ptr, r); if ( !hasErr ) { skipWhitespace(ptr); diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 51aea2935..357114626 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -513,7 +513,7 @@ void XmlTree::on_tree_select_row(GtkCTree *tree, gint /*column*/, gpointer data) { - XmlTree *self = (XmlTree *)data; + XmlTree *self = static_cast<XmlTree *>(data); Inkscape::XML::Node *repr = sp_xmlview_tree_node_get_repr(SP_XMLVIEW_TREE(tree), node); g_assert(repr != NULL); @@ -539,7 +539,7 @@ void XmlTree::on_tree_unselect_row(GtkCTree *tree, gint /*column*/, gpointer data) { - XmlTree *self = (XmlTree *)data; + XmlTree *self = static_cast<XmlTree *>(data); if (self->blocked) { return; @@ -569,7 +569,7 @@ void XmlTree::after_tree_move(GtkCTree */*tree*/, GtkCTreeNode *new_sibling, gpointer data) { - XmlTree *self = (XmlTree *)data; + XmlTree *self = static_cast<XmlTree *>(data); if (GTK_CTREE_ROW(node)->parent == new_parent && GTK_CTREE_ROW(node)->sibling == new_sibling) @@ -732,7 +732,7 @@ void XmlTree::on_tree_unselect_row_hide() void XmlTree::on_attr_select_row(GtkTreeSelection *selection, gpointer data) { - XmlTree *self = (XmlTree *)data; + XmlTree *self = static_cast<XmlTree *>(data); GtkTreeIter iter; GtkTreeModel *model; @@ -899,7 +899,7 @@ void XmlTree::cmd_new_element_node() gchar *new_name = g_strdup(name_entry->get_text().c_str()); - if (selected_repr != NULL && new_name) { + if (new_name) { Inkscape::XML::Document *xml_doc = current_document->getReprDoc(); Inkscape::XML::Node *new_repr; new_repr = xml_doc->createElement(new_name); |