peeled back the gboolean code as it hit on some complexity theory principles...

need to rethink and incrementally change gbooleans to bools

(bzr r1637)

19 files changed, 57 insertions, 56 deletions

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index e9f44a5d8..f9e854302 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, bool down)
+sp_button_toggle_set_down (SPButton *button, gboolean 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 0d715053d..f14af94d1 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, bool down);
+void sp_button_toggle_set_down (SPButton *button, gboolean 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 6e00998f3..0514dd393 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, bool show);
+void sp_desktop_widget_show_decorations(SPDesktopWidget *dtw, gboolean 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 9e699d0b2..3177700c3 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 bool blocked = FALSE;
+	static gboolean blocked = FALSE;
 
 	if (!blocked) {
 		blocked = TRUE;
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 81462f56a..78ae4213d 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 bool suppress = FALSE;
+	static gboolean 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 bool sp_gradient_vector_dialog_delete (GtkWidget *widget, GdkEvent *event, GtkWidget *dialog);
+static gint 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 bool blocked = FALSE;
+static gboolean 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);
-		bool saved = sp_document_get_undo_sensitive(document);
+		gboolean 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 bool
+static gboolean
 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 0fadffdc8..264349bd1 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;
-    bool tryLoad = gtk_stock_lookup( name, &stock );
+    gboolean 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 025e6be66..2f42d590f 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, bool altx)
+sp_select_toolbox_spinbutton(gchar *label, gchar *data, float lower_limit, GtkWidget *us, GtkWidget *spw, gchar *tooltip, gboolean 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 bool aux_set_unit(SPUnitSelector *,
+static gboolean 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 b3fe62262..c14d89f11 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;
-	bool enabledFull;
-	bool enabledBrief;
+	gboolean enabledFull;
+	gboolean enabledBrief;
 	SPColorNotebook *backPointer;
 };
 
@@ -154,7 +154,7 @@ gint ColorNotebook::menuHandler( GdkEvent* event )
 
 static void sp_color_notebook_menuitem_response (GtkMenuItem *menuitem, gpointer user_data)
 {
-	bool active = FALSE;
+	gboolean 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));
 
 	{
-		bool found = FALSE;
+		gboolean 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)
 {
-	bool oldState;
+	gboolean 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)
 {
-	bool oldState;
+	gboolean 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 dae2767ec..ad79437da 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 );
 
-    bool _updating : 1;
-    bool _updatingrgba : 1;
-    bool _dragging : 1;
+    gboolean _updating : 1;
+    gboolean _updatingrgba : 1;
+    gboolean _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 ddfb40a8f..8acd96bbb 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( bool changing )
+void ColorScales::_recalcColor( gboolean changing )
 {
     if ( changing )
     {
diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h
index e7d94ab37..efb557f9b 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(bool changing);
+    void _recalcColor(gboolean changing);
 
     void _setRangeLimit( gdouble upper );
 
     SPColorScalesMode _mode;
     gdouble _rangeLimit;
-    bool _updating : 1;
-    bool _dragging : 1;
+    gboolean _updating : 1;
+    gboolean _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 b4af6bf86..1532eddd7 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;
 }
 
-bool ColorSelector::setColorspace( SPColorSpaceType colorspace )
+gboolean 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, bool held )
+void ColorSelector::_updateInternals( const SPColor& color, gfloat alpha, gboolean held )
 {
     g_return_if_fail( ( 0.0 <= alpha ) && ( alpha <= 1.0 ) );
-    bool colorDifferent = ( !sp_color_is_close( &color, &_color, _epsilon )
+    gboolean colorDifferent = ( !sp_color_is_close( &color, &_color, _epsilon )
                                 || ( fabs((_alpha) - (alpha)) >= _epsilon ) );
 
-    bool grabbed = held && !_held;
-    bool released = !held && _held;
+    gboolean grabbed = held && !_held;
+    gboolean 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 5739f7f15..b2fd62b1e 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 bool setColorspace( SPColorSpaceType colorspace );
+    virtual gboolean setColorspace( SPColorSpaceType colorspace );
 
 protected:
     void _grabbed();
     void _released();
-    void _updateInternals( const SPColor& color, gfloat alpha, bool held );
-    bool _isHeld() const { return _held; }
+    void _updateInternals( const SPColor& color, gfloat alpha, gboolean held );
+    gboolean _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 );
 
-    bool _held;
+    gboolean _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 2e3d7ac12..de358d5ac 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( bool changing );
+    void _recalcColor( gboolean changing );
 
-    bool _updating : 1;
-    bool _dragging : 1;
+    gboolean _updating : 1;
+    gboolean _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 bf6510287..9038b6d38 100644
--- a/src/widgets/sp-color-wheel.cpp
+++ b/src/widgets/sp-color-wheel.cpp
@@ -47,7 +47,8 @@ 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 );
 
