diff options
| author | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-08-03 14:56:48 +0000 |
|---|---|---|
| committer | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-08-03 14:56:48 +0000 |
| commit | 2d71db83e3fe52505116fecf024f79a9777d4ee1 (patch) | |
| tree | 07b5e7b87af9ea1ba6bedd8b39fd96b0a13944c7 /src/live_effects/parameter/togglebutton.h | |
| parent | Renamed some functions, fixed tests (diff) | |
| parent | Removed unused includes, decreased compilation time. Once again (diff) | |
| download | inkscape-2d71db83e3fe52505116fecf024f79a9777d4ee1.tar.gz inkscape-2d71db83e3fe52505116fecf024f79a9777d4ee1.zip | |
Merged trunk
(bzr r14954.1.29)
Diffstat (limited to 'src/live_effects/parameter/togglebutton.h')
| -rw-r--r-- | src/live_effects/parameter/togglebutton.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/live_effects/parameter/togglebutton.h b/src/live_effects/parameter/togglebutton.h index 4e545bcfd..8390fec86 100644 --- a/src/live_effects/parameter/togglebutton.h +++ b/src/live_effects/parameter/togglebutton.h @@ -59,10 +59,10 @@ private: void refresh_button(); bool value; bool defvalue; - const Glib::ustring inactiveLabel; - const char * iconActive; - const char * iconInactive; - Inkscape::IconSize iconSize; + const Glib::ustring inactive_label; + const char * _icon_active; + const char * _icon_inactive; + Inkscape::IconSize _icon_size; Inkscape::UI::Widget::RegisteredToggleButton * checkwdg; sigc::signal<void> _signal_toggled; |