Ensure OpenXR classes are declared properly

Co-authored-by: Bastiaan Olij <mux213@gmail.com>

6 files changed, 12 insertions, 12 deletions

diff --git a/modules/openxr/extensions/openxr_htc_controller_extension.cpp b/modules/openxr/extensions/openxr_htc_controller_extension.cpp
index 51364d83d8..c4ecb4e57c 100644
--- a/modules/openxr/extensions/openxr_htc_controller_extension.cpp
+++ b/modules/openxr/extensions/openxr_htc_controller_extension.cpp
@@ -30,7 +30,7 @@
 
 #include "openxr_htc_controller_extension.h"
 
-#include "../action_map/openxr_interaction_profile_meta_data.h"
+#include "../action_map/openxr_interaction_profile_metadata.h"
 
 HashMap<String, bool *> OpenXRHTCControllerExtension::get_requested_extensions() {
 	HashMap<String, bool *> request_extensions;
@@ -46,7 +46,7 @@ bool OpenXRHTCControllerExtension::is_available(HTCControllers p_type) {
 }
 
 void OpenXRHTCControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetaData *metadata = OpenXRInteractionProfileMetaData::get_singleton();
+	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
 	ERR_FAIL_NULL(metadata);
 
 	// HTC Vive Cosmos controller
diff --git a/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp b/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp
index 087631a8b9..8b8c6c5353 100644
--- a/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp
+++ b/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp
@@ -30,7 +30,7 @@
 
 #include "openxr_htc_vive_tracker_extension.h"
 
-#include "../action_map/openxr_interaction_profile_meta_data.h"
+#include "../action_map/openxr_interaction_profile_metadata.h"
 
 #include "core/string/print_string.h"
 
@@ -47,7 +47,7 @@ bool OpenXRHTCViveTrackerExtension::is_available() {
 }
 
 void OpenXRHTCViveTrackerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetaData *metadata = OpenXRInteractionProfileMetaData::get_singleton();
+	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
 	ERR_FAIL_NULL(metadata);
 
 	// HTC Vive tracker
diff --git a/modules/openxr/extensions/openxr_huawei_controller_extension.cpp b/modules/openxr/extensions/openxr_huawei_controller_extension.cpp
index 8b8662cfcb..baa6d6ded8 100644
--- a/modules/openxr/extensions/openxr_huawei_controller_extension.cpp
+++ b/modules/openxr/extensions/openxr_huawei_controller_extension.cpp
@@ -30,7 +30,7 @@
 
 #include "openxr_huawei_controller_extension.h"
 
-#include "../action_map/openxr_interaction_profile_meta_data.h"
+#include "../action_map/openxr_interaction_profile_metadata.h"
 
 HashMap<String, bool *> OpenXRHuaweiControllerExtension::get_requested_extensions() {
 	HashMap<String, bool *> request_extensions;
@@ -45,7 +45,7 @@ bool OpenXRHuaweiControllerExtension::is_available() {
 }
 
 void OpenXRHuaweiControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetaData *metadata = OpenXRInteractionProfileMetaData::get_singleton();
+	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
 	ERR_FAIL_NULL(metadata);
 
 	// Huawei controller
diff --git a/modules/openxr/extensions/openxr_ml2_controller_extension.cpp b/modules/openxr/extensions/openxr_ml2_controller_extension.cpp
index 7dad8deb8c..979ac22d08 100644
--- a/modules/openxr/extensions/openxr_ml2_controller_extension.cpp
+++ b/modules/openxr/extensions/openxr_ml2_controller_extension.cpp
@@ -30,7 +30,7 @@
 
 #include "openxr_ml2_controller_extension.h"
 
-#include "../action_map/openxr_interaction_profile_meta_data.h"
+#include "../action_map/openxr_interaction_profile_metadata.h"
 
 HashMap<String, bool *> OpenXRML2ControllerExtension::get_requested_extensions() {
 	HashMap<String, bool *> request_extensions;
@@ -45,7 +45,7 @@ bool OpenXRML2ControllerExtension::is_available() {
 }
 
 void OpenXRML2ControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetaData *metadata = OpenXRInteractionProfileMetaData::get_singleton();
+	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
 	ERR_FAIL_NULL(metadata);
 
 	// Magic Leap 2 Controller
diff --git a/modules/openxr/extensions/openxr_pico_controller_extension.cpp b/modules/openxr/extensions/openxr_pico_controller_extension.cpp
index 8be961a68e..6c492d2e5a 100644
--- a/modules/openxr/extensions/openxr_pico_controller_extension.cpp
+++ b/modules/openxr/extensions/openxr_pico_controller_extension.cpp
@@ -30,7 +30,7 @@
 
 #include "openxr_pico_controller_extension.h"
 
-#include "../action_map/openxr_interaction_profile_meta_data.h"
+#include "../action_map/openxr_interaction_profile_metadata.h"
 
 // Pico controllers are not part of the OpenXR spec at the time of writing this
 // code. We'll hardcode the extension name that is used internally, verified by
@@ -53,7 +53,7 @@ bool OpenXRPicoControllerExtension::is_available() {
 }
 
 void OpenXRPicoControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetaData *metadata = OpenXRInteractionProfileMetaData::get_singleton();
+	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
 	ERR_FAIL_NULL(metadata);
 
 	// Pico controller (Pico 4 and Pico Neo 3 controllers)
diff --git a/modules/openxr/extensions/openxr_wmr_controller_extension.cpp b/modules/openxr/extensions/openxr_wmr_controller_extension.cpp
index a9b27013f1..7d43d2e304 100644
--- a/modules/openxr/extensions/openxr_wmr_controller_extension.cpp
+++ b/modules/openxr/extensions/openxr_wmr_controller_extension.cpp
@@ -30,7 +30,7 @@
 
 #include "openxr_wmr_controller_extension.h"
 
-#include "../action_map/openxr_interaction_profile_meta_data.h"
+#include "../action_map/openxr_interaction_profile_metadata.h"
 
 HashMap<String, bool *> OpenXRWMRControllerExtension::get_requested_extensions() {
 	HashMap<String, bool *> request_extensions;
@@ -47,7 +47,7 @@ bool OpenXRWMRControllerExtension::is_available(WMRControllers p_type) {
 }
 
 void OpenXRWMRControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetaData *metadata = OpenXRInteractionProfileMetaData::get_singleton();
+	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
 	ERR_FAIL_NULL(metadata);
 
 	// HP MR controller (newer G2 controllers)