VERY experimental Nintendo Switch 2 emulator
C++
android: Remove unnecessary JvmStatic/JvmField annotations
Charles Lombardod0d7e555aa50
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.ktindex 5848c87c15..4c947b7869 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt@@ -52,11 +52,9 @@ class YuzuApplication : Application() {}companion object {- @JvmFieldvar documentsTree: DocumentsTree? = nulllateinit var application: YuzuApplication- @JvmStaticval appContext: Contextget() = application.applicationContext}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.ktindex 4a0f88f527..ea4071ba7b 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt@@ -326,14 +326,12 @@ open class EmulationActivity : AppCompatActivity(), SensorEventListener {const val EXTRA_SELECTED_GAME = "SelectedGame"private const val EMULATION_RUNNING_NOTIFICATION = 0x1000- @JvmStaticfun launch(activity: AppCompatActivity, game: Game) {val launcher = Intent(activity, EmulationActivity::class.java)launcher.putExtra(EXTRA_SELECTED_GAME, game)activity.startActivity(launcher)}- @JvmStaticfun tryDismissRunningNotification(activity: Activity?) {// TODO(bunnei): Disable notifications until we support app suspension.//NotificationManagerCompat.from(activity).cancel(EMULATION_RUNNING_NOTIFICATION);diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.ktindex 691fad44e5..aadf273ddc 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt@@ -220,7 +220,6 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {private const val ARG_GAME_ID = "game_id"private const val FRAGMENT_TAG = "settings"- @JvmStaticfun launch(context: Context, menuTag: String?, gameId: String?) {val settings = Intent(context, SettingsActivity::class.java)settings.putExtra(ARG_MENU_TAG, menuTag)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.ktindex 687d06f2f3..8671479502 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt@@ -110,7 +110,6 @@ class SettingsFragment : Fragment(), SettingsFragmentView {private const val ARGUMENT_MENU_TAG = "menu_tag"private const val ARGUMENT_GAME_ID = "game_id"- @JvmStaticfun newInstance(menuTag: String?, gameId: String?): Fragment {val fragment = SettingsFragment()val arguments = Bundle()diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.ktindex 6cd0e9d1d3..36c479e6c5 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt@@ -12,7 +12,6 @@ object DirectoryInitialization {var areDirectoriesReady: Boolean = false- @JvmStaticfun start(context: Context) {if (!areDirectoriesReady) {initializeInternalStorage(context)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DocumentsTree.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DocumentsTree.ktindex 2950021deb..cc8ea6b9d4 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DocumentsTree.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DocumentsTree.kt@@ -103,7 +103,6 @@ class DocumentsTree {}companion object {- @JvmStaticfun isNativePath(path: String): Boolean {return if (path.isNotEmpty()) {path[0] == '/'diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.ktindex 27dbfb9eb7..26ea2d77df 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt@@ -34,7 +34,6 @@ object EmulationMenuSettings {.apply()}- @JvmStaticvar landscapeScreenLayout: Intget() = preferences.getInt(Settings.PREF_MENU_SETTINGS_LANDSCAPE,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.ktindex 0e33050262..0a7b323b1c 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt@@ -237,7 +237,6 @@ object FileUtil {return size}- @JvmStaticfun copyUriToInternalStorage(context: Context,sourceUri: Uri?,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.ktindex 23986692aa..ed3c0f58ea 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt@@ -53,7 +53,6 @@ object GpuDriverHelper {zis.closeEntry()}- @JvmStaticfun initializeDriverParameters(context: Context) {try {// Initialize the file redirection directory.diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.ktindex ec08d4a0c0..a193e82a4c 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt@@ -14,31 +14,26 @@ import org.yuzu.yuzu_emu.BuildConfigobject Log {private const val TAG = "Yuzu Frontend"- @JvmStaticfun verbose(message: String) {if (BuildConfig.DEBUG) {Log.v(TAG, message)}}- @JvmStaticfun debug(message: String) {if (BuildConfig.DEBUG) {Log.d(TAG, message)}}- @JvmStaticfun info(message: String) {Log.i(TAG, message)}- @JvmStaticfun warning(message: String) {Log.w(TAG, message)}- @JvmStaticfun error(message: String) {Log.e(TAG, message)}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.ktindex 1a9495ea7c..e55767c0fe 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt@@ -25,7 +25,6 @@ object ThemeHelper {private const val DEFAULT = 0private const val MATERIAL_YOU = 1- @JvmStaticfun setTheme(activity: AppCompatActivity) {val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)setThemeMode(activity)