summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorJon Phillips <jon@fabricatorz.com>2006-08-25 07:03:19 +0000
committerkidproto <kidproto@users.sourceforge.net>2006-08-25 07:03:19 +0000
commit5d6f51f32ca2356b0d6155015457a83e60b314e8 (patch)
tree835131f8041d12103ea82dc6b23917443f61cd42 /src/extension
parentI peeled back my changes because of some deep error. (diff)
downloadinkscape-5d6f51f32ca2356b0d6155015457a83e60b314e8.tar.gz
inkscape-5d6f51f32ca2356b0d6155015457a83e60b314e8.zip
peeled back the gboolean code as it hit on some complexity theory principles...
need to rethink and incrementally change gbooleans to bools (bzr r1637)
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/init.cpp4
-rw-r--r--src/extension/input.cpp2
-rw-r--r--src/extension/internal/ps.cpp2
-rw-r--r--src/extension/internal/svg.cpp4
-rw-r--r--src/extension/internal/win32.cpp6
-rw-r--r--src/extension/internal/win32.h2
-rw-r--r--src/extension/system.cpp2
7 files changed, 11 insertions, 11 deletions
diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index e52600f8a..756fff964 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -53,7 +53,7 @@
#include "prefs-utils.h"
#include "io/sys.h"
-extern bool inkscape_app_use_gui( Inkscape::Application const *app );
+extern gboolean inkscape_app_use_gui( Inkscape::Application const *app );
namespace Inkscape {
namespace Extension {
@@ -81,7 +81,7 @@ update_pref(gchar const *pref_path, gchar const *pref_attr,
{
gchar const *pref = prefs_get_string_attribute(pref_path,pref_attr);
/*
- bool missing=TRUE;
+ gboolean missing=TRUE;
for (GSList *list = extension_family; list; list = g_slist_next(list)) {
g_assert( list->data );
diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index aaa3f1415..68eb31e7b 100644
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -165,7 +165,7 @@ Input::open (const gchar *uri)
if (doc != NULL) {
Inkscape::XML::Node * repr = sp_document_repr_root(doc);
- bool saved = sp_document_get_undo_sensitive(doc);
+ gboolean saved = sp_document_get_undo_sensitive(doc);
sp_document_set_undo_sensitive (doc, FALSE);
repr->setAttribute("inkscape:output_extension", output_extension);
sp_document_set_undo_sensitive (doc, saved);
diff --git a/src/extension/internal/ps.cpp b/src/extension/internal/ps.cpp
index b4a3f8904..01387ca19 100644
--- a/src/extension/internal/ps.cpp
+++ b/src/extension/internal/ps.cpp
@@ -221,7 +221,7 @@ PrintPS::setup(Inkscape::Extension::Print * mod)
unsigned int
PrintPS::begin(Inkscape::Extension::Print *mod, SPDocument *doc)
{
- bool epsexport = false;
+ gboolean epsexport = false;
_latin1_encoded_fonts.clear();
_newlatin1font_proc_defined = false;
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index 55ba10ff9..ab9c59830 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -198,7 +198,7 @@ Svg::save (Inkscape::Extension::Output *mod, SPDocument *doc, const gchar *uri)
gchar *save_path = g_path_get_dirname (uri);
- bool const spns = (!mod->get_id()
+ gboolean const spns = (!mod->get_id()
|| !strcmp (mod->get_id(), SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE)
|| !strcmp (mod->get_id(), SP_MODULE_KEY_OUTPUT_SVGZ_INKSCAPE));
@@ -214,7 +214,7 @@ Svg::save (Inkscape::Extension::Output *mod, SPDocument *doc, const gchar *uri)
Inkscape::IO::fixupHrefs( doc, save_path, spns );
- bool const s = sp_repr_save_file (sp_repr_document (repr), uri, SP_SVG_NS_URI);
+ gboolean const s = sp_repr_save_file (sp_repr_document (repr), uri, SP_SVG_NS_URI);
if (s == FALSE) {
throw Inkscape::Extension::Output::save_failed();
}
diff --git a/src/extension/internal/win32.cpp b/src/extension/internal/win32.cpp
index 1ea51f6b9..51dbd3a00 100644
--- a/src/extension/internal/win32.cpp
+++ b/src/extension/internal/win32.cpp
@@ -97,11 +97,11 @@ my_timer (HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
/* Platform detection */
-bool
+gboolean
PrintWin32::is_os_wide()
{
- static bool initialized = FALSE;
- static bool is_wide = FALSE;
+ static gboolean initialized = FALSE;
+ static gboolean is_wide = FALSE;
static OSVERSIONINFOA osver;
if ( !initialized )
diff --git a/src/extension/internal/win32.h b/src/extension/internal/win32.h
index 96b68f075..d46b5b2fb 100644
--- a/src/extension/internal/win32.h
+++ b/src/extension/internal/win32.h
@@ -60,7 +60,7 @@ public:
static void init (void);
/* Platform detection */
- static bool is_os_wide();
+ static gboolean is_os_wide();
/* Print functions */
virtual unsigned int setup (Inkscape::Extension::Print * module);
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index 482d6c5ea..41d6e7513 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -104,7 +104,7 @@ open(Extension *key, gchar const *filename)
/* This kinda overkill as most of these are already set, but I want
to make sure for this release -- TJG */
Inkscape::XML::Node *repr = sp_document_repr_root(doc);
- bool saved = sp_document_get_undo_sensitive(doc);
+ gboolean saved = sp_document_get_undo_sensitive(doc);
sp_document_set_undo_sensitive(doc, FALSE);
repr->setAttribute("sodipodi:modified", NULL);
sp_document_set_undo_sensitive(doc, saved);