From e351ecb78d8eed1a230832fba37de434a622bf0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Thu, 29 Dec 2005 14:52:43 +0000
Subject: [PATCH] Renamed BView::_SetViewImage() to _SetViewBitmap(), and
 AS_LAYER_SET_VIEW_IMAGE to AS_LAYER_SET_VIEW_BITMAP.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15716 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/interface/View.h          |  2 +-
 headers/private/app/ServerProtocol.h |  3 +--
 src/kits/interface/View.cpp          | 16 ++++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/headers/os/interface/View.h b/headers/os/interface/View.h
index 1efc17e6b1..443d13fc2f 100644
--- a/headers/os/interface/View.h
+++ b/headers/os/interface/View.h
@@ -528,7 +528,7 @@ private:
 
 			void			_InitData(BRect frame, const char* name, uint32 resizeMask,
 								uint32 flags);
-			status_t		_SetViewImage(const BBitmap* bitmap,BRect srcRect,
+			status_t		_SetViewBitmap(const BBitmap* bitmap,BRect srcRect,
 								BRect dstRect, uint32 followFlags, uint32 options);
 			void			DoBezier(int32 gr, BPoint* controlPoints, pattern p);
 			void			DoShape(int32 gr, BShape* shape, pattern p);
diff --git a/headers/private/app/ServerProtocol.h b/headers/private/app/ServerProtocol.h
index ebbbb81cf8..f8918592b8 100644
--- a/headers/private/app/ServerProtocol.h
+++ b/headers/private/app/ServerProtocol.h
@@ -6,7 +6,6 @@
  *		DarkWyrm <bpmagic@columbus.rr.com>
  *		Jérôme Duval, jerome.duval@free.fr
  */
-
 #ifndef _APP_SERVER_PROTOCOL_H_
 #define _APP_SERVER_PROTOCOL_H_
 
@@ -313,7 +312,7 @@ enum {
 	AS_LAYER_SET_STATE,
 	AS_LAYER_SET_FONT_STATE,
 	AS_LAYER_GET_STATE,
-	AS_LAYER_SET_VIEW_IMAGE,
+	AS_LAYER_SET_VIEW_BITMAP,
 	AS_LAYER_SET_PATTERN,
 	AS_SET_CURRENT_LAYER,
 
diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index 02aa9c61f3..35c7708cd8 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -3038,7 +3038,7 @@ void
 BView::SetViewBitmap(const BBitmap *bitmap, BRect srcRect, BRect dstRect,
 	uint32 followFlags, uint32 options)
 {
-	_SetViewImage(bitmap, srcRect, dstRect, followFlags, options);
+	_SetViewBitmap(bitmap, srcRect, dstRect, followFlags, options);
 }
 
 
@@ -3051,14 +3051,14 @@ BView::SetViewBitmap(const BBitmap *bitmap, uint32 followFlags, uint32 options)
 
  	rect.OffsetTo(0, 0);
 
-	_SetViewImage(bitmap, rect, rect, followFlags, options);
+	_SetViewBitmap(bitmap, rect, rect, followFlags, options);
 }
 
 
 void
 BView::ClearViewBitmap()
 {
-	_SetViewImage(NULL, BRect(), BRect(), 0, 0);
+	_SetViewBitmap(NULL, BRect(), BRect(), 0, 0);
 }
 
 
@@ -3066,7 +3066,7 @@ status_t
 BView::SetViewOverlay(const BBitmap *overlay, BRect srcRect, BRect dstRect,
 	rgb_color *colorKey, uint32 followFlags, uint32 options)
 {
-	status_t err = _SetViewImage(overlay, srcRect, dstRect, followFlags,
+	status_t err = _SetViewBitmap(overlay, srcRect, dstRect, followFlags,
 		options | 0x4);
 
 	// TODO: Incomplete?
@@ -3088,7 +3088,7 @@ BView::SetViewOverlay(const BBitmap *overlay, rgb_color *colorKey,
 
  	rect.OffsetTo(0, 0);
 
-	status_t err = _SetViewImage(overlay, rect, rect, followFlags,
+	status_t err = _SetViewBitmap(overlay, rect, rect, followFlags,
 			options | 0x4);
 
 	// TODO: Incomplete?
@@ -3103,7 +3103,7 @@ BView::SetViewOverlay(const BBitmap *overlay, rgb_color *colorKey,
 void
 BView::ClearViewOverlay()
 {
-	_SetViewImage(NULL, BRect(), BRect(), 0, 0);
+	_SetViewBitmap(NULL, BRect(), BRect(), 0, 0);
 }
 
 
@@ -4251,7 +4251,7 @@ BView::set_shelf(BShelf *shelf)
 
 
 status_t
-BView::_SetViewImage(const BBitmap* bitmap, BRect srcRect,
+BView::_SetViewBitmap(const BBitmap* bitmap, BRect srcRect,
 	BRect dstRect, uint32 followFlags, uint32 options)
 {
 	if (!do_owner_check())
@@ -4259,7 +4259,7 @@ BView::_SetViewImage(const BBitmap* bitmap, BRect srcRect,
 
 	int32 serverToken = bitmap ? bitmap->get_server_token() : -1;
 
-	fOwner->fLink->StartMessage(AS_LAYER_SET_VIEW_IMAGE);
+	fOwner->fLink->StartMessage(AS_LAYER_SET_VIEW_BITMAP);
 	fOwner->fLink->Attach<int32>(serverToken);
 	fOwner->fLink->Attach<BRect>(srcRect);
 	fOwner->fLink->Attach<BRect>(dstRect);