summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorkobewi <kobewi4e@gmail.com>2022-08-05 20:35:08 +0200
committerkobewi <kobewi4e@gmail.com>2022-08-23 23:21:32 +0200
commit1abdffe7a029daf634f57132cb5ab5d82a7ccfc9 (patch)
tree1b0d34d6c4bfb94b46b3640e17ce80b5dc291b11 /main
parentd5606503b47a98a5d1d925b2b655760dab850e6e (diff)
Replace Array return types with TypedArray 2
Diffstat (limited to 'main')
-rw-r--r--main/performance.cpp7
-rw-r--r--main/performance.h5
2 files changed, 8 insertions, 4 deletions
diff --git a/main/performance.cpp b/main/performance.cpp
index 0de525134e..bdcd07a216 100644
--- a/main/performance.cpp
+++ b/main/performance.cpp
@@ -32,6 +32,7 @@
#include "core/object/message_queue.h"
#include "core/os/os.h"
+#include "core/variant/typed_array.h"
#include "scene/main/node.h"
#include "scene/main/scene_tree.h"
#include "servers/audio_server.h"
@@ -240,11 +241,11 @@ Variant Performance::get_custom_monitor(const StringName &p_id) {
return return_value;
}
-Array Performance::get_custom_monitor_names() {
+TypedArray<StringName> Performance::get_custom_monitor_names() {
if (!_monitor_map.size()) {
- return Array();
+ return TypedArray<StringName>();
}
- Array return_array;
+ TypedArray<StringName> return_array;
return_array.resize(_monitor_map.size());
int index = 0;
for (KeyValue<StringName, MonitorCall> i : _monitor_map) {
diff --git a/main/performance.h b/main/performance.h
index 00e00886ef..597666b57d 100644
--- a/main/performance.h
+++ b/main/performance.h
@@ -37,6 +37,9 @@
#define PERF_WARN_OFFLINE_FUNCTION
#define PERF_WARN_PROCESS_SYNC
+template <typename T>
+class TypedArray;
+
class Performance : public Object {
GDCLASS(Performance, Object);
@@ -107,7 +110,7 @@ public:
void remove_custom_monitor(const StringName &p_id);
bool has_custom_monitor(const StringName &p_id);
Variant get_custom_monitor(const StringName &p_id);
- Array get_custom_monitor_names();
+ TypedArray<StringName> get_custom_monitor_names();
uint64_t get_monitor_modification_time();