From 94892dc0918de6d7edcd46640d94eb74b02d9833 Mon Sep 17 00:00:00 2001
From: Clemens Zeidler <clemens.zeidler@googlemail.com>
Date: Tue, 17 Aug 2010 22:54:00 +0000
Subject: [PATCH] Make arguments const if appropriated. Style issues and
 port_id error check. Thanks Stippi.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38214 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/private/interface/WindowStack.h | 19 ++++++++++---------
 src/kits/interface/WindowStack.cpp      | 24 ++++++++++++------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/headers/private/interface/WindowStack.h b/headers/private/interface/WindowStack.h
index 202ea45ed9..aed9aef8e4 100644
--- a/headers/private/interface/WindowStack.h
+++ b/headers/private/interface/WindowStack.h
@@ -16,14 +16,15 @@ public:
 
 		status_t				InitCheck();
 
-		status_t				AddWindow(BWindow* window);
-		status_t				AddWindow(BMessenger& window);
-		status_t				AddWindowAt(BWindow* window, int32 position);
-		status_t				AddWindowAt(BMessenger& window,
+		status_t				AddWindow(const BWindow* window);
+		status_t				AddWindow(const BMessenger& window);
+		status_t				AddWindowAt(const BWindow* window,
+									int32 position);
+		status_t				AddWindowAt(const BMessenger& window,
 									int32 position);
 
-		status_t				RemoveWindow(BWindow* window);
-		status_t				RemoveWindow(BMessenger& window);
+		status_t				RemoveWindow(const BWindow* window);
+		status_t				RemoveWindow(const BMessenger& window);
 		status_t				RemoveWindowAt(int32 position,
 									BMessenger* window = NULL);
 
@@ -31,11 +32,11 @@ public:
 
 		status_t				WindowAt(int32 position,
 									BMessenger& messenger);
-		bool					HasWindow(BWindow* window);
-		bool					HasWindow(BMessenger& window);
+		bool					HasWindow(const BWindow* window);
+		bool					HasWindow(const BMessenger& window);
 
 private:
-		status_t				_AttachMessenger(BMessenger& window);
+		status_t				_AttachMessenger(const BMessenger& window);
 		status_t				_ReadMessenger(BMessenger& window);
 		status_t				_StartMessage(int32 what);
 
diff --git a/src/kits/interface/WindowStack.cpp b/src/kits/interface/WindowStack.cpp
index 3a59213ee5..173672bcb9 100644
--- a/src/kits/interface/WindowStack.cpp
+++ b/src/kits/interface/WindowStack.cpp
@@ -30,7 +30,7 @@ BWindowStack::BWindowStack(BWindow* window)
 {
 	port_id receivePort = create_port(B_LOOPER_PORT_DEFAULT_CAPACITY,
 		"w_stack<app_server");
-	if (receivePort != B_OK)
+	if (receivePort >= 0)
 		fLink = new(std::nothrow) BPrivate::PortLink(
 			window->fLink->SenderPort(), receivePort);
 }
@@ -47,14 +47,14 @@ BWindowStack::~BWindowStack()
 status_t
 BWindowStack::InitCheck()
 {
-	if (!fLink)
+	if (fLink == NULL)
 		return B_NO_MEMORY;
 	return B_OK;
 }
 
 
 status_t
-BWindowStack::AddWindow(BWindow* window)
+BWindowStack::AddWindow(const BWindow* window)
 {
 	BMessenger messenger(window);
 	return AddWindow(messenger);
@@ -62,14 +62,14 @@ BWindowStack::AddWindow(BWindow* window)
 
 
 status_t
-BWindowStack::AddWindow(BMessenger& window)
+BWindowStack::AddWindow(const BMessenger& window)
 {
 	return AddWindowAt(window, -1);
 }
 
 
 status_t
-BWindowStack::AddWindowAt(BWindow* window, int32 position)
+BWindowStack::AddWindowAt(const BWindow* window, int32 position)
 {
 	BMessenger messenger(window);
 	return AddWindowAt(messenger, position);
@@ -77,7 +77,7 @@ BWindowStack::AddWindowAt(BWindow* window, int32 position)
 
 
 status_t
-BWindowStack::AddWindowAt(BMessenger& window, int32 position)
+BWindowStack::AddWindowAt(const BMessenger& window, int32 position)
 {
 	_StartMessage(kAddWindowToStack);
 
@@ -93,7 +93,7 @@ BWindowStack::AddWindowAt(BMessenger& window, int32 position)
 
 
 status_t
-BWindowStack::RemoveWindow(BWindow* window)
+BWindowStack::RemoveWindow(const BWindow* window)
 {
 	BMessenger messenger(window);
 	return RemoveWindow(messenger);
@@ -101,7 +101,7 @@ BWindowStack::RemoveWindow(BWindow* window)
 
 
 status_t
-BWindowStack::RemoveWindow(BMessenger& window)
+BWindowStack::RemoveWindow(const BMessenger& window)
 {
 	_StartMessage(kRemoveWindowFromStack);
 	_AttachMessenger(window);
@@ -164,7 +164,7 @@ BWindowStack::WindowAt(int32 position, BMessenger& messenger)
 
 
 bool
-BWindowStack::HasWindow(BWindow* window)
+BWindowStack::HasWindow(const BWindow* window)
 {
 	BMessenger messenger(window);
 	return HasWindow(messenger);
@@ -172,7 +172,7 @@ BWindowStack::HasWindow(BWindow* window)
 
 
 bool
-BWindowStack::HasWindow(BMessenger& window)
+BWindowStack::HasWindow(const BMessenger& window)
 {
 	_StartMessage(kStackHasWindow);
 	_AttachMessenger(window);
@@ -191,9 +191,9 @@ BWindowStack::HasWindow(BMessenger& window)
 
 
 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<int32>(messengerPrivate.Token());
 	return fLink->Attach<team_id>(messengerPrivate.Team());