From 37b5ee24f520e46eae28c703d189939e0b18c65b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 19 Dec 2014 22:45:00 -0500
Subject: ACCESS: Rename ASurface copyFrom methods to avoid clash with
 Graphics::Surface

---
 engines/access/screen.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/access/screen.cpp')

diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 35069ba683..d6fddb73b2 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -266,19 +266,19 @@ void Screen::drawRect() {
 	ASurface::drawRect();
 }
 
-void Screen::transCopyFrom(ASurface *src, const Common::Point &destPos) {
+void Screen::transBlitFrom(ASurface *src, const Common::Point &destPos) {
 	addDirtyRect(Common::Rect(destPos.x, destPos.y, destPos.x + src->w, destPos.y + src->h));
-	ASurface::transCopyFrom(src, destPos);
+	ASurface::transBlitFrom(src, destPos);
 }
 
-void Screen::transCopyFrom(ASurface *src, const Common::Rect &bounds) {
+void Screen::transBlitFrom(ASurface *src, const Common::Rect &bounds) {
 	addDirtyRect(bounds);
-	ASurface::transCopyFrom(src, bounds);
+	ASurface::transBlitFrom(src, bounds);
 }
 
-void Screen::copyFrom(Graphics::Surface &src) {
+void Screen::blitFrom(Graphics::Surface &src) {
 	addDirtyRect(Common::Rect(0, 0, src.w, src.h));
-	ASurface::copyFrom(src);
+	ASurface::blitFrom(src);
 }
 
 void Screen::copyBuffer(Graphics::Surface *src) {
-- 
cgit v1.2.3