Ok, committed msgloan's patch to convert gbooleans to bools thus completing

one major janitorial task we identified....

(bzr r1633)

19 files changed, 56 insertions, 57 deletions

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index f9e854302..e9f44a5d8 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -204,7 +204,7 @@ sp_button_new( Inkscape::IconSize size, SPButtonType type, SPAction *action, SPA
 }
 
 void
-sp_button_toggle_set_down (SPButton *button, gboolean down)
+sp_button_toggle_set_down (SPButton *button, bool down)
 {
 	g_return_if_fail (button->type == SP_BUTTON_TYPE_TOGGLE);
 	g_signal_handlers_block_by_func (G_OBJECT (button), (gpointer)G_CALLBACK (sp_button_perform_action), NULL);
diff --git a/src/widgets/button.h b/src/widgets/button.h
index f14af94d1..0d715053d 100644
--- a/src/widgets/button.h
+++ b/src/widgets/button.h
@@ -53,7 +53,7 @@ GType sp_button_get_type (void);
 
 GtkWidget *sp_button_new (Inkscape::IconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action, GtkTooltips *tooltips);
 
-void sp_button_toggle_set_down (SPButton *button, gboolean down);
+void sp_button_toggle_set_down (SPButton *button, bool down);
 
 GtkWidget *sp_button_new_from_data (Inkscape::IconSize size,
 				    SPButtonType type,
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 0514dd393..6e00998f3 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -34,7 +34,7 @@ void sp_desktop_widget_destroy (SPDesktopWidget* dtw);
 
 gint sp_desktop_widget_set_focus(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw);
 
-void sp_desktop_widget_show_decorations(SPDesktopWidget *dtw, gboolean show);
+void sp_desktop_widget_show_decorations(SPDesktopWidget *dtw, bool show);
 void sp_desktop_widget_fullscreen(SPDesktopWidget *dtw);
 void sp_desktop_widget_layout(SPDesktopWidget *dtw);
 void sp_desktop_widget_update_zoom(SPDesktopWidget *dtw);
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index 3177700c3..9e699d0b2 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -276,7 +276,7 @@ sp_gradient_selector_get_vector (SPGradientSelector *sel)
 static void
 sp_gradient_selector_vector_set (SPGradientVectorSelector *gvs, SPGradient *gr, SPGradientSelector *sel)
 {
-	static gboolean blocked = FALSE;
+	static bool blocked = FALSE;
 
 	if (!blocked) {
 		blocked = TRUE;
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 78ae4213d..81462f56a 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -170,7 +170,7 @@ sp_gradient_vector_selector_new (SPDocument *doc, SPGradient *gr)
 void
 sp_gradient_vector_selector_set_gradient (SPGradientVectorSelector *gvs, SPDocument *doc, SPGradient *gr)
 {
-	static gboolean suppress = FALSE;
+	static bool suppress = FALSE;
 
 	g_return_if_fail (gvs != NULL);
 	g_return_if_fail (SP_IS_GRADIENT_VECTOR_SELECTOR (gvs));
@@ -418,7 +418,7 @@ sp_gvs_defs_modified (SPObject *defs, guint flags, SPGradientVectorSelector *gvs
 static GtkWidget *sp_gradient_vector_widget_new (SPGradient *gradient, SPStop *stop);
 
 static void sp_gradient_vector_widget_load_gradient (GtkWidget *widget, SPGradient *gradient);
-static gint sp_gradient_vector_dialog_delete (GtkWidget *widget, GdkEvent *event, GtkWidget *dialog);
+static bool sp_gradient_vector_dialog_delete (GtkWidget *widget, GdkEvent *event, GtkWidget *dialog);
 static void sp_gradient_vector_dialog_destroy (GtkObject *object, gpointer data);
 
 static void sp_gradient_vector_widget_destroy (GtkObject *object, gpointer data);
@@ -428,7 +428,7 @@ static void sp_gradient_vector_color_dragged (SPColorSelector *csel, GtkObject *
 static void sp_gradient_vector_color_changed (SPColorSelector *csel, GtkObject *object);
 static void update_stop_list( GtkWidget *mnu, SPGradient *gradient, SPStop *new_stop);
 
-static gboolean blocked = FALSE;
+static bool blocked = FALSE;
 
 static void grad_edit_dia_stop_added_or_removed (Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, gpointer data)
 {
@@ -1025,7 +1025,7 @@ sp_gradient_vector_widget_load_gradient (GtkWidget *widget, SPGradient *gradient
 	// Once the user edits a gradient, it stops being auto-collectable
 	if (SP_OBJECT_REPR(gradient)->attribute("inkscape:collect")) {
 		SPDocument *document = SP_OBJECT_DOCUMENT (gradient);
-		gboolean saved = sp_document_get_undo_sensitive(document);
+		bool saved = sp_document_get_undo_sensitive(document);
 		sp_document_set_undo_sensitive (document, FALSE);
 		SP_OBJECT_REPR(gradient)->setAttribute("inkscape:collect", NULL);
 		sp_document_set_undo_sensitive (document, saved);
@@ -1042,7 +1042,7 @@ sp_gradient_vector_dialog_destroy (GtkObject *object, gpointer data)
 	wd.stop = 0;
 }
 
-static gboolean
+static bool
 sp_gradient_vector_dialog_delete (GtkWidget *widget, GdkEvent *event, GtkWidget *dialog)
 {
 	gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 264349bd1..0fadffdc8 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -273,7 +273,7 @@ sp_icon_new_full( Inkscape::IconSize lsize, gchar const *name )
     addPreRender( lsize, name );
 
     GtkStockItem stock;
-    gboolean tryLoad = gtk_stock_lookup( name, &stock );
+    bool tryLoad = gtk_stock_lookup( name, &stock );
     if ( !tryLoad && fallback ) {
         tryLoad |= strncmp("gtk-", name, 4 ) == 0;
     }
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 2f42d590f..025e6be66 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -230,7 +230,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
 }
 
 GtkWidget *
-sp_select_toolbox_spinbutton(gchar *label, gchar *data, float lower_limit, GtkWidget *us, GtkWidget *spw, gchar *tooltip, gboolean altx)
+sp_select_toolbox_spinbutton(gchar *label, gchar *data, float lower_limit, GtkWidget *us, GtkWidget *spw, gchar *tooltip, bool altx)
 {
     GtkTooltips *tt = gtk_tooltips_new();
 
@@ -262,7 +262,7 @@ sp_select_toolbox_spinbutton(gchar *label, gchar *data, float lower_limit, GtkWi
     return hb;
 }
 
-static gboolean aux_set_unit(SPUnitSelector *,
+static bool aux_set_unit(SPUnitSelector *,
                              SPUnit const *old,
                              SPUnit const *new_units,
                              GObject *dlg)
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index c14d89f11..b3fe62262 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -34,8 +34,8 @@ struct SPColorNotebookTracker {
 	const gchar* className;
 	GType type;
 	guint submode;
-	gboolean enabledFull;
-	gboolean enabledBrief;
+	bool enabledFull;
+	bool enabledBrief;
 	SPColorNotebook *backPointer;
 };
 
@@ -154,7 +154,7 @@ gint ColorNotebook::menuHandler( GdkEvent* event )
 
 static void sp_color_notebook_menuitem_response (GtkMenuItem *menuitem, gpointer user_data)
 {
-	gboolean active = FALSE;
+	bool active = FALSE;
 
 	active = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem));
 	SPColorNotebookTracker *entry = reinterpret_cast< SPColorNotebookTracker* > (user_data);
@@ -267,7 +267,7 @@ void ColorNotebook::init()
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (_book), prefs_get_int_attribute ("colorselector", "page", 0));
 
 	{
-		gboolean found = FALSE;
+		bool found = FALSE;
 
 		_popup = gtk_menu_new();
 		GtkMenu *menu = GTK_MENU (_popup);
@@ -493,7 +493,7 @@ void ColorNotebook::_entryGrabbed (SPColorSelector *, SPColorNotebook *colorbook
 
 void ColorNotebook::_entryDragged (SPColorSelector *csel, SPColorNotebook *colorbook)
 {
-	gboolean oldState;
+	bool oldState;
     ColorNotebook* nb = (ColorNotebook*)(SP_COLOR_SELECTOR(colorbook)->base);
 
 	oldState = nb->_dragging;
@@ -512,7 +512,7 @@ void ColorNotebook::_entryReleased (SPColorSelector *, SPColorNotebook *colorboo
 
 void ColorNotebook::_entryChanged (SPColorSelector *csel, SPColorNotebook *colorbook)
 {
-	gboolean oldState;
+	bool oldState;
     ColorNotebook* nb = (ColorNotebook*)(SP_COLOR_SELECTOR(colorbook)->base);
 
 	oldState = nb->_dragging;
diff --git a/src/widgets/sp-color-notebook.h b/src/widgets/sp-color-notebook.h
index ad79437da..dae2767ec 100644
--- a/src/widgets/sp-color-notebook.h
+++ b/src/widgets/sp-color-notebook.h
@@ -54,9 +54,9 @@ protected:
     void _rgbaEntryChanged( GtkEntry* entry );
     void _updateRgbaEntry( const SPColor& color, gfloat alpha );
 
-    gboolean _updating : 1;
-    gboolean _updatingrgba : 1;
-    gboolean _dragging : 1;
+    bool _updating : 1;
+    bool _updatingrgba : 1;
+    bool _dragging : 1;
     gulong _switchId;
     gulong _entryId;
     GtkWidget *_book;
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index 8acd96bbb..ddfb40a8f 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -214,7 +214,7 @@ sp_color_scales_new (void)
 	return GTK_WIDGET (csel);
 }
 
-void ColorScales::_recalcColor( gboolean changing )
+void ColorScales::_recalcColor( bool changing )
 {
     if ( changing )
     {
diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h
index efb557f9b..e7d94ab37 100644
--- a/src/widgets/sp-color-scales.h
+++ b/src/widgets/sp-color-scales.h
@@ -53,14 +53,14 @@ protected:
     void _getCmykaFloatv(gfloat *cmyka);
     guint32 _getRgba32();
     void _updateSliders(guint channels);
-    void _recalcColor(gboolean changing);
+    void _recalcColor(bool changing);
 
     void _setRangeLimit( gdouble upper );
 
     SPColorScalesMode _mode;
     gdouble _rangeLimit;
-    gboolean _updating : 1;
-    gboolean _dragging : 1;
+    bool _updating : 1;
+    bool _dragging : 1;
     GtkAdjustment *_a[5]; /* Channel adjustments */
     GtkWidget *_s[5]; /* Channel sliders */
     GtkWidget *_b[5]; /* Spinbuttons */
diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp
index 1532eddd7..b4af6bf86 100644
--- a/src/widgets/sp-color-selector.cpp
+++ b/src/widgets/sp-color-selector.cpp
@@ -171,7 +171,7 @@ SPColorSpaceType ColorSelector::getColorspace() const
     return type;
 }
 
-gboolean ColorSelector::setColorspace( SPColorSpaceType colorspace )
+bool ColorSelector::setColorspace( SPColorSpaceType colorspace )
 {
     return false;
 }
@@ -262,14 +262,14 @@ void ColorSelector::_released()
 }
 
 // Called from subclasses to update color and broadcast if needed
-void ColorSelector::_updateInternals( const SPColor& color, gfloat alpha, gboolean held )
+void ColorSelector::_updateInternals( const SPColor& color, gfloat alpha, bool held )
 {
     g_return_if_fail( ( 0.0 <= alpha ) && ( alpha <= 1.0 ) );
-    gboolean colorDifferent = ( !sp_color_is_close( &color, &_color, _epsilon )
+    bool colorDifferent = ( !sp_color_is_close( &color, &_color, _epsilon )
                                 || ( fabs((_alpha) - (alpha)) >= _epsilon ) );
 
-    gboolean grabbed = held && !_held;
-    gboolean released = !held && _held;
+    bool grabbed = held && !_held;
+    bool released = !held && _held;
 
     // Store these before emmiting any signals
     _held = held;
diff --git a/src/widgets/sp-color-selector.h b/src/widgets/sp-color-selector.h
index b2fd62b1e..5739f7f15 100644
--- a/src/widgets/sp-color-selector.h
+++ b/src/widgets/sp-color-selector.h
@@ -32,13 +32,13 @@ public:
     virtual guint getSubmode() const;
 
     virtual SPColorSpaceType getColorspace() const;
-    virtual gboolean setColorspace( SPColorSpaceType colorspace );
+    virtual bool setColorspace( SPColorSpaceType colorspace );
 
 protected:
     void _grabbed();
     void _released();
-    void _updateInternals( const SPColor& color, gfloat alpha, gboolean held );
-    gboolean _isHeld() const { return _held; }
+    void _updateInternals( const SPColor& color, gfloat alpha, bool held );
+    bool _isHeld() const { return _held; }
 
     virtual void _colorChanged( const SPColor& color, gfloat alpha );
 
@@ -53,7 +53,7 @@ private:
     ColorSelector( const ColorSelector& obj );
     ColorSelector& operator=( const ColorSelector& obj );
 
-    gboolean _held;
+    bool _held;
 
     bool virgin; // if true, no color is set yet
 };
diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h
index de358d5ac..2e3d7ac12 100644
--- a/src/widgets/sp-color-wheel-selector.h
+++ b/src/widgets/sp-color-wheel-selector.h
@@ -36,10 +36,10 @@ protected:
 
     static void _fooChanged( GtkWidget foo, SPColorWheelSelector *cs );
 
-    void _recalcColor( gboolean changing );
+    void _recalcColor( bool changing );
 
-    gboolean _updating : 1;
-    gboolean _dragging : 1;
+    bool _updating : 1;
+    bool _dragging : 1;
     GtkAdjustment* _adj; /* Channel adjustment */
     GtkWidget* _wheel;
     GtkWidget* _slider;
diff --git a/src/widgets/sp-color-wheel.cpp b/src/widgets/sp-color-wheel.cpp
index 9038b6d38..bf6510287 100644
--- a/src/widgets/sp-color-wheel.cpp
+++ b/src/widgets/sp-color-wheel.cpp
@@ -47,8 +47,7 @@ static void sp_color_wheel_render_hue_wheel (SPColorWheel *wheel);
 static void sp_color_wheel_render_triangle (SPColorWheel *wheel);
 
 
-static gboolean sp_color_wheel_focus(GtkWidget        *widget,
-                                     GtkDirectionType  direction);
+static gboolean  sp_color_wheel_focus(GtkWidget *widget, GtkDirectionType  direction);
 
 static void sp_color_wheel_process_in_triangle( SPColorWheel *wheel, gdouble x, gdouble y );
 
@@ -226,7 +225,7 @@ void sp_color_wheel_set_color( SPColorWheel *wheel, const SPColor* color )
     sp_color_wheel_set_sv(wheel, sat, val);
 }
 
-gboolean sp_color_wheel_is_adjusting( SPColorWheel *wheel )
+bool sp_color_wheel_is_adjusting( SPColorWheel *wheel )
 {
     g_return_val_if_fail( SP_IS_COLOR_WHEEL(wheel), FALSE );
     return wheel->dragging;
@@ -335,7 +334,7 @@ sp_color_wheel_button_press (GtkWidget *widget, GdkEventButton *event)
         gint cx, cw;
         cx = widget->style->xthickness;
         cw = widget->allocation.width - 2 * cx;
-        gboolean grabbed = FALSE;
+        bool grabbed = FALSE;
 
         {
             double dx = event->x - wheel->_center;
@@ -454,7 +453,7 @@ static void sp_color_wheel_set_hue(SPColorWheel *wheel, gdouble hue)
 static void sp_color_wheel_set_sv( SPColorWheel *wheel, gdouble sat, gdouble value )
 {
     static gdouble epsilon = 1e-6;
-    gboolean changed = FALSE;
+    bool changed = FALSE;
 
     if ( ABS( wheel->_sat - sat ) > epsilon )
     {
@@ -1016,7 +1015,7 @@ sp_color_wheel_render_hue_wheel (SPColorWheel *wheel)
     gint x, y;
     guint r, g, b;
     gint size = wheel->_center * 2;
-    gboolean dirty = FALSE;
+    bool dirty = FALSE;
 
     if (wheel->_image && (wheel->_bs < (size * size) )) {
         g_free (wheel->_image);
@@ -1087,10 +1086,10 @@ sp_color_wheel_render_hue_wheel (SPColorWheel *wheel)
 static gboolean sp_color_wheel_focus(GtkWidget        *widget,
                                      GtkDirectionType  direction)
 {
-    gboolean focusKept = FALSE;
-    gboolean wasFocused = GTK_WIDGET_HAS_FOCUS(widget);
+    bool focusKept = FALSE;
+    bool wasFocused = GTK_WIDGET_HAS_FOCUS(widget);
     SPColorWheel* wheel = SP_COLOR_WHEEL(widget);
-    gboolean goingUp = FALSE;
+    bool goingUp = FALSE;
 
     switch ( direction )
     {
diff --git a/src/widgets/sp-color-wheel.h b/src/widgets/sp-color-wheel.h
index d8fceb908..5b01f1a88 100644
--- a/src/widgets/sp-color-wheel.h
+++ b/src/widgets/sp-color-wheel.h
@@ -29,10 +29,10 @@
 struct SPColorWheel {
     GtkWidget widget;
 
-    gboolean dragging : 1;
+    bool dragging : 1;
 
-    gboolean _inTriangle;
-    gboolean _triDirty;
+    bool _inTriangle;
+    bool _triDirty;
     GdkRegion* _triangle;
     GdkPoint _triPoints[3];
     guchar *_triImage;
@@ -64,7 +64,7 @@ GtkWidget *sp_color_wheel_new ();
 void sp_color_wheel_get_color( SPColorWheel *wheel, SPColor* color );
 void sp_color_wheel_set_color( SPColorWheel *wheel, const SPColor* color );
 
-gboolean sp_color_wheel_is_adjusting( SPColorWheel *wheel );
+bool sp_color_wheel_is_adjusting( SPColorWheel *wheel );
 
 #endif
 
diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp
index 14ac51422..893a7a7e0 100644
--- a/src/widgets/spinbutton-events.cpp
+++ b/src/widgets/spinbutton-events.cpp
@@ -22,7 +22,7 @@
 #include "widget-sizes.h"
 
 
-gboolean
+bool
 spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data)
 {
 	gdouble *ini;
@@ -51,7 +51,7 @@ void
 spinbutton_defocus (GtkObject *container)
 {
 	// defocus spinbuttons by moving focus to the canvas, unless "stay" is on
-	gboolean stay = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (container), "stay"));
+	bool stay = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (container), "stay"));
 	if (stay) {
 		gtk_object_set_data (GTK_OBJECT (container), "stay", GINT_TO_POINTER (FALSE));
 	} else {
@@ -62,7 +62,7 @@ spinbutton_defocus (GtkObject *container)
 	}
 }
 
-gboolean
+bool
 spinbutton_keypress (GtkWidget *w, GdkEventKey *event, gpointer data)
 {
 	SPWidget *spw = (SPWidget *) data;
diff --git a/src/widgets/spinbutton-events.h b/src/widgets/spinbutton-events.h
index 868bc195a..eaa999b00 100644
--- a/src/widgets/spinbutton-events.h
+++ b/src/widgets/spinbutton-events.h
@@ -13,9 +13,9 @@
 #include <gtk/gtkstyle.h>      /* GtkWidget */
 #include <gtk/gtktypeutils.h>  /* GtkObject */
 
-gboolean spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data);
+bool spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data);
 void spinbutton_undo (GtkWidget *w);
-gboolean spinbutton_keypress (GtkWidget *w, GdkEventKey *event, gpointer data);
+bool spinbutton_keypress (GtkWidget *w, GdkEventKey *event, gpointer data);
 void spinbutton_defocus (GtkObject *container);
 
 /*
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index ed9259aef..e42f58954 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -775,7 +775,7 @@ sp_tb_spinbutton(
     gchar const *path, gchar const *data, gdouble def,
     GtkWidget *us,
     GtkWidget *tbl,
-    gboolean altx, gchar const *altx_mark,
+    bool altx, gchar const *altx_mark,
     gdouble lower, gdouble upper, gdouble step, gdouble page,
     void (*callback)(GtkAdjustment *, GtkWidget *),
     gdouble climb = 0.1, guint digits = 3, double factor = 1.0)
@@ -1155,7 +1155,7 @@ sp_stb_defaults(GtkWidget *widget, GtkWidget *tbl)
     // fixme: make settable in prefs!
     gint mag = 5;
     gdouble prop = 0.5;
-    gboolean flat = FALSE;
+    bool flat = FALSE;
     gdouble randomized = 0;
     gdouble rounded = 0;