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

Make arguments const if appropriated. Style issues and port_id error check. Thanks Stippi.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38214 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2010-08-17 22:54:00 +00:00
parent e0ef64750f
commit 94892dc091
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/interface/WindowStack.h
+10 -9
View File
@@ -16,14 +16,15 @@ public:
status_t InitCheck(); status_t InitCheck();
status_t AddWindow(BWindow* window); status_t AddWindow(const BWindow* window);
status_t AddWindow(BMessenger& window); status_t AddWindow(const BMessenger& window);
status_t AddWindowAt(BWindow* window, int32 position); status_t AddWindowAt(const BWindow* window,
status_t AddWindowAt(BMessenger& window, int32 position);
status_t AddWindowAt(const BMessenger& window,
int32 position); int32 position);
status_t RemoveWindow(BWindow* window); status_t RemoveWindow(const BWindow* window);
status_t RemoveWindow(BMessenger& window); status_t RemoveWindow(const BMessenger& window);
status_t RemoveWindowAt(int32 position, status_t RemoveWindowAt(int32 position,
BMessenger* window = NULL); BMessenger* window = NULL);
@@ -31,11 +32,11 @@ public:
status_t WindowAt(int32 position, status_t WindowAt(int32 position,
BMessenger& messenger); BMessenger& messenger);
bool HasWindow(BWindow* window); bool HasWindow(const BWindow* window);
bool HasWindow(BMessenger& window); bool HasWindow(const BMessenger& window);
private: private:
status_t _AttachMessenger(BMessenger& window); status_t _AttachMessenger(const BMessenger& window);
status_t _ReadMessenger(BMessenger& window); status_t _ReadMessenger(BMessenger& window);
status_t _StartMessage(int32 what); status_t _StartMessage(int32 what);
src/kits/interface/WindowStack.cpp
+12 -12
View File
@@ -30,7 +30,7 @@ BWindowStack::BWindowStack(BWindow* window)
{ {
port_id receivePort = create_port(B_LOOPER_PORT_DEFAULT_CAPACITY, port_id receivePort = create_port(B_LOOPER_PORT_DEFAULT_CAPACITY,
"w_stack<app_server"); "w_stack<app_server");
if (receivePort != B_OK) if (receivePort >= 0)
fLink = new(std::nothrow) BPrivate::PortLink( fLink = new(std::nothrow) BPrivate::PortLink(
window->fLink->SenderPort(), receivePort); window->fLink->SenderPort(), receivePort);
} }
@@ -47,14 +47,14 @@ BWindowStack::~BWindowStack()
status_t status_t
BWindowStack::InitCheck() BWindowStack::InitCheck()
{ {
if (!fLink) if (fLink == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
return B_OK; return B_OK;
} }
status_t status_t
BWindowStack::AddWindow(BWindow* window) BWindowStack::AddWindow(const BWindow* window)
{ {
BMessenger messenger(window); BMessenger messenger(window);
return AddWindow(messenger); return AddWindow(messenger);
@@ -62,14 +62,14 @@ BWindowStack::AddWindow(BWindow* window)
status_t status_t
BWindowStack::AddWindow(BMessenger& window) BWindowStack::AddWindow(const BMessenger& window)
{ {
return AddWindowAt(window, -1); return AddWindowAt(window, -1);
} }
status_t status_t
BWindowStack::AddWindowAt(BWindow* window, int32 position) BWindowStack::AddWindowAt(const BWindow* window, int32 position)
{ {
BMessenger messenger(window); BMessenger messenger(window);
return AddWindowAt(messenger, position); return AddWindowAt(messenger, position);
@@ -77,7 +77,7 @@ BWindowStack::AddWindowAt(BWindow* window, int32 position)
status_t status_t
BWindowStack::AddWindowAt(BMessenger& window, int32 position) BWindowStack::AddWindowAt(const BMessenger& window, int32 position)
{ {
_StartMessage(kAddWindowToStack); _StartMessage(kAddWindowToStack);
@@ -93,7 +93,7 @@ BWindowStack::AddWindowAt(BMessenger& window, int32 position)
status_t status_t
BWindowStack::RemoveWindow(BWindow* window) BWindowStack::RemoveWindow(const BWindow* window)
{ {
BMessenger messenger(window); BMessenger messenger(window);
return RemoveWindow(messenger); return RemoveWindow(messenger);
@@ -101,7 +101,7 @@ BWindowStack::RemoveWindow(BWindow* window)
status_t status_t
BWindowStack::RemoveWindow(BMessenger& window) BWindowStack::RemoveWindow(const BMessenger& window)
{ {
_StartMessage(kRemoveWindowFromStack); _StartMessage(kRemoveWindowFromStack);
_AttachMessenger(window); _AttachMessenger(window);
@@ -164,7 +164,7 @@ BWindowStack::WindowAt(int32 position, BMessenger& messenger)
bool bool
BWindowStack::HasWindow(BWindow* window) BWindowStack::HasWindow(const BWindow* window)
{ {
BMessenger messenger(window); BMessenger messenger(window);
return HasWindow(messenger); return HasWindow(messenger);
@@ -172,7 +172,7 @@ BWindowStack::HasWindow(BWindow* window)
bool bool
BWindowStack::HasWindow(BMessenger& window) BWindowStack::HasWindow(const BMessenger& window)
{ {
_StartMessage(kStackHasWindow); _StartMessage(kStackHasWindow);
_AttachMessenger(window); _AttachMessenger(window);
@@ -191,9 +191,9 @@ BWindowStack::HasWindow(BMessenger& window)
status_t status_t
BWindowStack::_AttachMessenger(BMessenger& window) BWindowStack::_AttachMessenger(const BMessenger& window)
{ {
BMessenger::Private messengerPrivate(window); BMessenger::Private messengerPrivate(const_cast<BMessenger&>(window));
fLink->Attach<port_id>(messengerPrivate.Port()); fLink->Attach<port_id>(messengerPrivate.Port());
fLink->Attach<int32>(messengerPrivate.Token()); fLink->Attach<int32>(messengerPrivate.Token());
return fLink->Attach<team_id>(messengerPrivate.Team()); return fLink->Attach<team_id>(messengerPrivate.Team());