TITANIC: Fix further warnings in CWaveFile

2 files changed, 6 insertions, 7 deletions

diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp
index 53cbc86b05..4a9f64b0cb 100644
--- a/engines/titanic/sound/wave_file.cpp
+++ b/engines/titanic/sound/wave_file.cpp
@@ -63,13 +63,13 @@ bool AudioBufferStream::endOfData() const {
 
 /*------------------------------------------------------------------------*/
 
-CWaveFile::CWaveFile() : _soundManager(nullptr), _audioStream(nullptr),
+CWaveFile::CWaveFile() : _audioStream(nullptr),
 		_waveData(nullptr), _waveSize(0), _dataSize(0), _headerSize(0),
 		_rate(0), _flags(0), _wavType(0), _soundType(Audio::Mixer::kPlainSoundType) {
 	setup();
 }
 
-CWaveFile::CWaveFile(QSoundManager *owner) : _soundManager(owner), _audioStream(nullptr),
+CWaveFile::CWaveFile(QSoundManager *owner) : _audioStream(nullptr),
 		_waveData(nullptr), _waveSize(0), _dataSize(0), _headerSize(0),
 		_rate(0), _flags(0), _wavType(0), _soundType(Audio::Mixer::kPlainSoundType) {
 	setup();
@@ -164,12 +164,12 @@ bool CWaveFile::loadMusic(CAudioBuffer *buffer, DisposeAfterUse::Flag disposeAft
 	return true;
 }
 
-void CWaveFile::load(byte *data, uint size) {
+void CWaveFile::load(byte *data, uint dataSize) {
 	_waveData = data;
-	_waveSize = size;
+	_waveSize = dataSize;
 
 	// Parse the wave header
-	Common::MemoryReadStream wavStream(data, size, DisposeAfterUse::NO);
+	Common::MemoryReadStream wavStream(data, dataSize, DisposeAfterUse::NO);
 	Audio::loadWAVFromStream(wavStream, _dataSize, _rate, _flags, &_wavType);
 	_headerSize = wavStream.pos();
 }
diff --git a/engines/titanic/sound/wave_file.h b/engines/titanic/sound/wave_file.h
index 991ba26232..6bd18989b9 100644
--- a/engines/titanic/sound/wave_file.h
+++ b/engines/titanic/sound/wave_file.h
@@ -44,7 +44,6 @@ private:
 	int _rate;
 	byte _flags;
 	uint16 _wavType;
-	QSoundManager *_soundManager;
 	Audio::SeekableAudioStream *_audioStream;
 private:
 	/**
@@ -55,7 +54,7 @@ private:
 	/**
 	 * Gets passed the raw data for the wave file
 	 */
-	void load(byte *data, uint size);
+	void load(byte *data, uint dataSize);
 public:
 	Audio::Mixer::SoundType _soundType;