The default version of BMessageFilter::Filter() doesn't do anything. Small style changes, removed a todo.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13422 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2005-07-04 12:42:05 +00:00
parent 687d231c5f
commit 6f4cf45183
+50 -61
View File
@@ -25,20 +25,8 @@
// in-coming BMessages. // in-coming BMessages.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Standard Includes -----------------------------------------------------------
// System Includes -------------------------------------------------------------
#include <MessageFilter.h> #include <MessageFilter.h>
// Project Includes ------------------------------------------------------------
// Local Includes --------------------------------------------------------------
// Local Defines ---------------------------------------------------------------
// Globals ---------------------------------------------------------------------
//------------------------------------------------------------------------------
BMessageFilter::BMessageFilter(uint32 inWhat, filter_hook func) BMessageFilter::BMessageFilter(uint32 inWhat, filter_hook func)
: fFiltersAny(false), : fFiltersAny(false),
what(inWhat), what(inWhat),
@@ -48,7 +36,8 @@ BMessageFilter::BMessageFilter(uint32 inWhat, filter_hook func)
fFilterFunction(func) fFilterFunction(func)
{ {
} }
//------------------------------------------------------------------------------
BMessageFilter::BMessageFilter(message_delivery delivery, message_source source, BMessageFilter::BMessageFilter(message_delivery delivery, message_source source,
filter_hook func) filter_hook func)
: fFiltersAny(true), : fFiltersAny(true),
@@ -59,7 +48,8 @@ BMessageFilter::BMessageFilter(message_delivery delivery, message_source source,
fFilterFunction(func) fFilterFunction(func)
{ {
} }
//------------------------------------------------------------------------------
BMessageFilter::BMessageFilter(message_delivery delivery, message_source source, BMessageFilter::BMessageFilter(message_delivery delivery, message_source source,
uint32 inWhat, filter_hook func) uint32 inWhat, filter_hook func)
: fFiltersAny(false), : fFiltersAny(false),
@@ -70,23 +60,27 @@ BMessageFilter::BMessageFilter(message_delivery delivery, message_source source,
fFilterFunction(func) fFilterFunction(func)
{ {
} }
//------------------------------------------------------------------------------
BMessageFilter::BMessageFilter(const BMessageFilter& filter) BMessageFilter::BMessageFilter(const BMessageFilter& filter)
{ {
*this = filter; *this = filter;
} }
//------------------------------------------------------------------------------
BMessageFilter::BMessageFilter(const BMessageFilter* filter) BMessageFilter::BMessageFilter(const BMessageFilter* filter)
{ {
*this = *filter; *this = *filter;
} }
//------------------------------------------------------------------------------
BMessageFilter::~BMessageFilter() BMessageFilter::~BMessageFilter()
{ {
;
} }
//------------------------------------------------------------------------------
BMessageFilter& BMessageFilter::operator=(const BMessageFilter& from)
BMessageFilter &
BMessageFilter::operator=(const BMessageFilter& from)
{ {
fFiltersAny = from.FiltersAnyCommand(); fFiltersAny = from.FiltersAnyCommand();
what = from.Command(); what = from.Command();
@@ -98,68 +92,63 @@ BMessageFilter& BMessageFilter::operator=(const BMessageFilter& from)
return *this; return *this;
} }
//------------------------------------------------------------------------------
filter_result BMessageFilter::Filter(BMessage* message, BHandler** target)
{
if (fFilterFunction)
{
return fFilterFunction(message, target, this);
}
filter_result
BMessageFilter::Filter(BMessage* message, BHandler** target)
{
return B_DISPATCH_MESSAGE; return B_DISPATCH_MESSAGE;
} }
//------------------------------------------------------------------------------
message_delivery BMessageFilter::MessageDelivery() const
message_delivery
BMessageFilter::MessageDelivery() const
{ {
return fDelivery; return fDelivery;
} }
//------------------------------------------------------------------------------
message_source BMessageFilter::MessageSource() const
message_source
BMessageFilter::MessageSource() const
{ {
return fSource; return fSource;
} }
//------------------------------------------------------------------------------
uint32 BMessageFilter::Command() const
uint32
BMessageFilter::Command() const
{ {
return what; return what;
} }
//------------------------------------------------------------------------------
bool BMessageFilter::FiltersAnyCommand() const
bool
BMessageFilter::FiltersAnyCommand() const
{ {
return fFiltersAny; return fFiltersAny;
} }
//------------------------------------------------------------------------------
BLooper* BMessageFilter::Looper() const
BLooper *
BMessageFilter::Looper() const
{ {
return fLooper; return fLooper;
} }
//------------------------------------------------------------------------------
void BMessageFilter::_ReservedMessageFilter1()
void BMessageFilter::_ReservedMessageFilter1() {}
void BMessageFilter::_ReservedMessageFilter2() {}
void
BMessageFilter::SetLooper(BLooper* owner)
{ {
;
}
//------------------------------------------------------------------------------
void BMessageFilter::_ReservedMessageFilter2()
{
;
}
//------------------------------------------------------------------------------
void BMessageFilter::SetLooper(BLooper* owner)
{
// TODO: implement locking?
fLooper = owner; fLooper = owner;
} }
//------------------------------------------------------------------------------
filter_hook BMessageFilter::FilterFunction() const
filter_hook
BMessageFilter::FilterFunction() const
{ {
return fFilterFunction; return fFilterFunction;
} }
//------------------------------------------------------------------------------
/*
* $Log $
*
* $Id $
*
*/