From 4431e07a3a8df6e19160e5c507be98b0cf22a010 Mon Sep 17 00:00:00 2001 From: Adi Oanca Date: Wed, 19 Jan 2005 16:46:36 +0000 Subject: [PATCH] a BList member is allocated on stack now git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10878 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/server/CursorManager.cpp | 44 +++++++++++------------- src/servers/app/server/CursorManager.h | 7 +--- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/src/servers/app/server/CursorManager.cpp b/src/servers/app/server/CursorManager.cpp index 3a292e0aa6..979f7b857f 100644 --- a/src/servers/app/server/CursorManager.cpp +++ b/src/servers/app/server/CursorManager.cpp @@ -40,8 +40,6 @@ CursorManager *cursormanager; //! Initializes the CursorManager CursorManager::CursorManager(void) { - fCursorList=new BList(0); - // Error code for AddCursor fTokenizer.ExcludeValue(B_ERROR); @@ -88,14 +86,12 @@ CursorManager::CursorManager(void) CursorManager::~CursorManager(void) { ServerCursor *temp; - for(int32 i=0; iCountItems();i++) + for(int32 i=0; iItemAt(i); + temp=(ServerCursor*)fCursorList.ItemAt(i); if(temp) delete temp; } - fCursorList->MakeEmpty(); - delete fCursorList; // Note that it is not necessary to remove and delete the system // cursors. These cursors are kept in the list with a NULL application @@ -115,7 +111,7 @@ int32 CursorManager::AddCursor(ServerCursor *sc) return B_ERROR; Lock(); - fCursorList->AddItem(sc); + fCursorList.AddItem(sc); int32 value=fTokenizer.GetToken(); sc->fToken=value; Unlock(); @@ -134,12 +130,12 @@ void CursorManager::DeleteCursor(int32 token) Lock(); ServerCursor *temp; - for(int32 i=0; iCountItems();i++) + for(int32 i=0; iItemAt(i); + temp=(ServerCursor*)fCursorList.ItemAt(i); if(temp && temp->fToken==token) { - fCursorList->RemoveItem(i); + fCursorList.RemoveItem(i); delete temp; break; } @@ -156,19 +152,19 @@ void CursorManager::RemoveAppCursors(team_id team) Lock(); int32 i=0; - ServerCursor *temp=(ServerCursor*)fCursorList->ItemAt(i); + ServerCursor *temp=(ServerCursor*)fCursorList.ItemAt(i); while(temp) { if(temp && temp->OwningTeam()==team) { - fCursorList->RemoveItem(i); + fCursorList.RemoveItem(i); delete temp; } else { i++; } - temp=(ServerCursor*)fCursorList->ItemAt(i); + temp=(ServerCursor*)fCursorList.ItemAt(i); } Unlock(); } @@ -373,7 +369,7 @@ void CursorManager::ChangeCursor(cursor_which which, int32 token) if(cursor->GetAppSignature()) cursor->SetAppSignature(""); - fCursorList->RemoveItem(cursor); + fCursorList.RemoveItem(cursor); break; } case B_CURSOR_TEXT: @@ -385,7 +381,7 @@ void CursorManager::ChangeCursor(cursor_which which, int32 token) if(cursor->GetAppSignature()) cursor->SetAppSignature(""); - fCursorList->RemoveItem(cursor); + fCursorList.RemoveItem(cursor); break; } case B_CURSOR_MOVE: @@ -397,7 +393,7 @@ void CursorManager::ChangeCursor(cursor_which which, int32 token) if(cursor->GetAppSignature()) cursor->SetAppSignature(""); - fCursorList->RemoveItem(cursor); + fCursorList.RemoveItem(cursor); break; } case B_CURSOR_DRAG: @@ -409,7 +405,7 @@ void CursorManager::ChangeCursor(cursor_which which, int32 token) if(cursor->GetAppSignature()) cursor->SetAppSignature(""); - fCursorList->RemoveItem(cursor); + fCursorList.RemoveItem(cursor); break; } case B_CURSOR_RESIZE: @@ -421,7 +417,7 @@ void CursorManager::ChangeCursor(cursor_which which, int32 token) if(cursor->GetAppSignature()) cursor->SetAppSignature(""); - fCursorList->RemoveItem(cursor); + fCursorList.RemoveItem(cursor); break; } case B_CURSOR_RESIZE_NWSE: @@ -433,7 +429,7 @@ void CursorManager::ChangeCursor(cursor_which which, int32 token) if(cursor->GetAppSignature()) cursor->SetAppSignature(""); - fCursorList->RemoveItem(cursor); + fCursorList.RemoveItem(cursor); break; } case B_CURSOR_RESIZE_NESW: @@ -445,7 +441,7 @@ void CursorManager::ChangeCursor(cursor_which which, int32 token) if(cursor->GetAppSignature()) cursor->SetAppSignature(""); - fCursorList->RemoveItem(cursor); + fCursorList.RemoveItem(cursor); break; } case B_CURSOR_RESIZE_NS: @@ -457,7 +453,7 @@ void CursorManager::ChangeCursor(cursor_which which, int32 token) if(cursor->GetAppSignature()) cursor->SetAppSignature(""); - fCursorList->RemoveItem(cursor); + fCursorList.RemoveItem(cursor); break; } case B_CURSOR_RESIZE_EW: @@ -469,7 +465,7 @@ void CursorManager::ChangeCursor(cursor_which which, int32 token) if(cursor->GetAppSignature()) cursor->SetAppSignature(""); - fCursorList->RemoveItem(cursor); + fCursorList.RemoveItem(cursor); break; } default: @@ -487,9 +483,9 @@ void CursorManager::ChangeCursor(cursor_which which, int32 token) ServerCursor *CursorManager::FindCursor(int32 token) { ServerCursor *temp; - for(int32 i=0; iCountItems();i++) + for(int32 i=0; iItemAt(i); + temp=(ServerCursor*)fCursorList.ItemAt(i); if(temp && temp->fToken==token) return temp; } diff --git a/src/servers/app/server/CursorManager.h b/src/servers/app/server/CursorManager.h index e4ca248c49..84e2aa75ad 100644 --- a/src/servers/app/server/CursorManager.h +++ b/src/servers/app/server/CursorManager.h @@ -51,11 +51,6 @@ public: int32 AddCursor(ServerCursor *sc); void DeleteCursor(int32 token); void RemoveAppCursors(team_id team); - void ShowCursor(void); - void HideCursor(void); - void ObscureCursor(void); - void SetCursor(int32 token); - void SetCursor(cursor_which which); void SetCursorSet(const char *path); ServerCursor *GetCursor(cursor_which which); cursor_which GetCursorWhich(void); @@ -64,7 +59,7 @@ public: private: ServerCursor *FindCursor(int32 token); - BList *fCursorList; + BList fCursorList; TokenHandler fTokenizer; // System cursor members