[Scummvm-cvs-logs] SF.net SVN: scummvm:[53911] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri Oct 29 01:56:37 CEST 2010


Revision: 53911
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53911&view=rev
Author:   lordhoto
Date:     2010-10-28 23:56:36 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
KYRA: Fix some code errors reported by ICC (i.e. subclasses not overwriting methods by missing a const.)

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound.h
    scummvm/trunk/engines/kyra/sound_adlib.cpp
    scummvm/trunk/engines/kyra/sound_adlib.h
    scummvm/trunk/engines/kyra/sound_intern.h
    scummvm/trunk/engines/kyra/sound_midi.cpp

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2010-10-28 22:58:39 UTC (rev 53910)
+++ scummvm/trunk/engines/kyra/sound.h	2010-10-28 23:56:36 UTC (rev 53911)
@@ -94,7 +94,7 @@
 	 * @param track track number
 	 * @return true if available, false otherwise
 	 */
-	virtual bool hasSoundFile(uint file) { return (fileListEntry(file) != 0); }
+	virtual bool hasSoundFile(uint file) const { return (fileListEntry(file) != 0); }
 
 	/**
 	 * Load a specifc sound file for use of

Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp	2010-10-28 22:58:39 UTC (rev 53910)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp	2010-10-28 23:56:36 UTC (rev 53911)
@@ -2304,7 +2304,7 @@
 	//_vm->_system->delayMillis(3 * 60);
 }
 
-bool SoundAdLibPC::isPlaying() {
+bool SoundAdLibPC::isPlaying() const {
 	return _driver->callback(7, int(0)) != 0;
 }
 

Modified: scummvm/trunk/engines/kyra/sound_adlib.h
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.h	2010-10-28 22:58:39 UTC (rev 53910)
+++ scummvm/trunk/engines/kyra/sound_adlib.h	2010-10-28 23:56:36 UTC (rev 53911)
@@ -76,7 +76,7 @@
 
 	void playTrack(uint8 track);
 	void haltTrack();
-	bool isPlaying();
+	bool isPlaying() const;
 
 	void playSoundEffect(uint8 track);
 

Modified: scummvm/trunk/engines/kyra/sound_intern.h
===================================================================
--- scummvm/trunk/engines/kyra/sound_intern.h	2010-10-28 22:58:39 UTC (rev 53910)
+++ scummvm/trunk/engines/kyra/sound_intern.h	2010-10-28 23:56:36 UTC (rev 53911)
@@ -68,7 +68,7 @@
 
 	void playTrack(uint8 track);
 	void haltTrack();
-	bool isPlaying();
+	bool isPlaying() const;
 
 	void playSoundEffect(uint8 track);
 	void stopAllSoundEffects();

Modified: scummvm/trunk/engines/kyra/sound_midi.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_midi.cpp	2010-10-28 22:58:39 UTC (rev 53910)
+++ scummvm/trunk/engines/kyra/sound_midi.cpp	2010-10-28 23:56:36 UTC (rev 53911)
@@ -683,7 +683,7 @@
 	_output->deinitSource(0);
 }
 
-bool SoundMidiPC::isPlaying() {
+bool SoundMidiPC::isPlaying() const {
 	Common::StackLock lock(_mutex);
 
 	return _music->isPlaying();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list