i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Moved the AutoLocker class out of the kernel/utils/AutoLock.h header

Browse Source 
into its own shared/AutoLocker.h. It can be used by userland code too.
* Removed headers/private/shared/ObjectLocker.h and replaced all uses of
  BObjectLocker by AutoLocker.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20432 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-03-27 12:05:33 +00:00
parent 30aaba68bc
commit 2b2ec4382a
7 changed files with 182 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Application.cpp
+6 -6
View File
@@ -11,10 +11,10 @@
#include <AppMisc.h>
#include <AppServerLink.h>
#include <AutoLocker.h>
#include <DraggerPrivate.h>
#include <LooperList.h>
#include <MenuWindow.h>
#include <ObjectLocker.h>
#include <PortLink.h>
#include <RosterPrivate.h>
#include <ServerMemoryAllocator.h>
@@ -810,7 +810,7 @@ BApplication::WindowAt(int32 index) const
int32
BApplication::CountLoopers() const
{
BObjectLocker<BLooperList> ListLock(gLooperList);
AutoLocker<BLooperList> ListLock(gLooperList);
if (ListLock.IsLocked())
return gLooperList.CountLoopers();
@@ -823,7 +823,7 @@ BLooper *
BApplication::LooperAt(int32 index) const
{
BLooper *looper = NULL;
BObjectLocker<BLooperList> listLock(gLooperList);
AutoLocker<BLooperList> listLock(gLooperList);
if (listLock.IsLocked())
looper = gLooperList.LooperAt(index);
@@ -848,7 +848,7 @@ BApplication::GetAppInfo(app_info *info) const
BResources *
BApplication::AppResources()
{
BObjectLocker<BLocker> lock(sAppResourcesLock);
AutoLocker<BLocker> lock(sAppResourcesLock);
// BApplication caches its resources, so check
// if it already happened.
@@ -1324,7 +1324,7 @@ BApplication::_WindowQuitLoop(bool quitFilePanels, bool force)
{
BList looperList;
{
BObjectLocker<BLooperList> listLock(gLooperList);
AutoLocker<BLooperList> listLock(gLooperList);
if (listLock.IsLocked()) {
gLooperList.GetLooperList(&looperList);
@@ -1469,7 +1469,7 @@ BApplication::_GetWindowList(BList *list, bool includeMenus) const
// Windows are BLoopers, so we can just check each BLooper to see if it's
// a BWindow (or BMenuWindow)
BObjectLocker<BLooperList> listLock(gLooperList);
AutoLocker<BLooperList> listLock(gLooperList);
if (!listLock.IsLocked())
return B_ERROR;