summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/desktop-style.cpp3
-rw-r--r--src/ui/dialog/ocaldialogs.cpp4
-rw-r--r--src/widgets/gradient-vector.cpp4
-rw-r--r--src/widgets/paint-selector.cpp6
-rw-r--r--src/widgets/sp-attribute-widget.cpp4
-rw-r--r--src/widgets/sp-color-notebook.cpp4
-rw-r--r--src/widgets/sp-color-slider.cpp7
-rw-r--r--src/widgets/spw-utilities.cpp3
8 files changed, 14 insertions, 21 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 40132ec58..c632f9033 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -501,7 +501,8 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
|| SP_IS_FLOWTSPAN(parent) || SP_IS_FLOWLINE(parent));
// 1. Bail out with QUERY_STYLE_MULTIPLE_DIFFERENT if necessary
-
+
+ // cppcheck-suppress comparisonOfBoolWithInt
if ((!paintImpossible) && (!paint->isSameType(*paint_res) || (paint_res->set != paint_effectively_set))) {
return QUERY_STYLE_MULTIPLE_DIFFERENT; // different types of paint
}
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index c597bc849..f87288494 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -919,7 +919,7 @@ void ImportDialog::on_image_downloaded(Glib::ustring path, bool success)
m_signal_response.emit(path);
widget_status->set_info(_("Clipart downloaded successfully"));
} catch(Glib::Error) {
- success = false;
+ // success = false; //has no effect, value not returned
}
cancelled_image = false;
@@ -943,7 +943,7 @@ void ImportDialog::on_thumbnail_downloaded(Glib::ustring path, bool success)
widget_status->clear();
preview_files->set_image(path);
} catch(Glib::Error) {
- success = false;
+ // success = false; //has no effect, value not returned
}
cancelled_thumbnail = false;
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index e15f81e0f..118d8a68a 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -1001,8 +1001,6 @@ static GtkWidget * sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *s
GtkWidget * sp_gradient_vector_editor_new(SPGradient *gradient, SPStop *stop)
{
- GtkWidget *wid;
-
if (dlg == NULL) {
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -1044,7 +1042,7 @@ GtkWidget * sp_gradient_vector_editor_new(SPGradient *gradient, SPStop *stop)
gtk_container_set_border_width(GTK_CONTAINER(dlg), PAD);
- wid = static_cast<GtkWidget*>(sp_gradient_vector_widget_new(gradient, stop));
+ GtkWidget *wid = static_cast<GtkWidget*>(sp_gradient_vector_widget_new(gradient, stop));
g_object_set_data(G_OBJECT(dlg), "gradient-vector-widget", wid);
/* Connect signals */
gtk_widget_show(wid);
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index b0738b6a6..08058d60d 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -1138,14 +1138,14 @@ static void sp_paint_selector_set_mode_swatch(SPPaintSelector *psel, SPPaintSele
gtk_widget_set_sensitive(psel->style, TRUE);
- SwatchSelector *swatchsel = 0;
+ SwatchSelector *swatchsel = NULL;
if (psel->mode == SPPaintSelector::MODE_SWATCH){
- swatchsel = static_cast<SwatchSelector*>(g_object_get_data(G_OBJECT(psel->selector), "swatch-selector"));
+ // swatchsel = static_cast<SwatchSelector*>(g_object_get_data(G_OBJECT(psel->selector), "swatch-selector"));
} else {
sp_paint_selector_clear_frame(psel);
// Create new gradient selector
- SwatchSelector *swatchsel = new SwatchSelector();
+ swatchsel = new SwatchSelector();
swatchsel->show();
swatchsel->connectGrabbedHandler( G_CALLBACK(sp_paint_selector_gradient_grabbed), psel );
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index 1f0fcd94e..4196e62bf 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -101,14 +101,12 @@ SPAttributeTable::~SPAttributeTable ()
void SPAttributeTable::clear(void)
{
- Gtk::Widget *w;
-
if (table)
{
std::vector<Gtk::Widget*> ch = table->get_children();
for (int i = (ch.size())-1; i >=0 ; i--)
{
- w = ch[i];
+ Gtk::Widget *w = ch[i];
ch.pop_back();
if (w != NULL)
{
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 588221a7c..89c5ed76a 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -165,9 +165,7 @@ gint ColorNotebook::menuHandler( GdkEvent* event )
static void sp_color_notebook_menuitem_response (GtkMenuItem *menuitem, gpointer user_data)
{
- gboolean active = FALSE;
-
- active = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem));
+ gboolean active = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem));
SPColorNotebookTracker *entry = reinterpret_cast< SPColorNotebookTracker* > (user_data);
if ( entry )
{
diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp
index 471ee3852..9b13ba1c5 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/widgets/sp-color-slider.cpp
@@ -729,7 +729,7 @@ sp_color_slider_render_map (gint x0, gint y0, gint width, gint height,
{
static guchar *buf = NULL;
static gint bs = 0;
- guchar *dp, *sp;
+ guchar *dp;
gint x, y;
if (buf && (bs < width * height)) {
@@ -744,13 +744,12 @@ sp_color_slider_render_map (gint x0, gint y0, gint width, gint height,
dp = buf;
for (x = x0; x < x0 + width; x++) {
gint cr, cg, cb, ca;
- guchar *d;
- sp = map + 4 * (start >> 16);
+ guchar *d = dp;
+ guchar *sp = map + 4 * (start >> 16);
cr = *sp++;
cg = *sp++;
cb = *sp++;
ca = *sp++;
- d = dp;
for (y = y0; y < y0 + height; y++) {
guint bg, fc;
/* Background value */
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index ce8ce388d..7fca56f56 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -333,7 +333,6 @@ gpointer sp_search_by_data_recursive(GtkWidget *w, gpointer key)
GtkWidget *sp_search_by_value_recursive(GtkWidget *w, gchar *key, gchar *value)
{
gchar *r = NULL;
- GtkWidget *child;
if (w && G_IS_OBJECT(w)) {
r = (gchar *) g_object_get_data(G_OBJECT(w), key);
@@ -343,7 +342,7 @@ GtkWidget *sp_search_by_value_recursive(GtkWidget *w, gchar *key, gchar *value)
if (GTK_IS_CONTAINER(w)) {
GList *ch = gtk_container_get_children (GTK_CONTAINER(w));
for (GList *i = ch; i != NULL; i = i->next) {
- child = sp_search_by_value_recursive(GTK_WIDGET(i->data), key, value);
+ GtkWidget *child = sp_search_by_value_recursive(GTK_WIDGET(i->data), key, value);
if (child) return child;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 12:24:05 +0000