[gjs/wip/ptomato/mozjs31: 9/12] js: Remove remaining usage of JSBool
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/mozjs31: 9/12] js: Remove remaining usage of JSBool
- Date: Fri, 21 Oct 2016 00:29:45 +0000 (UTC)
commit a8627b5a0b18ab3868a7e88dd0456f8299efc98f
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 | 8 ++++----
gi/fundamental.cpp | 2 +-
gi/gerror.cpp | 10 +++++-----
gi/gtype.cpp | 4 ++--
gi/keep-alive.cpp | 2 +-
gi/ns.cpp | 4 ++--
gi/object.cpp | 26 +++++++++++++-------------
gi/repo.cpp | 2 +-
gi/union.cpp | 2 +-
gi/value.cpp | 2 +-
gjs/byteArray.cpp | 14 +++++++-------
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/console.cpp | 2 +-
modules/system.cpp | 12 ++++++------
test/gjs-test-call-args.cpp | 2 +-
30 files changed, 109 insertions(+), 109 deletions(-)
---
diff --git a/gi/arg.cpp b/gi/arg.cpp
index 5098153..09b01b8 100644
--- a/gi/arg.cpp
+++ b/gi/arg.cpp
@@ -1130,7 +1130,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);
@@ -1676,7 +1676,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 ac83e8e..a987d1c 100644
--- a/gi/boxed.cpp
+++ b/gi/boxed.cpp
@@ -620,7 +620,7 @@ get_nested_interface_object (JSContext *context,
return true;
}
-static JSBool
+static bool
boxed_field_getter (JSContext *context,
JS::HandleObject obj,
JS::HandleId id,
@@ -798,11 +798,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;
@@ -877,7 +877,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 020fbcd..ef66368 100644
--- a/gi/function.cpp
+++ b/gi/function.cpp
@@ -1295,7 +1295,7 @@ release:
}
}
-static JSBool
+static bool
function_call(JSContext *context,
unsigned js_argc,
JS::Value *vp)
@@ -1358,7 +1358,7 @@ function_finalize(JSFreeOp *fop,
g_slice_free(Function, priv);
}
-static JSBool
+static bool
get_num_arguments (JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1387,7 +1387,7 @@ get_num_arguments (JSContext *context,
return true;
}
-static JSBool
+static bool
function_to_string (JSContext *context,
guint argc,
JS::Value *vp)
@@ -1640,7 +1640,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 10bf86b..4c63130 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 73df0a6..03bd8da 100644
--- a/gi/gerror.cpp
+++ b/gi/gerror.cpp
@@ -143,7 +143,7 @@ error_finalize(JSFreeOp *fop,
g_slice_free(Error, priv);
}
-static JSBool
+static bool
error_get_domain(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -157,7 +157,7 @@ error_get_domain(JSContext *context,
return true;
}
-static JSBool
+static bool
error_get_message(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -176,7 +176,7 @@ error_get_message(JSContext *context,
return gjs_string_from_utf8(context, priv->gerror->message, -1, args.rval());
}
-static JSBool
+static bool
error_get_code(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -196,7 +196,7 @@ error_get_code(JSContext *context,
return true;
}
-static JSBool
+static bool
error_to_string(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -238,7 +238,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 84ff1c7..e731c27 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)
@@ -82,7 +82,7 @@ to_string_func(JSContext *context,
return ret;
}
-static JSBool
+static bool
get_name_func (JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/gi/keep-alive.cpp b/gi/keep-alive.cpp
index 396741e..1ba8983 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 33335ba..021c9cc 100644
--- a/gi/ns.cpp
+++ b/gi/ns.cpp
@@ -126,7 +126,7 @@ ns_new_resolve(JSContext *context,
return ret;
}
-static JSBool
+static bool
get_name (JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -194,7 +194,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 ea39c2c..f578fe7 100644
--- a/gi/object.cpp
+++ b/gi/object.cpp
@@ -251,7 +251,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,
@@ -321,11 +321,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;
@@ -1640,7 +1640,7 @@ real_connect_func(JSContext *context,
return ret;
}
-static JSBool
+static bool
connect_after_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1648,7 +1648,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)
@@ -1656,7 +1656,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)
@@ -1766,7 +1766,7 @@ emit_func(JSContext *context,
return ret;
}
-static JSBool
+static bool
to_string_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1803,7 +1803,7 @@ struct JSClass gjs_object_instance_class = {
};
-static JSBool
+static bool
init_func (JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -2221,7 +2221,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)
@@ -2472,7 +2472,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)
@@ -2735,7 +2735,7 @@ save_properties_for_class_init(JSContext *cx,
return true;
}
-static JSBool
+static bool
gjs_register_interface(JSContext *cx,
unsigned argc,
JS::Value *vp)
@@ -2815,7 +2815,7 @@ gjs_register_interface(JSContext *cx,
return true;
}
-static JSBool
+static bool
gjs_register_type(JSContext *cx,
unsigned argc,
JS::Value *vp)
@@ -2924,7 +2924,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 78687ba..7231a07 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 2890b47..1acc883 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 71dbf16..5743319 100644
--- a/gi/value.cpp
+++ b/gi/value.cpp
@@ -486,7 +486,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 6d29205..9b5e235 100644
--- a/gjs/byteArray.cpp
+++ b/gjs/byteArray.cpp
@@ -219,7 +219,7 @@ byte_array_get_prop(JSContext *context,
return true;
}
-static JSBool
+static bool
byte_array_length_getter(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -238,7 +238,7 @@ byte_array_length_getter(JSContext *context,
return true;
}
-static JSBool
+static bool
byte_array_length_setter(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -401,7 +401,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)
@@ -487,7 +487,7 @@ to_string_func(JSContext *context,
}
}
-static JSBool
+static bool
to_gbytes_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -547,7 +547,7 @@ byte_array_new(JSContext *context)
}
/* fromString() function implementation */
-static JSBool
+static bool
from_string_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -643,7 +643,7 @@ from_string_func(JSContext *context,
}
/* fromArray() function implementation */
-static JSBool
+static bool
from_array_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -703,7 +703,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 8c099c5..4fd5efb 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 8f43942..0541805 100644
--- a/gjs/coverage.cpp
+++ b/gjs/coverage.cpp
@@ -1332,7 +1332,7 @@ gjs_context_eval_file_in_compartment(GjsContext *context,
return true;
}
-static JSBool
+static bool
coverage_log(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1407,7 +1407,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)
@@ -1440,7 +1440,7 @@ out:
return ret;
}
-static JSBool
+static bool
coverage_get_file_checksum(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -1469,7 +1469,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 db9f963..dcdebe3 100644
--- a/gjs/importer.cpp
+++ b/gjs/importer.cpp
@@ -158,7 +158,7 @@ seal_import(JSContext *context,
JSObject *obj,
const char *name)
{
- JSBool found;
+ bool found;
unsigned attrs;
if (!JS_GetPropertyAttributes(context, obj, name,
@@ -305,7 +305,7 @@ load_module_init(JSContext *context,
const char *full_path)
{
JSObject *module_obj;
- JSBool found;
+ bool found;
jsid module_init_name;
GFile *file;
@@ -942,7 +942,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 ebec900..d8a47c0 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)
@@ -105,7 +105,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 94f48bd..c1fe31c 100644
--- a/gjs/jsapi-util.h
+++ b/gjs/jsapi-util.h
@@ -241,7 +241,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)
@@ -379,7 +379,7 @@ void gjs_error_reporter (JSContext *context,
JSErrorReport *report);
JSObject* gjs_get_global_object (JSContext *cx);
-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,
@@ -387,7 +387,7 @@ bool gjs_string_from_utf8(JSContext *context,
ssize_t n_bytes,
JS::MutableHandleValue 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 97c7804..ba64be2 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 0309783..d7b9c06 100644
--- a/modules/cairo-context.cpp
+++ b/modules/cairo-context.cpp
@@ -31,7 +31,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) \
@@ -387,7 +387,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)
@@ -402,7 +402,7 @@ dispose_func(JSContext *context,
return true;
}
-static JSBool
+static bool
appendPath_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -427,7 +427,7 @@ appendPath_func(JSContext *context,
return true;
}
-static JSBool
+static bool
copyPath_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -444,7 +444,7 @@ copyPath_func(JSContext *context,
return true;
}
-static JSBool
+static bool
copyPathFlat_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -461,7 +461,7 @@ copyPathFlat_func(JSContext *context,
return true;
}
-static JSBool
+static bool
mask_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -490,7 +490,7 @@ mask_func(JSContext *context,
return true;
}
-static JSBool
+static bool
maskSurface_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -522,7 +522,7 @@ maskSurface_func(JSContext *context,
return true;
}
-static JSBool
+static bool
setDash_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -583,7 +583,7 @@ setDash_func(JSContext *context,
return retval;
}
-static JSBool
+static bool
setSource_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -613,7 +613,7 @@ setSource_func(JSContext *context,
return true;
}
-static JSBool
+static bool
setSourceSurface_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -646,7 +646,7 @@ setSourceSurface_func(JSContext *context,
return true;
}
-static JSBool
+static bool
showText_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -670,7 +670,7 @@ showText_func(JSContext *context,
return true;
}
-static JSBool
+static bool
selectFontFace_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -697,7 +697,7 @@ selectFontFace_func(JSContext *context,
return true;
}
-static JSBool
+static bool
popGroup_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -727,7 +727,7 @@ popGroup_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getSource_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -758,7 +758,7 @@ getSource_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getTarget_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -789,7 +789,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 7431068..add1556 100644
--- a/modules/cairo-gradient.cpp
+++ b/modules/cairo-gradient.cpp
@@ -43,7 +43,7 @@ JSPropertySpec gjs_cairo_gradient_proto_props[] = {
/* Methods */
-static JSBool
+static bool
addColorStopRGB_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -70,7 +70,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 fbaf1b9..024fb95 100644
--- a/modules/cairo-image-surface.cpp
+++ b/modules/cairo-image-surface.cpp
@@ -68,7 +68,7 @@ JSPropertySpec gjs_cairo_image_surface_proto_props[] = {
JS_PS_END
};
-static JSBool
+static bool
createFromPNG_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -99,7 +99,7 @@ createFromPNG_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getFormat_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -123,7 +123,7 @@ getFormat_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getWidth_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -147,7 +147,7 @@ getWidth_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getHeight_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -171,7 +171,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 b29e3af..79b19e9 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 f941374..8b27ae6 100644
--- a/modules/cairo-region.cpp
+++ b/modules/cairo-region.cpp
@@ -63,7 +63,7 @@ fill_rectangle(JSContext *context,
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,
}
#define REGION_DEFINE_RECT_FUNC(method) \
- static JSBool \
+ static bool \
method##_rectangle_func(JSContext *context, \
unsigned argc, \
JS::Value *vp) \
@@ -165,7 +165,7 @@ make_rectangle(JSContext *context,
return rect_obj;
}
-static JSBool
+static bool
num_rectangles_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -181,7 +181,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 f4a3e17..1402ec3 100644
--- a/modules/cairo-solid-pattern.cpp
+++ b/modules/cairo-solid-pattern.cpp
@@ -40,7 +40,7 @@ JSPropertySpec gjs_cairo_solid_pattern_proto_props[] = {
JS_PS_END
};
-static JSBool
+static bool
createRGB_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -68,7 +68,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 271cb80..df99a9d 100644
--- a/modules/cairo-surface-pattern.cpp
+++ b/modules/cairo-surface-pattern.cpp
@@ -74,7 +74,7 @@ JSPropertySpec gjs_cairo_surface_pattern_proto_props[] = {
};
-static JSBool
+static bool
setExtend_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -97,7 +97,7 @@ setExtend_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getExtend_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -122,7 +122,7 @@ getExtend_func(JSContext *context,
return true;
}
-static JSBool
+static bool
setFilter_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -145,7 +145,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 e563595..0671f78 100644
--- a/modules/cairo-surface.cpp
+++ b/modules/cairo-surface.cpp
@@ -57,7 +57,7 @@ JSPropertySpec gjs_cairo_surface_proto_props[] = {
};
/* Methods */
-static JSBool
+static bool
writeToPNG_func(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -84,7 +84,7 @@ writeToPNG_func(JSContext *context,
return true;
}
-static JSBool
+static bool
getType_func(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/modules/console.cpp b/modules/console.cpp
index 24b9352..d51c189 100644
--- a/modules/console.cpp
+++ b/modules/console.cpp
@@ -153,7 +153,7 @@ gjs_console_readline(JSContext *cx, char **bufp, FILE *file, const char *prompt)
}
#endif
-static JSBool
+static bool
gjs_console_interact(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/modules/system.cpp b/modules/system.cpp
index db3e143..aaca7b1 100644
--- a/modules/system.cpp
+++ b/modules/system.cpp
@@ -34,7 +34,7 @@
#include "gjs/jsapi-util-args.h"
#include "system.h"
-static JSBool
+static bool
gjs_address_of(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -56,7 +56,7 @@ gjs_address_of(JSContext *context,
return ret;
}
-static JSBool
+static bool
gjs_refcount(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -80,7 +80,7 @@ gjs_refcount(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_breakpoint(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -93,7 +93,7 @@ gjs_breakpoint(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_gc(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -106,7 +106,7 @@ gjs_gc(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_exit(JSContext *context,
unsigned argc,
JS::Value *vp)
@@ -120,7 +120,7 @@ gjs_exit(JSContext *context,
return true;
}
-static JSBool
+static bool
gjs_clear_date_caches(JSContext *context,
unsigned argc,
JS::Value *vp)
diff --git a/test/gjs-test-call-args.cpp b/test/gjs-test-call-args.cpp
index cd9dccd..bced45e 100644
--- a/test/gjs-test-call-args.cpp
+++ b/test/gjs-test-call-args.cpp
@@ -30,7 +30,7 @@ typedef enum _test_signed_enum {
} test_signed_enum_t;
#define JSNATIVE_TEST_FUNC_BEGIN(name) \
- static JSBool \
+ static bool \
name(JSContext *cx, \
unsigned argc, \
JS::Value *vp) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