@@ -225,7 +226,7 @@ void sp_color_wheel_set_color( SPColorWheel *wheel, const SPColor* color )
     sp_color_wheel_set_sv(wheel, sat, val);
 }
 
-bool sp_color_wheel_is_adjusting( SPColorWheel *wheel )
+gboolean sp_color_wheel_is_adjusting( SPColorWheel *wheel )
 {
     g_return_val_if_fail( SP_IS_COLOR_WHEEL(wheel), FALSE );
     return wheel->dragging;
@@ -334,7 +335,7 @@ sp_color_wheel_button_press (GtkWidget *widget, GdkEventButton *event)
         gint cx, cw;
         cx = widget->style->xthickness;
         cw = widget->allocation.width - 2 * cx;
-        bool grabbed = FALSE;
+        gboolean grabbed = FALSE;
 
         {
             double dx = event->x - wheel->_center;
@@ -453,7 +454,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;
-    bool changed = FALSE;
+    gboolean changed = FALSE;
 
     if ( ABS( wheel->_sat - sat ) > epsilon )
     {
@@ -1015,7 +1016,7 @@ sp_color_wheel_render_hue_wheel (SPColorWheel *wheel)
     gint x, y;
     guint r, g, b;
     gint size = wheel->_center * 2;
-    bool dirty = FALSE;
+    gboolean dirty = FALSE;
 
     if (wheel->_image && (wheel->_bs < (size * size) )) {
         g_free (wheel->_image);
@@ -1086,10 +1087,10 @@ sp_color_wheel_render_hue_wheel (SPColorWheel *wheel)
 static gboolean sp_color_wheel_focus(GtkWidget        *widget,
                                      GtkDirectionType  direction)
 {
-    bool focusKept = FALSE;
-    bool wasFocused = GTK_WIDGET_HAS_FOCUS(widget);
+    gboolean focusKept = FALSE;
+    gboolean wasFocused = GTK_WIDGET_HAS_FOCUS(widget);
     SPColorWheel* wheel = SP_COLOR_WHEEL(widget);
-    bool goingUp = FALSE;
+    gboolean goingUp = FALSE;
 
     switch ( direction )
     {
diff --git a/src/widgets/sp-color-wheel.h b/src/widgets/sp-color-wheel.h
index 5b01f1a88..d8fceb908 100644
--- a/src/widgets/sp-color-wheel.h
+++ b/src/widgets/sp-color-wheel.h
@@ -29,10 +29,10 @@
 struct SPColorWheel {
     GtkWidget widget;
 
-    bool dragging : 1;
+    gboolean dragging : 1;
 
-    bool _inTriangle;
-    bool _triDirty;
+    gboolean _inTriangle;
+    gboolean _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 );
 
-bool sp_color_wheel_is_adjusting( SPColorWheel *wheel );
+gboolean sp_color_wheel_is_adjusting( SPColorWheel *wheel );
 
 #endif
 
diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp
index 893a7a7e0..14ac51422 100644
--- a/src/widgets/spinbutton-events.cpp
+++ b/src/widgets/spinbutton-events.cpp
@@ -22,7 +22,7 @@
 #include "widget-sizes.h"
 
 
-bool
+gboolean
 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
-	bool stay = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (container), "stay"));
+	gboolean 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)
 	}
 }
 
-bool
+gboolean
 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 eaa999b00..868bc195a 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 */
 
-bool spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data);
+gboolean spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data);
 void spinbutton_undo (GtkWidget *w);
-bool spinbutton_keypress (GtkWidget *w, GdkEventKey *event, gpointer data);
+gboolean 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 e42f58954..ed9259aef 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,
-    bool altx, gchar const *altx_mark,
+    gboolean 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;
-    bool flat = FALSE;
+    gboolean flat = FALSE;
     gdouble randomized = 0;
     gdouble rounded = 0;