From ef753322a82ff627ad7ef491ee426d5ecb80d937 Mon Sep 17 00:00:00 2001
From: Tyler Dauwalder <tylerdauwalder@nowhere.fake>
Date: Fri, 16 Aug 2002 21:58:44 +0000
Subject: [PATCH] Updated BQuery's BMessenger hack to be more legit (and to
 allow libstorage to compile using public app kit headers)

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@783 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/app/Messenger.h |  1 +
 src/kits/storage/Query.cpp | 19 ++-----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/headers/os/app/Messenger.h b/headers/os/app/Messenger.h
index 601ebe3b72..5eb464f957 100644
--- a/headers/os/app/Messenger.h
+++ b/headers/os/app/Messenger.h
@@ -93,6 +93,7 @@ private:
 	friend class BRoster;
 	friend class BPrivate::TRoster;
 	friend class BMessage;
+	friend class BQuery;
 	friend inline void _set_message_reply_(BMessage *, BMessenger);
 	friend status_t swap_data(type_code, void *, size_t, swap_action);
 	friend bool operator<(const BMessenger &a, const BMessenger &b);
diff --git a/src/kits/storage/Query.cpp b/src/kits/storage/Query.cpp
index abc1ee9ead..778c5ea3da 100644
--- a/src/kits/storage/Query.cpp
+++ b/src/kits/storage/Query.cpp
@@ -26,22 +26,6 @@ enum {
 	NOT_IMPLEMENTED	= B_ERROR,
 };
 
-
-// ===========================================================================
-// Hack to get a BMessenger's port and token.
-
-class _TRoster_ {
-public:
-	static inline void get_messenger_port_token(const BMessenger &messenger,
-												port_id &port, int32 &token)
-	{
-		port = messenger.fPort;
-		token = messenger.fHandlerToken;
-	}
-};
-// ===========================================================================
-
-
 // BQuery
 
 // constructor
@@ -406,7 +390,8 @@ BQuery::SetTarget(BMessenger messenger)
 	if (error == B_OK && _HasFetched())
 		error = B_NOT_ALLOWED;
 	if (error == B_OK) {
-		_TRoster_::get_messenger_port_token(messenger, fPort, fToken);
+		fPort = messenger.fPort;
+		fToken = messenger.fHandlerToken;
 		fLive = true;
 	}
 	return error;