[Scummvm-cvs-logs] SF.net SVN: scummvm:[46331] scummvm/trunk/engines/m4

[eriktorbjorn at users.sourceforge.net]

Revision: 46331
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46331&view=rev
Author:   eriktorbjorn
Date:     2009-12-11 17:14:55 +0000 (Fri, 11 Dec 2009)

Log Message:
-----------
Renamed line() to drawLine() to silence warning about function parameters in
dialogs.cpp shadowing it. Actually, the function doesn't seem to be used
anywhere at the moment, but perhaps someone has future plans for it?

Modified Paths:
--------------
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/graphics.h

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2009-12-11 09:41:27 UTC (rev 46330)
+++ scummvm/trunk/engines/m4/graphics.cpp	2009-12-11 17:14:55 UTC (rev 46331)
@@ -155,7 +155,7 @@
 
 }
 
-void M4Surface::line(int x1, int y1, int x2, int y2, byte color) {
+void M4Surface::drawLine(int x1, int y1, int x2, int y2, byte color) {
 	Graphics::Surface::drawLine(x1, y1, x2, y2, color);
 }
 

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2009-12-11 09:41:27 UTC (rev 46330)
+++ scummvm/trunk/engines/m4/graphics.h	2009-12-11 17:14:55 UTC (rev 46331)
@@ -118,7 +118,7 @@
 	void hLine(int x1, int x2, int y);
 	void vLineXor(int x, int y1, int y2);
 	void hLineXor(int x1, int x2, int y);
-	void line(int x1, int y1, int x2, int y2, byte color);
+	void drawLine(int x1, int y1, int x2, int y2, byte color);
 	void frameRect(int x1, int y1, int x2, int y2);
 	void fillRect(int x1, int y1, int x2, int y2);
 


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