From 8229841a4e1023cd87591a26761f247efec8b2a2 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 11 Oct 2012 19:04:57 +0200 Subject: QGtkStyle: fix a warning Commit c0893962ef94f12594f936ef2a50db6d0328eca0 added two definitions of a variable named gtkToggleButtonStyle in nested scopes. Because of name lookup rules, the second one wasn't initialised with the first one, but with itself. This leaves the second gtkToggleButtonStyle uninit'ed. Simply remove the surplus declaration, leaving the name to the original declaration. Change-Id: I2269e1093f54643ff4dce27b39cc033db6697782 Reviewed-by: J-P Nurmi --- src/widgets/styles/qgtkstyle.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index 552e2354c5..9bcf45e928 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -1935,7 +1935,6 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom gint interiorFocus = true; d->gtk_widget_style_get(gtkToggleButton, "interior-focus", &interiorFocus, NULL); - GtkStyle *gtkToggleButtonStyle = gtkToggleButtonStyle; int xt = interiorFocus ? gtkToggleButtonStyle->xthickness : 0; int yt = interiorFocus ? gtkToggleButtonStyle->ythickness : 0; if (focus && ((option->state & State_KeyboardFocusChange) || styleHint(SH_UnderlineShortcut, option, widget))) -- cgit v1.2.3