Warning cleanup

(bzr r6367)

3 files changed, 24 insertions, 21 deletions

diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 836eb8fd4..d577a6cc4 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -209,17 +209,19 @@ template< typename T> class ComboWithTooltip : public Gtk::EventBox
 public:
     ComboWithTooltip<T>(T default_value, const Util::EnumDataConverter<T>& c, const SPAttributeEnum a = SP_ATTR_INVALID, char* tip_text = NULL)
     {
-        if (tip_text) _tt.set_tip(*this, tip_text);
+        if (tip_text) {
+            _tt.set_tip(*this, tip_text);
+        }
         combo = new ComboBoxEnum<T>(default_value, c, a);
         add(*combo);
         show_all();
     }
-    
+
     ~ComboWithTooltip()
     {
         delete combo;
     }
-    
+
     ComboBoxEnum<T>* get_attrwidget()
     {
         return combo;
@@ -315,7 +317,7 @@ public:
         }
         _s1.set_value(n.getNumber());
         _s2.set_value(n.getOptNumber());
-        
+
     }
 private:
     Gtk::SpinButton _s1, _s2;
@@ -869,7 +871,7 @@ public:
         std::vector<double> default_values;
         default_values.push_back(def1);
         default_values.push_back(def2);
-        
+
         std::vector<char*> tips;
         tips.push_back(tip1);
         tips.push_back(tip2);
@@ -1901,10 +1903,11 @@ bool FilterEffectsDialog::PrimitiveList::on_button_release_event(GdkEventButton*
             const int sources_x = rct.get_width() - twidth * FPInputConverter._length;
             if(cx > sources_x) {
                 int src = (cx - sources_x) / twidth;
-                if(src < 0)
+                if (src < 0) {
                     src = 0;
-                else if(src >= FPInputConverter._length)
+                } else if(src >= static_cast<int>(FPInputConverter._length)) {
                     src = FPInputConverter._length - 1;
+                }
                 result = FPInputConverter.get_key((FilterPrimitiveInput)src);
                 in_val = result.c_str();
             }
@@ -2178,7 +2181,7 @@ void FilterEffectsDialog::init_settings_widgets()
 
     _empty_settings.set_sensitive(false);
     _settings_tab1.pack_start(_empty_settings);
-    
+
     _no_filter_selected.set_sensitive(false);
     _settings_tab2.pack_start(_no_filter_selected);
     _settings_initialized = true;
@@ -2482,7 +2485,7 @@ void FilterEffectsDialog::update_settings_view()
         _infobox_icon.hide();
         _infobox_desc.hide();
     }
-    
+
     SPFilterPrimitive* prim = _primitive_list.get_selected();
 
     if(prim) {
diff --git a/src/ui/widget/combo-enums.h b/src/ui/widget/combo-enums.h
index 11640f3ca..c418ea28b 100644
--- a/src/ui/widget/combo-enums.h
+++ b/src/ui/widget/combo-enums.h
@@ -37,7 +37,7 @@ public:
         pack_start(_columns.label);
 
         // Initialize list
-        for(int i = 0; i < _converter._length; ++i) {
+        for(int i = 0; i < static_cast<int>(_converter._length); ++i) {
             Gtk::TreeModel::Row row = *_model->append();
             const Util::EnumData<E>* data = &_converter.data(i);
             row[_columns.data] = data;
diff --git a/src/ui/widget/icon-widget.cpp b/src/ui/widget/icon-widget.cpp
index 7e812236f..64415f421 100644
--- a/src/ui/widget/icon-widget.cpp
+++ b/src/ui/widget/icon-widget.cpp
@@ -28,14 +28,14 @@ namespace Widget {
  *
  *    An icon widget is a ...
  */
-  
-IconWidget::IconWidget() 
+
+IconWidget::IconWidget()
 {
     _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)
 {
     _size = std::max((int unsigned)128, std::min(size, (int unsigned)1));
 
@@ -48,19 +48,19 @@ IconWidget::IconWidget(int unsigned size, int unsigned scale, gchar const *name)
         _pb = NULL;
     } else {
         /* TODO
-        _pb = gdk_pixbuf_new_from_data(pixels, GDK_COLORSPACE_RGB, 
-                                       TRUE, 8, _size, _size, _size * 4, 
+        _pb = gdk_pixbuf_new_from_data(pixels, GDK_COLORSPACE_RGB,
+                                       TRUE, 8, _size, _size, _size * 4,
                                        (GdkPixbufDestroyNotify)g_free, NULL);
         */
     }
 }
 
-IconWidget::IconWidget(int unsigned size, guchar const *px)
+IconWidget::IconWidget(int unsigned size, guchar const */*px*/)
 {
     _size = std::max((int unsigned)128, std::min(size, (int unsigned)1));
 
     /*
-    _pb = gdk_pixbuf_new_from_data((guchar *)px, GDK_COLORSPACE_RGB, 
+    _pb = gdk_pixbuf_new_from_data((guchar *)px, GDK_COLORSPACE_RGB,
                                    TRUE, 8, _size, _size, _size * 4, NULL, NULL);
     */
 }
@@ -132,19 +132,19 @@ guchar* IconWidget::image_load(gchar const *name, int unsigned size, int unsigne
     return px;
 }
 
-guchar* IconWidget::image_load_pixmap(gchar const *name, int unsigned size, int unsigned scale)
+guchar* IconWidget::image_load_pixmap(gchar const */*name*/, int unsigned /*size*/, int unsigned /*scale*/)
 {
     // TODO
     return NULL;
 }
 
-guchar* IconWidget::image_load_svg(gchar const *name, int unsigned size, int unsigned scale)
+guchar* IconWidget::image_load_svg(gchar const */*name*/, int unsigned /*size*/, int unsigned /*scale*/)
 {
     // TODO
     return NULL;
 }
 
-guchar* IconWidget::image_load_gtk(gchar const *name, int unsigned size, int unsigned scale)
+guchar* IconWidget::image_load_gtk(gchar const */*name*/, int unsigned /*size*/, int unsigned /*scale*/)
 {
     // TODO
     return NULL;
@@ -154,7 +154,7 @@ guchar* IconWidget::image_load_gtk(gchar const *name, int unsigned size, int uns
 } // namespace UI
 } // namespace Inkscape
 
-/* 
+/*
   Local Variables:
   mode:c++
   c-file-style:"stroustrup"