chore: Use Namespace::public_namespace() instead of Namespace::package("")

This commit is contained in:
paq 2021-01-23 19:07:00 +09:00 committed by Mike Welsh
parent 239ccb3511
commit b58fcf3b05
10 changed files with 53 additions and 53 deletions

View File

@ -1209,7 +1209,7 @@ pub fn sort_on<'gc>(
/// Construct `Array`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
let class = Class::new(
QName::new(Namespace::package(""), "Array"),
QName::new(Namespace::public_namespace(), "Array"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),

View File

@ -30,7 +30,7 @@ pub fn class_init<'gc>(
/// Construct `Boolean`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::package(""), "Boolean"),
QName::new(Namespace::public_namespace(), "Boolean"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),

View File

@ -507,107 +507,107 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
let mut write = class.write(mc);
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "alpha"),
QName::new(Namespace::public_namespace(), "alpha"),
Method::from_builtin(alpha),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::package(""), "alpha"),
QName::new(Namespace::public_namespace(), "alpha"),
Method::from_builtin(set_alpha),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "height"),
QName::new(Namespace::public_namespace(), "height"),
Method::from_builtin(height),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::package(""), "height"),
QName::new(Namespace::public_namespace(), "height"),
Method::from_builtin(set_height),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "scaleY"),
QName::new(Namespace::public_namespace(), "scaleY"),
Method::from_builtin(scale_y),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::package(""), "scaleY"),
QName::new(Namespace::public_namespace(), "scaleY"),
Method::from_builtin(set_scale_y),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "width"),
QName::new(Namespace::public_namespace(), "width"),
Method::from_builtin(width),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::package(""), "width"),
QName::new(Namespace::public_namespace(), "width"),
Method::from_builtin(set_width),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "scaleX"),
QName::new(Namespace::public_namespace(), "scaleX"),
Method::from_builtin(scale_x),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::package(""), "scaleX"),
QName::new(Namespace::public_namespace(), "scaleX"),
Method::from_builtin(set_scale_x),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "x"),
QName::new(Namespace::public_namespace(), "x"),
Method::from_builtin(x),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::package(""), "x"),
QName::new(Namespace::public_namespace(), "x"),
Method::from_builtin(set_x),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "y"),
QName::new(Namespace::public_namespace(), "y"),
Method::from_builtin(y),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::package(""), "y"),
QName::new(Namespace::public_namespace(), "y"),
Method::from_builtin(set_y),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "rotation"),
QName::new(Namespace::public_namespace(), "rotation"),
Method::from_builtin(rotation),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::package(""), "rotation"),
QName::new(Namespace::public_namespace(), "rotation"),
Method::from_builtin(set_rotation),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "name"),
QName::new(Namespace::public_namespace(), "name"),
Method::from_builtin(name),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::package(""), "name"),
QName::new(Namespace::public_namespace(), "name"),
Method::from_builtin(set_name),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "parent"),
QName::new(Namespace::public_namespace(), "parent"),
Method::from_builtin(parent),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "root"),
QName::new(Namespace::public_namespace(), "root"),
Method::from_builtin(root),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "visible"),
QName::new(Namespace::public_namespace(), "visible"),
Method::from_builtin(visible),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::package(""), "visible"),
QName::new(Namespace::public_namespace(), "visible"),
Method::from_builtin(set_visible),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "mouseX"),
QName::new(Namespace::public_namespace(), "mouseX"),
Method::from_builtin(mouse_x),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "mouseY"),
QName::new(Namespace::public_namespace(), "mouseY"),
Method::from_builtin(mouse_y),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "hitTestPoint"),
QName::new(Namespace::public_namespace(), "hitTestPoint"),
Method::from_builtin(hit_test_point),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "hitTestObject"),
QName::new(Namespace::public_namespace(), "hitTestObject"),
Method::from_builtin(hit_test_object),
));

View File

@ -537,92 +537,92 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
let mut write = class.write(mc);
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "addFrameScript"),
QName::new(Namespace::public_namespace(), "addFrameScript"),
Method::from_builtin(add_frame_script),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "currentFrame"),
QName::new(Namespace::public_namespace(), "currentFrame"),
Method::from_builtin(current_frame),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "currentFrameLabel"),
QName::new(Namespace::public_namespace(), "currentFrameLabel"),
Method::from_builtin(current_frame_label),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "currentLabel"),
QName::new(Namespace::public_namespace(), "currentLabel"),
Method::from_builtin(current_label),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "currentLabels"),
QName::new(Namespace::public_namespace(), "currentLabels"),
Method::from_builtin(current_labels),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "currentScene"),
QName::new(Namespace::public_namespace(), "currentScene"),
Method::from_builtin(current_scene),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "scenes"),
QName::new(Namespace::public_namespace(), "scenes"),
Method::from_builtin(scenes),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "framesLoaded"),
QName::new(Namespace::public_namespace(), "framesLoaded"),
Method::from_builtin(frames_loaded),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "isPlaying"),
QName::new(Namespace::public_namespace(), "isPlaying"),
Method::from_builtin(is_playing),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::package(""), "totalFrames"),
QName::new(Namespace::public_namespace(), "totalFrames"),
Method::from_builtin(total_frames),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "gotoAndPlay"),
QName::new(Namespace::public_namespace(), "gotoAndPlay"),
Method::from_builtin(goto_and_play),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "gotoAndStop"),
QName::new(Namespace::public_namespace(), "gotoAndStop"),
Method::from_builtin(goto_and_stop),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "stop"),
QName::new(Namespace::public_namespace(), "stop"),
Method::from_builtin(stop),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "play"),
QName::new(Namespace::public_namespace(), "play"),
Method::from_builtin(play),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "prevFrame"),
QName::new(Namespace::public_namespace(), "prevFrame"),
Method::from_builtin(prev_frame),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "nextFrame"),
QName::new(Namespace::public_namespace(), "nextFrame"),
Method::from_builtin(next_frame),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "prevScene"),
QName::new(Namespace::public_namespace(), "prevScene"),
Method::from_builtin(prev_scene),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::package(""), "nextScene"),
QName::new(Namespace::public_namespace(), "nextScene"),
Method::from_builtin(next_scene),
));

View File

@ -34,8 +34,8 @@ pub fn class_init<'gc>(
/// Construct `global`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::package(""), "global"),
Some(QName::new(Namespace::package(""), "Object").into()),
QName::new(Namespace::public_namespace(), "global"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,

View File

@ -30,7 +30,7 @@ pub fn class_init<'gc>(
/// Construct `int`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::package(""), "int"),
QName::new(Namespace::public_namespace(), "int"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),

View File

@ -30,7 +30,7 @@ pub fn class_init<'gc>(
/// Construct `Namespace`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::package(""), "Namespace"),
QName::new(Namespace::public_namespace(), "Namespace"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),

View File

@ -30,7 +30,7 @@ pub fn class_init<'gc>(
/// Construct `Number`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::package(""), "Number"),
QName::new(Namespace::public_namespace(), "Number"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),

View File

@ -30,7 +30,7 @@ pub fn class_init<'gc>(
/// Construct `String`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::package(""), "String"),
QName::new(Namespace::public_namespace(), "String"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),

View File

@ -30,7 +30,7 @@ pub fn class_init<'gc>(
/// Construct `uint`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::package(""), "uint"),
QName::new(Namespace::public_namespace(), "uint"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),