From 5d6f51f32ca2356b0d6155015457a83e60b314e8 Mon Sep 17 00:00:00 2001
From: Jon Phillips <jon@fabricatorz.com>
Date: Fri, 25 Aug 2006 07:03:19 +0000
Subject: peeled back the gboolean code as it hit on some complexity theory
 principles... need to rethink and incrementally change gbooleans to bools

(bzr r1637)
---
 src/ui/dialog/dialog.cpp            | 2 +-
 src/ui/view/view-widget.h           | 4 ++--
 src/ui/widget/registered-widget.cpp | 8 ++++----
 src/ui/widget/tolerance-slider.cpp  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 1a4816c88..074ee0d36 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -36,7 +36,7 @@ namespace UI {
 namespace Dialog {
 
 #ifndef WIN32
-static bool
+static gboolean
 sp_retransientize_again (gpointer dlgPtr)
 {
     Dialog *dlg = (Dialog *)dlgPtr;
diff --git a/src/ui/view/view-widget.h b/src/ui/view/view-widget.h
index 6c66ff64e..9b5e9c4a8 100644
--- a/src/ui/view/view-widget.h
+++ b/src/ui/view/view-widget.h
@@ -61,7 +61,7 @@ class SPViewWidget {
 	sp_view_widget_set_view(this, view);
     }
 
-    bool shutdown() {
+    gboolean shutdown() {
 	return sp_view_widget_shutdown(this);
     }
 
@@ -80,7 +80,7 @@ class SPViewWidgetClass {
     /// Virtual method about view size change
     void (* view_resized) (SPViewWidget *vw, Inkscape::UI::View::View *view, gdouble width, gdouble height);
 
-    bool (* shutdown) (SPViewWidget *vw);
+    gboolean (* shutdown) (SPViewWidget *vw);
 };
 
 #endif
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 1f688fc38..4ac73e484 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -94,7 +94,7 @@ RegisteredCheckButton::on_toggled()
     Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
     _wr->setUpdating (true);
 
-    bool saved = sp_document_get_undo_sensitive (doc);
+    gboolean saved = sp_document_get_undo_sensitive (doc);
     sp_document_set_undo_sensitive (doc, FALSE);
     sp_repr_set_boolean(repr, _key.c_str(), _button->get_active());
     doc->rroot->setAttribute("sodipodi:modified", "true");
@@ -152,7 +152,7 @@ RegisteredUnitMenu::on_changed()
     _wr->setUpdating (true);
 
     SPDocument *doc = sp_desktop_document(dt);
-    bool saved = sp_document_get_undo_sensitive (doc);
+    gboolean saved = sp_document_get_undo_sensitive (doc);
     sp_document_set_undo_sensitive (doc, FALSE);
     Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
     repr->setAttribute(_key.c_str(), os.str().c_str());
@@ -220,7 +220,7 @@ RegisteredScalarUnit::on_value_changed()
     _wr->setUpdating (true);
 
     SPDocument *doc = sp_desktop_document(dt);
-    bool saved = sp_document_get_undo_sensitive (doc);
+    gboolean saved = sp_document_get_undo_sensitive (doc);
     sp_document_set_undo_sensitive (doc, FALSE);
     Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
     repr->setAttribute(_key.c_str(), os.str().c_str());
@@ -395,7 +395,7 @@ RegisteredRadioButtonPair::on_value_changed()
     
     bool second = _rb2->get_active();
     SPDocument *doc = sp_desktop_document(dt);
-    bool saved = sp_document_get_undo_sensitive (doc);
+    gboolean saved = sp_document_get_undo_sensitive (doc);
     sp_document_set_undo_sensitive (doc, FALSE);
     Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
     repr->setAttribute(_key.c_str(), second ? "true" : "false");
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 792c84efb..b7839284a 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -163,7 +163,7 @@ ToleranceSlider::update (double val)
     _wr->setUpdating (true);
 
     SPDocument *doc = sp_desktop_document(dt);
-    bool saved = sp_document_get_undo_sensitive (doc);
+    gboolean saved = sp_document_get_undo_sensitive (doc);
     sp_document_set_undo_sensitive (doc, FALSE);
     Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
     repr->setAttribute(_key.c_str(), os.str().c_str());
-- 
cgit v1.2.3