modified some methods names

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4421 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/os/interface/View.h

@@ -522,6 +522,9 @@ public:
 
 	virtual	void			DrawAfterChildren(BRect r);
 
+		// added by OBOS - DO NOT use this when programming BeOS R5!!!
+			float			Scale();
+
 private:
 
 	friend class BScrollBar;
@@ -531,7 +534,7 @@ private:
 	friend class BShelf;
 	friend class BTabView;
 
-	virtual	void			_ReservedView2();
+//	virtual	void			_ReservedView2();
 	virtual	void			_ReservedView3();
 	virtual	void			_ReservedView4();
 	virtual	void			_ReservedView5();
@@ -556,7 +559,7 @@ private:
 			void		InitData(BRect f, const char* name, uint32 rs, uint32 fl);
 			status_t	ArchiveChildren(BMessage* data, bool deep) const;
 			status_t	UnarchiveChildren(BMessage* data, BWindow* w = NULL);
-			status_t	SetViewImage(const BBitmap* bitmap,BRect srcRect, BRect dstRect,
+			status_t	setViewImage(const BBitmap* bitmap,BRect srcRect, BRect dstRect,
 									 uint32 followFlags, uint32 options);
 			void		BeginPicture_pr(BPicture* a_picture, BRect r);
 			void		SetPattern(pattern pat);
@@ -564,60 +567,68 @@ private:
 			void		DoShape(int32 gr, BShape* shape, pattern p);
 			void		DoPictureClip(BPicture* picture, BPoint where, bool invert,
 									  bool sync);
-			bool		remove_from_list(BView* a_view);
+//			bool		removeFromList(BView* a_view);
-			bool		remove_self();
+			bool		removeSelf();
 			bool		do_owner_check() const;
-			void		set_owner(BWindow* the_owner);
+			void		setOwner(BWindow* the_owner);
 			void		do_activate(int32 state);
 			void		check_lock() const;
 			void		check_lock_no_pick() const;
 			void		movesize(uint32 code, int32 h, int32 v);
 			void		handle_tick();
 			char		*test_area(int32 length);
-			void		remove_comm_array();
+			void		removeCommArray();
 			_array_hdr_	*new_comm_array(int32 cnt);
 			BView		*RealParent() const;
 			void		SetScroller(BScrollBar* sb);
 			void		UnsetScroller(BScrollBar* sb);
 			void		RealScrollTo(BPoint);
-			void		init_cache();
+			void		initCachedState();
-			void		set_cached_state();
+			void		setCachedState();
-			void		update_cached_state();
+			void		updateCachedState();
-			void        set_font_state(const BFont* font, uint32 mask);
+			void        setFontState(const BFont* font, uint16 mask);
 			void		fetch_font();
 			uchar		font_encoding() const;
 			BShelf*		shelf() const;
 			void		set_shelf(BShelf* );
 
+			void		deleteView( BView* aView);
+			bool		do_owner_check_no_pick() const;
+			BView*		findView( const BView* aView, const char* viewName ) const;
+			bool		attachView( BView *aView );
+			bool		addToList( BView *aView, BView *before = NULL);
+			bool		removeFromList();
+			bool		callDetachHooks( BView *aView );			
+
 			int32			server_token;
-			uint32			f_type;
+			uint32			fFlags;			// used		// was: f_type
-			float			origin_h;
+			float			originX;		// used		// was: origin_h
-			float			origin_v;
+			float			originY;		// used		// was: origin_v
-			BWindow*		owner;
+			BWindow*		owner;			// used
-			BView*			parent;
+			BView*			parent;			// used
-			BView*			next_sibling;
+			BView*			next_sibling;	// used
-			BView*			prev_sibling;
+			BView*			prev_sibling;	// used
-			BView*			first_child;
+			BView*			first_child;	// used
 
-			int16 			fShowLevel;
+			int16 			fShowLevel;		// used
-			bool			top_level_view;
+			bool			top_level_view;	// used
 			bool			fNoISInteraction;
-			BPicture*		cpicture;
+			BPicture*		cpicture;		// used
-			_array_data_*	comm;
+			_array_data_*	comm;			// used
 
-			BScrollBar*		fVerScroller;
+			BScrollBar*		fVerScroller;	// used
-			BScrollBar*		fHorScroller;
+			BScrollBar*		fHorScroller;	// used
 			bool			f_is_printing;
-			bool			attached;
+			bool			_unused_bool0;				// was: attached;
 			bool			_unused_bool1;
 			bool			_unused_bool2;
-			_view_attr_*	fPermanentState;
+			_view_attr_*	fPermanentState;// used
-			_view_attr_*	fState;
+			_view_attr_*	fState;			// used
-			BRect			fCachedBounds;
+			BRect			fBounds;		// used
-			BShelf*			fShelf;
+			BShelf*			fShelf;			// used
 			void*			pr_state;
-			uint32			fEventMask;
+			uint32			fEventMask;		// used
-			uint32			fEventOptions;
+			uint32			fEventOptions;	// used
 			uint32			_reserved[4];
 #if !_PR3_COMPATIBLE_
 			uint32			_more_reserved[3];

headers/os/interface/Window.h

@@ -48,8 +48,6 @@
 // Project Includes ------------------------------------------------------------
 
 // Local Includes --------------------------------------------------------------
-//#include <PortLink.h>
-class PortLink;	// tweak for compatibility with our build system --DW
 
 // Local Defines ---------------------------------------------------------------
 
@@ -122,7 +120,7 @@ enum {
 
 //----------------------------------------------------------------
 
-class PortLink;
+class BSession;
 class BButton;
 class BMenuBar;
 class BMenuItem;
@@ -448,7 +446,7 @@ virtual BMessage	*ConvertToMessage(void* raw, int32 code);					// HUGE function
 		BView			*top_view;					// used
 		BView			*fFocus;					// used
 		BView			*fLastMouseMovedView;		// used
-		PortLink		*serverLink;				// used
+		BSession		*session;				// used
 		BMenuBar		*fKeyMenuBar;				// used
 		BButton			*fDefaultButton;			// used
 		BList			accelList;					// used
@@ -476,11 +474,7 @@ virtual BMessage	*ConvertToMessage(void* raw, int32 code);					// HUGE function
 		BMessageRunner	*fPulseRunner;				// used
 		BRect			fCurrentFrame;
 
-		// dedicated for graphic calls
+		uint32			_reserved[2];	// was 8
-		PortLink		*srvGfxLink;				// used
-		uint32			_reserved;
-		
-//		uint32			_reserved[2];	// was 8
 #if !_PR3_COMPATIBLE_
 		uint32			_more_reserved[4];
 #endif