[gjs/wip/ptomato/mozjs31: 1/3] js: Remove remaining usage of JSBool
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/mozjs31: 1/3] js: Remove remaining usage of JSBool
- Date: Sat, 8 Oct 2016 01:57:02 +0000 (UTC)
commit 195738647231017b4e15f00977e137ab892a7192
Author: Philip Chimento <philip endlessm com>
Date: Wed Sep 7 18:00:06 2016 -0700
js: Remove remaining usage of JSBool
Since mozjs31 does away with JSBool entirely, we can now replace the
remaining occurrences of it in the API with C++ bool.
gi/arg.cpp | 4 ++--
gi/boxed.cpp | 8 ++++----
gi/function.cpp | 6 +++---
gi/fundamental.cpp | 2 +-
gi/gerror.cpp | 4 ++--
gi/gtype.cpp | 2 +-
gi/keep-alive.cpp | 2 +-
gi/ns.cpp | 2 +-
gi/object.cpp | 26 +++++++++++++-------------
gi/repo.cpp | 2 +-
gi/union.cpp | 2 +-
gi/value.cpp | 2 +-
gjs/byteArray.cpp | 10 +++++-----
gjs/context.cpp | 8 ++++----
gjs/coverage.cpp | 8 ++++----
gjs/importer.cpp | 6 +++---
gjs/jsapi-util-string.cpp | 4 ++--
gjs/jsapi-util.h | 6 +++---
gjs/runtime.cpp | 10 +++++-----
modules/cairo-context.cpp | 32 ++++++++++++++++----------------
modules/cairo-gradient.cpp | 4 ++--
modules/cairo-image-surface.cpp | 10 +++++-----
modules/cairo-pattern.cpp | 2 +-
modules/cairo-region.cpp | 8 ++++----
modules/cairo-solid-pattern.cpp | 4 ++--
modules/cairo-surface-pattern.cpp | 8 ++++----
modules/cairo-surface.cpp | 4 ++--
modules/system.cpp | 12 ++++++------
28 files changed, 99 insertions(+), 99 deletions(-)
---
diff --git a/gi/arg.cpp b/gi/arg.cpp
index 47773a3..7a6040a 100644
--- a/gi/arg.cpp
+++ b/gi/arg.cpp
@@ -1083,7 +1083,7 @@ gjs_array_to_explicit_array_internal(JSContext *context,
bool ret = false;
GITypeInfo *param_info;
jsid length_name;
- JSBool found_length;
+ bool found_length;
param_info = g_type_info_get_param_type(type_info, 0);
@@ -1629,7 +1629,7 @@ gjs_value_to_g_argument(JSContext *context,
case GI_TYPE_TAG_GLIST:
case GI_TYPE_TAG_GSLIST: {
jsid length_name;
- JSBool found_length;
+ bool found_length;
length_name = gjs_context_get_const_string(context, GJS_STRING_LENGTH);
diff --git a/gi/boxed.cpp b/gi/boxed.cpp
index 13275a3..706ffbe 100644
--- a/gi/boxed.cpp
+++ b/gi/boxed.cpp
@@ -632,7 +632,7 @@ get_nested_interface_object (JSContext *context,
return true;
}
-static JSBool
+static bool
boxed_field_getter (JSContext *context,
JS::HandleObject obj,
JS::HandleId id,
@@ -813,11 +813,11 @@ out:
return success;
}
-static JSBool
+static bool
boxed_field_setter (JSContext *context,
JS::HandleObject obj,
JS::HandleId id,
- JSBool strict,
+ bool strict,
JS::MutableHandleValue value)
{
Boxed *priv;
@@ -892,7 +892,7 @@ define_boxed_class_fields (JSContext *context,
return true;
}
-static JSBool
+static bool
to_string_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/gi/function.cpp b/gi/function.cpp
index e26f4f5..95ed353 100644
--- a/gi/function.cpp
+++ b/gi/function.cpp
@@ -1291,7 +1291,7 @@ release:
}
}
-static JSBool
+static bool
function_call(JSContext *context,
unsigned js_argc,
JS::Value *vp)
@@ -1390,7 +1390,7 @@ get_num_arguments (JSContext *context,
return true;
}
-static JSBool
+static bool
function_to_string (JSContext *context,
guint argc,
JS::Value *vp)
@@ -1659,7 +1659,7 @@ function_new(JSContext *context,
{
JSObject *global;
Function *priv;
- JSBool found;
+ bool found;
/* put constructor for GIRepositoryFunction() in the global namespace */
global = gjs_get_import_global(context);
diff --git a/gi/fundamental.cpp b/gi/fundamental.cpp
index 484d963..5688928 100644
--- a/gi/fundamental.cpp
+++ b/gi/fundamental.cpp
@@ -493,7 +493,7 @@ fundamental_finalize(JSFreeOp *fop,
}
}
-static JSBool
+static bool
to_string_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/gi/gerror.cpp b/gi/gerror.cpp
index 80279d8..7d49726 100644
--- a/gi/gerror.cpp
+++ b/gi/gerror.cpp
@@ -206,7 +206,7 @@ error_get_code(JSContext *context, JS::HandleObject obj,
return true;
}
-static JSBool
+static bool
error_to_string(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -262,7 +262,7 @@ error_to_string(JSContext *context,
return retval;
}
-static JSBool
+static bool
error_constructor_value_of(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/gi/gtype.cpp b/gi/gtype.cpp
index ac82e4f..dde0d77 100644
--- a/gi/gtype.cpp
+++ b/gi/gtype.cpp
@@ -60,7 +60,7 @@ gjs_gtype_finalize(JSFreeOp *fop,
g_type_set_qdata(gtype, gjs_get_gtype_wrapper_quark(), NULL);
}
-static JSBool
+static bool
to_string_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/gi/keep-alive.cpp b/gi/keep-alive.cpp
index c533a53..e6ac6e8 100644
--- a/gi/keep-alive.cpp
+++ b/gi/keep-alive.cpp
@@ -177,7 +177,7 @@ gjs_keep_alive_new(JSContext *context)
{
KeepAlive *priv;
JSObject *global;
- JSBool found;
+ bool found;
/* This function creates an unattached KeepAlive object; following our
* general strategy, we have a single KeepAlive class with a constructor
diff --git a/gi/ns.cpp b/gi/ns.cpp
index 38d6490..d29f152 100644
--- a/gi/ns.cpp
+++ b/gi/ns.cpp
@@ -205,7 +205,7 @@ ns_new(JSContext *context,
{
JSObject *global;
Ns *priv;
- JSBool found;
+ bool found;
/* put constructor in the global namespace */
global = gjs_get_import_global(context);
diff --git a/gi/object.cpp b/gi/object.cpp
index 97644dd..7ebba3a 100644
--- a/gi/object.cpp
+++ b/gi/object.cpp
@@ -250,7 +250,7 @@ proto_priv_from_js(JSContext *context,
/* a hook on getting a property; set value_p to override property's value.
* Return value is false on OOM/exception.
*/
-static JSBool
+static bool
object_instance_get_prop(JSContext *context,
JS::HandleObject obj,
JS::HandleId id,
@@ -320,11 +320,11 @@ object_instance_get_prop(JSContext *context,
/* a hook on setting a property; set value_p to override property value to
* be set. Return value is false on OOM/exception.
*/
-static JSBool
+static bool
object_instance_set_prop(JSContext *context,
JS::HandleObject obj,
JS::HandleId id,
- JSBool strict,
+ bool strict,
JS::MutableHandleValue value_p)
{
ObjectInstance *priv;
@@ -1648,7 +1648,7 @@ real_connect_func(JSContext *context,
return ret;
}
-static JSBool
+static bool
connect_after_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1656,7 +1656,7 @@ connect_after_func(JSContext *context,
return real_connect_func(context, argc, vp, true);
}
-static JSBool
+static bool
connect_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1664,7 +1664,7 @@ connect_func(JSContext *context,
return real_connect_func(context, argc, vp, false);
}
-static JSBool
+static bool
emit_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1787,7 +1787,7 @@ emit_func(JSContext *context,
return ret;
}
-static JSBool
+static bool
to_string_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1839,7 +1839,7 @@ struct JSClass gjs_object_instance_class = {
};
-static JSBool
+static bool
init_func (JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -2263,7 +2263,7 @@ find_vfunc_info (JSContext *context,
g_base_info_unref(struct_info);
}
-static JSBool
+static bool
gjs_hook_up_vfunc(JSContext *cx,
unsigned argc,
JS::Value *vp)
@@ -2516,7 +2516,7 @@ gjs_object_set_gproperty (GObject *object,
jsobj_set_gproperty(context, js_obj, value, pspec);
}
-static JSBool
+static bool
gjs_override_property(JSContext *cx,
unsigned argc,
JS::Value *vp)
@@ -2778,7 +2778,7 @@ save_properties_for_class_init(JSContext *cx,
return true;
}
-static JSBool
+static bool
gjs_register_interface(JSContext *cx,
unsigned argc,
JS::Value *vp)
@@ -2857,7 +2857,7 @@ gjs_register_interface(JSContext *cx,
return true;
}
-static JSBool
+static bool
gjs_register_type(JSContext *cx,
unsigned argc,
JS::Value *vp)
@@ -2967,7 +2967,7 @@ out:
return retval;
}
-static JSBool
+static bool
gjs_signal_new(JSContext *cx,
unsigned argc,
JS::Value *vp)
diff --git a/gi/repo.cpp b/gi/repo.cpp
index 2f5ae4e..2f5c806 100644
--- a/gi/repo.cpp
+++ b/gi/repo.cpp
@@ -252,7 +252,7 @@ repo_new(JSContext *context)
JSObject *global;
JSObject *versions;
JSObject *private_ns;
- JSBool found;
+ bool found;
jsid versions_name, private_ns_name;
global = gjs_get_import_global(context);
diff --git a/gi/union.cpp b/gi/union.cpp
index def9465..e112c8e 100644
--- a/gi/union.cpp
+++ b/gi/union.cpp
@@ -282,7 +282,7 @@ union_finalize(JSFreeOp *fop,
g_slice_free(Union, priv);
}
-static JSBool
+static bool
to_string_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/gi/value.cpp b/gi/value.cpp
index a71c07f..e005584 100644
--- a/gi/value.cpp
+++ b/gi/value.cpp
@@ -490,7 +490,7 @@ gjs_value_to_g_value_internal(JSContext *context,
g_value_set_object(gvalue, gobj);
} else if (gtype == G_TYPE_STRV) {
jsid length_name;
- JSBool found_length;
+ bool found_length;
length_name = gjs_context_get_const_string(context, GJS_STRING_LENGTH);
if (value.isNull()) {
diff --git a/gjs/byteArray.cpp b/gjs/byteArray.cpp
index a5e6ede..ab479ee 100644
--- a/gjs/byteArray.cpp
+++ b/gjs/byteArray.cpp
@@ -404,7 +404,7 @@ byte_array_finalize(JSFreeOp *fop,
}
/* implement toString() with an optional encoding arg */
-static JSBool
+static bool
to_string_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -502,7 +502,7 @@ to_string_func(JSContext *context,
}
}
-static JSBool
+static bool
to_gbytes_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -565,7 +565,7 @@ byte_array_new(JSContext *context)
}
/* fromString() function implementation */
-static JSBool
+static bool
from_string_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -661,7 +661,7 @@ from_string_func(JSContext *context,
}
/* fromArray() function implementation */
-static JSBool
+static bool
from_array_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -721,7 +721,7 @@ from_array_func(JSContext *context,
return true;
}
-static JSBool
+static bool
from_gbytes_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/gjs/context.cpp b/gjs/context.cpp
index ff39cd1..a1a85c2 100644
--- a/gjs/context.cpp
+++ b/gjs/context.cpp
@@ -102,7 +102,7 @@ enum {
static GMutex contexts_lock;
static GList *all_contexts = NULL;
-static JSBool
+static bool
gjs_log(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -146,7 +146,7 @@ gjs_log(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_log_error(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -233,7 +233,7 @@ gjs_print_parse_args(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_print(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -252,7 +252,7 @@ gjs_print(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_printerr(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/gjs/coverage.cpp b/gjs/coverage.cpp
index a415a13..8bb0a68 100644
--- a/gjs/coverage.cpp
+++ b/gjs/coverage.cpp
@@ -1331,7 +1331,7 @@ gjs_context_eval_file_in_compartment(GjsContext *context,
return true;
}
-static JSBool
+static bool
coverage_log(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1406,7 +1406,7 @@ get_file_from_filename_as_js_string(JSContext *context,
return file;
}
-static JSBool
+static bool
coverage_get_file_modification_time(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1439,7 +1439,7 @@ out:
return ret;
}
-static JSBool
+static bool
coverage_get_file_checksum(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1468,7 +1468,7 @@ coverage_get_file_checksum(JSContext *context,
return true;
}
-static JSBool
+static bool
coverage_get_file_contents(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/gjs/importer.cpp b/gjs/importer.cpp
index 3202667..d364ae3 100644
--- a/gjs/importer.cpp
+++ b/gjs/importer.cpp
@@ -153,7 +153,7 @@ seal_import(JSContext *context,
JSObject *obj,
const char *name)
{
- JSBool found;
+ bool found;
unsigned attrs;
if (!JS_GetPropertyAttributes(context, obj, name,
@@ -300,7 +300,7 @@ load_module_init(JSContext *context,
const char *full_path)
{
JSObject *module_obj;
- JSBool found;
+ bool found;
jsid module_init_name;
GFile *file;
@@ -939,7 +939,7 @@ importer_new(JSContext *context,
{
Importer *priv;
JSObject *global;
- JSBool found;
+ bool found;
global = gjs_get_import_global(context);
diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
index f845d15..4120fda 100644
--- a/gjs/jsapi-util-string.cpp
+++ b/gjs/jsapi-util-string.cpp
@@ -28,7 +28,7 @@
#include "jsapi-util.h"
#include "compat.h"
-JSBool
+bool
gjs_string_to_utf8 (JSContext *context,
const JS::Value value,
char **utf8_string_p)
@@ -106,7 +106,7 @@ gjs_string_from_utf8(JSContext *context,
return str != NULL;
}
-JSBool
+bool
gjs_string_to_filename(JSContext *context,
const JS::Value filename_val,
char **filename_string_p)
diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
index bf38c02..4c8881a 100644
--- a/gjs/jsapi-util.h
+++ b/gjs/jsapi-util.h
@@ -204,7 +204,7 @@ JS::Value gjs_##cname##_create_proto(JSContext *context, JSObject *module, const
* Prototype a constructor.
*/
#define GJS_NATIVE_CONSTRUCTOR_DECLARE(name) \
-static JSBool \
+static bool \
gjs_##name##_constructor(JSContext *context, \
unsigned argc, \
JS::Value *vp)
@@ -364,14 +364,14 @@ bool gjs_delete_prop_verbose_stub (JSContext *context,
JS::Value id,
JS::Value *value_p);
-JSBool gjs_string_to_utf8 (JSContext *context,
+bool gjs_string_to_utf8 (JSContext *context,
const JS::Value string_val,
char **utf8_string_p);
bool gjs_string_from_utf8 (JSContext *context,
const char *utf8_string,
gssize n_bytes,
JS::Value *value_p);
-JSBool gjs_string_to_filename (JSContext *context,
+bool gjs_string_to_filename (JSContext *context,
const JS::Value string_val,
char **filename_string_p);
bool gjs_string_from_filename (JSContext *context,
diff --git a/gjs/runtime.cpp b/gjs/runtime.cpp
index de2e779..fc2f151 100644
--- a/gjs/runtime.cpp
+++ b/gjs/runtime.cpp
@@ -44,7 +44,7 @@ gjs_runtime_is_sweeping (JSRuntime *runtime)
* to UTF-8, using the appropriate GLib functions, and converting
* back if necessary.
*/
-static JSBool
+static bool
gjs_locale_to_upper_case (JSContext *context,
JS::HandleString src,
JS::MutableHandleValue retval)
@@ -70,7 +70,7 @@ out:
return success;
}
-static JSBool
+static bool
gjs_locale_to_lower_case (JSContext *context,
JS::HandleString src,
JS::MutableHandleValue retval)
@@ -96,7 +96,7 @@ out:
return success;
}
-static JSBool
+static bool
gjs_locale_compare (JSContext *context,
JS::HandleString src_1,
JS::HandleString src_2,
@@ -120,7 +120,7 @@ out:
return success;
}
-static JSBool
+static bool
gjs_locale_to_unicode (JSContext *context,
const char *src,
JS::MutableHandleValue retval)
@@ -167,7 +167,7 @@ static JSLocaleCallbacks gjs_locale_callbacks =
void
gjs_finalize_callback(JSFreeOp *fop,
JSFinalizeStatus status,
- JSBool isCompartment)
+ bool isCompartment)
{
JSRuntime *runtime;
RuntimeData *data;
diff --git a/modules/cairo-context.cpp b/modules/cairo-context.cpp
index 8b06d47..c4941bd 100644
--- a/modules/cairo-context.cpp
+++ b/modules/cairo-context.cpp
@@ -30,7 +30,7 @@
#include "cairo-private.h"
#define _GJS_CAIRO_CONTEXT_DEFINE_FUNC_BEGIN(mname) \
-static JSBool \
+static bool \
mname##_func(JSContext *context, \
unsigned argc, \
JS::Value *vp) \
@@ -400,7 +400,7 @@ _GJS_CAIRO_CONTEXT_DEFINE_FUNC2FFAFF(userToDevice, cairo_user_to_device, "x", "y
_GJS_CAIRO_CONTEXT_DEFINE_FUNC2FFAFF(userToDeviceDistance, cairo_user_to_device_distance, "x", "y")
-static JSBool
+static bool
dispose_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -419,7 +419,7 @@ dispose_func(JSContext *context,
return true;
}
-static JSBool
+static bool
appendPath_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -447,7 +447,7 @@ appendPath_func(JSContext *context,
return true;
}
-static JSBool
+static bool
copyPath_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -467,7 +467,7 @@ copyPath_func(JSContext *context,
return true;
}
-static JSBool
+static bool
copyPathFlat_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -487,7 +487,7 @@ copyPathFlat_func(JSContext *context,
return true;
}
-static JSBool
+static bool
mask_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -519,7 +519,7 @@ mask_func(JSContext *context,
return true;
}
-static JSBool
+static bool
maskSurface_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -555,7 +555,7 @@ maskSurface_func(JSContext *context,
return true;
}
-static JSBool
+static bool
setDash_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -618,7 +618,7 @@ setDash_func(JSContext *context,
return retval;
}
-static JSBool
+static bool
setSource_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -652,7 +652,7 @@ setSource_func(JSContext *context,
return true;
}
-static JSBool
+static bool
setSourceSurface_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -689,7 +689,7 @@ setSourceSurface_func(JSContext *context,
return true;
}
-static JSBool
+static bool
showText_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -717,7 +717,7 @@ showText_func(JSContext *context,
return true;
}
-static JSBool
+static bool
selectFontFace_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -748,7 +748,7 @@ selectFontFace_func(JSContext *context,
return true;
}
-static JSBool
+static bool
popGroup_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -781,7 +781,7 @@ popGroup_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getSource_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -815,7 +815,7 @@ getSource_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getTarget_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -849,7 +849,7 @@ getTarget_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getGroupTarget_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/modules/cairo-gradient.cpp b/modules/cairo-gradient.cpp
index 3e1e253..7cb6e04 100644
--- a/modules/cairo-gradient.cpp
+++ b/modules/cairo-gradient.cpp
@@ -42,7 +42,7 @@ JSPropertySpec gjs_cairo_gradient_proto_props[] = {
/* Methods */
-static JSBool
+static bool
addColorStopRGB_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -71,7 +71,7 @@ addColorStopRGB_func(JSContext *context,
return true;
}
-static JSBool
+static bool
addColorStopRGBA_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/modules/cairo-image-surface.cpp b/modules/cairo-image-surface.cpp
index dfd11ed..ab68c11 100644
--- a/modules/cairo-image-surface.cpp
+++ b/modules/cairo-image-surface.cpp
@@ -67,7 +67,7 @@ JSPropertySpec gjs_cairo_image_surface_proto_props[] = {
JS_PS_END
};
-static JSBool
+static bool
createFromPNG_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -98,7 +98,7 @@ createFromPNG_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getFormat_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -124,7 +124,7 @@ getFormat_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getWidth_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -150,7 +150,7 @@ getWidth_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getHeight_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -176,7 +176,7 @@ getHeight_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getStride_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/modules/cairo-pattern.cpp b/modules/cairo-pattern.cpp
index 8f27cda..8cfcc5c 100644
--- a/modules/cairo-pattern.cpp
+++ b/modules/cairo-pattern.cpp
@@ -56,7 +56,7 @@ JSPropertySpec gjs_cairo_pattern_proto_props[] = {
/* Methods */
-static JSBool
+static bool
getType_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/modules/cairo-region.cpp b/modules/cairo-region.cpp
index 66e1098..122ce6d 100644
--- a/modules/cairo-region.cpp
+++ b/modules/cairo-region.cpp
@@ -62,7 +62,7 @@ fill_rectangle(JSContext *context, JSObject *obj,
return gjs_cairo_check_status(context, cairo_region_status(this_region), "region");
#define REGION_DEFINE_REGION_FUNC(method) \
- static JSBool \
+ static bool \
method##_func(JSContext *context, \
unsigned argc, \
JS::Value *vp) \
@@ -83,7 +83,7 @@ fill_rectangle(JSContext *context, JSObject *obj,
}
#define REGION_DEFINE_RECT_FUNC(method) \
- static JSBool \
+ static bool \
method##_rectangle_func(JSContext *context, \
unsigned argc, \
JS::Value *vp) \
@@ -164,7 +164,7 @@ make_rectangle(JSContext *context,
return rect_obj;
}
-static JSBool
+static bool
num_rectangles_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -180,7 +180,7 @@ num_rectangles_func(JSContext *context,
RETURN_STATUS;
}
-static JSBool
+static bool
get_rectangle_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/modules/cairo-solid-pattern.cpp b/modules/cairo-solid-pattern.cpp
index e9ca032..9b61972 100644
--- a/modules/cairo-solid-pattern.cpp
+++ b/modules/cairo-solid-pattern.cpp
@@ -39,7 +39,7 @@ JSPropertySpec gjs_cairo_solid_pattern_proto_props[] = {
JS_PS_END
};
-static JSBool
+static bool
createRGB_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -67,7 +67,7 @@ createRGB_func(JSContext *context,
return true;
}
-static JSBool
+static bool
createRGBA_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/modules/cairo-surface-pattern.cpp b/modules/cairo-surface-pattern.cpp
index 3440f32..6475d7e 100644
--- a/modules/cairo-surface-pattern.cpp
+++ b/modules/cairo-surface-pattern.cpp
@@ -73,7 +73,7 @@ JSPropertySpec gjs_cairo_surface_pattern_proto_props[] = {
};
-static JSBool
+static bool
setExtend_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -98,7 +98,7 @@ setExtend_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getExtend_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -125,7 +125,7 @@ getExtend_func(JSContext *context,
return true;
}
-static JSBool
+static bool
setFilter_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -150,7 +150,7 @@ setFilter_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getFilter_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/modules/cairo-surface.cpp b/modules/cairo-surface.cpp
index 7d2dc67..c86cb47 100644
--- a/modules/cairo-surface.cpp
+++ b/modules/cairo-surface.cpp
@@ -56,7 +56,7 @@ JSPropertySpec gjs_cairo_surface_proto_props[] = {
};
/* Methods */
-static JSBool
+static bool
writeToPNG_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -85,7 +85,7 @@ writeToPNG_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getType_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/modules/system.cpp b/modules/system.cpp
index bab0667..435e251 100644
--- a/modules/system.cpp
+++ b/modules/system.cpp
@@ -33,7 +33,7 @@
#include "gi/object.h"
#include "system.h"
-static JSBool
+static bool
gjs_address_of(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -58,7 +58,7 @@ gjs_address_of(JSContext *context,
return ret;
}
-static JSBool
+static bool
gjs_refcount(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -82,7 +82,7 @@ gjs_refcount(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_breakpoint(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -95,7 +95,7 @@ gjs_breakpoint(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_gc(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -108,7 +108,7 @@ gjs_gc(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_exit(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -121,7 +121,7 @@ gjs_exit(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_clear_date_caches(JSContext *context,
unsigned argc,
JS::Value *vp)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
