4 files changed, 9 insertions, 9 deletions
diff --git a/platform/javascript/audio_server_javascript.cpp b/platform/javascript/audio_server_javascript.cpp
index fec553df04..d1fba030a5 100644
--- a/platform/javascript/audio_server_javascript.cpp
+++ b/platform/javascript/audio_server_javascript.cpp
@@ -87,7 +87,7 @@ const void* AudioServerJavascript::sample_get_data_ptr(RID p_sample) const{
 	return NULL;
 }
 
-void AudioServerJavascript::sample_set_data(RID p_sample, const DVector<uint8_t>& p_buffer){
+void AudioServerJavascript::sample_set_data(RID p_sample, const PoolVector<uint8_t>& p_buffer){
 
 	Sample *sample = sample_owner.get(p_sample);
 	ERR_FAIL_COND(!sample);
@@ -95,7 +95,7 @@ void AudioServerJavascript::sample_set_data(RID p_sample, const DVector<uint8_t>
 
 	Vector<float> buffer;
 	buffer.resize(sample->length*chans);
-	DVector<uint8_t>::Read r=p_buffer.read();
+	PoolVector<uint8_t>::Read r=p_buffer.read();
 	if (sample->format==SAMPLE_FORMAT_PCM8) {
 		const int8_t*ptr = (const int8_t*)r.ptr();
 		for(int i=0;i<sample->length*chans;i++) {
@@ -116,10 +116,10 @@ void AudioServerJavascript::sample_set_data(RID p_sample, const DVector<uint8_t>
 
 
 }
-DVector<uint8_t> AudioServerJavascript::sample_get_data(RID p_sample) const{
+PoolVector<uint8_t> AudioServerJavascript::sample_get_data(RID p_sample) const{
 
 
-	return DVector<uint8_t>();
+	return PoolVector<uint8_t>();
 }
 
 void AudioServerJavascript::sample_set_mix_rate(RID p_sample,int p_rate){
diff --git a/platform/javascript/audio_server_javascript.h b/platform/javascript/audio_server_javascript.h
index 47aadf6bc6..8e61e94dfc 100644
--- a/platform/javascript/audio_server_javascript.h
+++ b/platform/javascript/audio_server_javascript.h
@@ -131,8 +131,8 @@ public:
 	virtual const void* sample_get_data_ptr(RID p_sample) const;
 
 
-	virtual void sample_set_data(RID p_sample, const DVector<uint8_t>& p_buffer);
-	virtual DVector<uint8_t> sample_get_data(RID p_sample) const;
+	virtual void sample_set_data(RID p_sample, const PoolVector<uint8_t>& p_buffer);
+	virtual PoolVector<uint8_t> sample_get_data(RID p_sample) const;
 
 	virtual void sample_set_mix_rate(RID p_sample,int p_rate);
 	virtual int sample_get_mix_rate(RID p_sample) const;
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp
index 3553bdc7a6..47c8ea89d7 100644
--- a/platform/javascript/os_javascript.cpp
+++ b/platform/javascript/os_javascript.cpp
@@ -519,7 +519,7 @@ bool OS_JavaScript::main_loop_iterate() {
 
 
 	}
-	process_joysticks();
+	process_joypads();
 	return Main::iteration();
 }
 
@@ -824,7 +824,7 @@ void OS_JavaScript::_close_notification_funcs(const String& p_file,int p_flags)
 	}
 }
 
-void OS_JavaScript::process_joysticks() {
+void OS_JavaScript::process_joypads() {
 
 	int joy_count = emscripten_get_num_gamepads();
 	for (int i = 0; i < joy_count; i++) {
diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h
index 4cdc88f4f9..370322e93d 100644
--- a/platform/javascript/os_javascript.h
+++ b/platform/javascript/os_javascript.h
@@ -93,7 +93,7 @@ private:
 
 	static void _close_notification_funcs(const String& p_file,int p_flags);
 
-	void process_joysticks();
+	void process_joypads();
 
 public: