diff options
| author | Jon Phillips <jon@fabricatorz.com> | 2006-08-23 07:08:06 +0000 |
|---|---|---|
| committer | kidproto <kidproto@users.sourceforge.net> | 2006-08-23 07:08:06 +0000 |
| commit | 10880dbfba9afd5a963f5bb36fe9a3707c1c35a1 (patch) | |
| tree | 7a73cfffbb81131a0dfb9c6d799325e363615e8a /src/helper | |
| parent | Updated his name and copyright info... (diff) | |
| download | inkscape-10880dbfba9afd5a963f5bb36fe9a3707c1c35a1.tar.gz inkscape-10880dbfba9afd5a963f5bb36fe9a3707c1c35a1.zip | |
Ok, committed msgloan's patch to convert gbooleans to bools thus completing
one major janitorial task we identified....
(bzr r1633)
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/unit-menu.cpp | 6 | ||||
| -rw-r--r-- | src/helper/unit-menu.h | 2 | ||||
| -rw-r--r-- | src/helper/units.cpp | 2 | ||||
| -rw-r--r-- | src/helper/units.h | 2 | ||||
| -rw-r--r-- | src/helper/window.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index 34a2b6344..bbda0a7c5 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -46,7 +46,7 @@ struct SPUnitSelector { struct SPUnitSelectorClass { GtkHBoxClass parent_class; - gboolean (* set_unit)(SPUnitSelector *us, SPUnit const *old, SPUnit const *new_unit); + bool (* set_unit)(SPUnitSelector *us, SPUnit const *old, SPUnit const *new_unit); }; enum {SET_UNIT, LAST_SIGNAL}; @@ -175,7 +175,7 @@ spus_unit_activate(GtkWidget *widget, SPUnitSelector *us) us->update = TRUE; - gboolean consumed = FALSE; + bool consumed = FALSE; g_signal_emit(G_OBJECT(us), signals[SET_UNIT], 0, old, unit, &consumed); if ( !consumed @@ -333,7 +333,7 @@ sp_unit_selector_remove_adjustment(SPUnitSelector *us, GtkAdjustment *adj) gtk_object_unref(GTK_OBJECT(adj)); } -gboolean +bool sp_unit_selector_update_test(SPUnitSelector const *selector) { g_return_val_if_fail(selector != NULL, FALSE); diff --git a/src/helper/unit-menu.h b/src/helper/unit-menu.h index bf5bb260e..9407afa3f 100644 --- a/src/helper/unit-menu.h +++ b/src/helper/unit-menu.h @@ -38,7 +38,7 @@ void sp_unit_selector_set_unit(SPUnitSelector *selector, SPUnit const *unit); void sp_unit_selector_add_adjustment(SPUnitSelector *selector, GtkAdjustment *adjustment); void sp_unit_selector_remove_adjustment(SPUnitSelector *selector, GtkAdjustment *adjustment); -gboolean sp_unit_selector_update_test(SPUnitSelector const *selector); +bool sp_unit_selector_update_test(SPUnitSelector const *selector); double sp_unit_selector_get_value_in_pixels(SPUnitSelector const *selector, GtkAdjustment *adj); void sp_unit_selector_set_value_in_pixels(SPUnitSelector *selector, GtkAdjustment *adj, double value); diff --git a/src/helper/units.cpp b/src/helper/units.cpp index 448f60302..af9560d7d 100644 --- a/src/helper/units.cpp +++ b/src/helper/units.cpp @@ -119,7 +119,7 @@ sp_unit_free_list(GSList *units) /* These are pure utility */ /* Return TRUE if conversion is possible */ -gboolean +bool sp_convert_distance(gdouble *distance, SPUnit const *from, SPUnit const *to) { g_return_val_if_fail(distance != NULL, FALSE); diff --git a/src/helper/units.h b/src/helper/units.h index 3acb65828..4746fccca 100644 --- a/src/helper/units.h +++ b/src/helper/units.h @@ -130,7 +130,7 @@ void sp_unit_free_list (GSList *units); /* These are pure utility */ /* Return TRUE if conversion is possible, FALSE if unit bases differ */ -gboolean sp_convert_distance (gdouble *distance, const SPUnit *from, const SPUnit *to); +bool sp_convert_distance (gdouble *distance, const SPUnit *from, const SPUnit *to); /* If either one is NULL, transconverting to/from that base fails */ /* Generic conversion between volatile units would be useless anyways */ diff --git a/src/helper/window.cpp b/src/helper/window.cpp index 346bd19f1..7bfc28b92 100644 --- a/src/helper/window.cpp +++ b/src/helper/window.cpp @@ -19,7 +19,7 @@ #include "desktop.h" #include "event-context.h" -static gboolean +static bool sp_window_key_press (GtkWidget *widget, GdkEventKey *event) { unsigned int shortcut; |
