diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2011-11-13 19:18:47 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2011-11-13 19:18:47 +0000 |
| commit | 354f364c1ce5428453a8601b31c91b910b7b8ef3 (patch) | |
| tree | 0fedb85cf38f3fd0f41e15d66e2cb8266f5769c1 /src/ui/widget/icon-widget.cpp | |
| parent | cppcheck: initialization / warning cleanup (diff) | |
| download | inkscape-354f364c1ce5428453a8601b31c91b910b7b8ef3.tar.gz inkscape-354f364c1ce5428453a8601b31c91b910b7b8ef3.zip | |
various: warnings and initalization
(bzr r10737)
Diffstat (limited to 'src/ui/widget/icon-widget.cpp')
| -rw-r--r-- | src/ui/widget/icon-widget.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/ui/widget/icon-widget.cpp b/src/ui/widget/icon-widget.cpp index 1bc4ad308..b671e8812 100644 --- a/src/ui/widget/icon-widget.cpp +++ b/src/ui/widget/icon-widget.cpp @@ -19,13 +19,16 @@ namespace Inkscape { namespace UI { namespace Widget { -IconWidget::IconWidget() +IconWidget::IconWidget() : + _pb(0), + _size(0), + _do_bitmap_icons(false) { - _pb = NULL; - _size = 0; } -IconWidget::IconWidget(int unsigned size, int unsigned scale, gchar const *name) +IconWidget::IconWidget(int unsigned size, int unsigned scale, gchar const *name) : + _pb(0), + _do_bitmap_icons(false) { _size = std::max((int unsigned)128, std::min(size, (int unsigned)1)); @@ -35,7 +38,7 @@ IconWidget::IconWidget(int unsigned size, int unsigned scale, gchar const *name) if (pixels == NULL) { g_warning("Couldn't find matching icon for %s - has this application been installed?", name); - _pb = NULL; + //_pb = NULL; } else { /* TODO _pb = gdk_pixbuf_new_from_data(pixels, GDK_COLORSPACE_RGB, @@ -45,7 +48,9 @@ IconWidget::IconWidget(int unsigned size, int unsigned scale, gchar const *name) } } -IconWidget::IconWidget(int unsigned size, guchar const */*px*/) +IconWidget::IconWidget(int unsigned size, guchar const */*px*/) : + _pb(0), + _do_bitmap_icons(false) { _size = std::max((int unsigned)128, std::min(size, (int unsigned)1)); |