From a2a0a053010c19bf573bdafeae7c0ebcd81ccdc3 Mon Sep 17 00:00:00 2001
From: Struma <strix@struma.me>
Date: Sat, 26 Dec 2020 13:29:33 -0500
Subject: [PATCH] Move `FileInt.desensitize` to `System.desensitize`

---
 binding/binding-mri.cpp        | 13 +++++++++++++
 binding/filesystem-binding.cpp | 12 ------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/binding/binding-mri.cpp b/binding/binding-mri.cpp
index 1e472958..509ba862 100644
--- a/binding/binding-mri.cpp
+++ b/binding/binding-mri.cpp
@@ -112,6 +112,7 @@ RB_METHOD(mriPrint);
 RB_METHOD(mriP);
 RB_METHOD(mkxpDataDirectory);
 RB_METHOD(mkxpSetTitle);
+RB_METHOD(mkxpDesensitize);
 RB_METHOD(mkxpPuts);
 RB_METHOD(mkxpRawKeyStates);
 RB_METHOD(mkxpMouseInWindow);
@@ -189,6 +190,7 @@ static void mriBindingInit() {
   _rb_define_module_function(mod, "set_window_title", mkxpSetTitle);
   _rb_define_module_function(mod, "show_settings", mkxpSettingsMenu);
   _rb_define_module_function(mod, "puts", mkxpPuts);
+  _rb_define_module_function(mod, "desensitize", mkxpDesensitize);
   _rb_define_module_function(mod, "raw_key_states", mkxpRawKeyStates);
   _rb_define_module_function(mod, "mouse_in_window", mkxpMouseInWindow);
   _rb_define_module_function(mod, "platform", mkxpPlatform);
@@ -269,6 +271,17 @@ RB_METHOD(mkxpSetTitle) {
   return s;
 }
 
+RB_METHOD(mkxpDesensitize) {
+  RB_UNUSED_PARAM;
+
+  VALUE filename;
+  rb_scan_args(argc, argv, "1", &filename);
+  SafeStringValue(filename);
+
+  return rb_str_new_cstr(
+      shState->fileSystem().desensitize(RSTRING_PTR(filename)));
+}
+
 RB_METHOD(mkxpPuts) {
   RB_UNUSED_PARAM;
 
diff --git a/binding/filesystem-binding.cpp b/binding/filesystem-binding.cpp
index 1fdacbc5..2baa704c 100644
--- a/binding/filesystem-binding.cpp
+++ b/binding/filesystem-binding.cpp
@@ -250,17 +250,6 @@ RB_METHOD(_marshalLoad) {
 }
 #endif
 
-RB_METHOD(fileIntDesensitize) {
-  RB_UNUSED_PARAM;
-
-  VALUE filename;
-  rb_scan_args(argc, argv, "1", &filename);
-  SafeStringValue(filename);
-
-  return rb_str_new_cstr(
-      shState->fileSystem().desensitize(RSTRING_PTR(filename)));
-}
-
 void fileIntBindingInit() {
   VALUE klass = rb_define_class("FileInt", rb_cIO);
 #if RAPI_FULL > 187
@@ -280,7 +269,6 @@ void fileIntBindingInit() {
 #endif
   _rb_define_method(klass, "binmode", fileIntBinmode);
   _rb_define_method(klass, "close", fileIntClose);
-  rb_define_singleton_method(klass, "desensitize", RUBY_METHOD_FUNC(fileIntDesensitize), -1);
 
   _rb_define_module_function(rb_mKernel, "load_data", kernelLoadData);
   _rb_define_module_function(rb_mKernel, "save_data", kernelSaveData);