From 6f4cf45183121189d9d209a934544dee5314ce1f Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Mon, 4 Jul 2005 12:42:05 +0000 Subject: [PATCH] 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 --- src/kits/app/MessageFilter.cpp | 111 +++++++++++++++------------------ 1 file changed, 50 insertions(+), 61 deletions(-) diff --git a/src/kits/app/MessageFilter.cpp b/src/kits/app/MessageFilter.cpp index 6bac156770..4bba15f700 100644 --- a/src/kits/app/MessageFilter.cpp +++ b/src/kits/app/MessageFilter.cpp @@ -25,20 +25,8 @@ // in-coming BMessages. //------------------------------------------------------------------------------ -// Standard Includes ----------------------------------------------------------- - -// System Includes ------------------------------------------------------------- #include -// Project Includes ------------------------------------------------------------ - -// Local Includes -------------------------------------------------------------- - -// Local Defines --------------------------------------------------------------- - -// Globals --------------------------------------------------------------------- - -//------------------------------------------------------------------------------ BMessageFilter::BMessageFilter(uint32 inWhat, filter_hook func) : fFiltersAny(false), what(inWhat), @@ -48,7 +36,8 @@ BMessageFilter::BMessageFilter(uint32 inWhat, filter_hook func) fFilterFunction(func) { } -//------------------------------------------------------------------------------ + + BMessageFilter::BMessageFilter(message_delivery delivery, message_source source, filter_hook func) : fFiltersAny(true), @@ -59,7 +48,8 @@ BMessageFilter::BMessageFilter(message_delivery delivery, message_source source, fFilterFunction(func) { } -//------------------------------------------------------------------------------ + + BMessageFilter::BMessageFilter(message_delivery delivery, message_source source, uint32 inWhat, filter_hook func) : fFiltersAny(false), @@ -70,23 +60,27 @@ BMessageFilter::BMessageFilter(message_delivery delivery, message_source source, fFilterFunction(func) { } -//------------------------------------------------------------------------------ + + BMessageFilter::BMessageFilter(const BMessageFilter& filter) { *this = filter; } -//------------------------------------------------------------------------------ + + BMessageFilter::BMessageFilter(const BMessageFilter* filter) { *this = *filter; } -//------------------------------------------------------------------------------ + + BMessageFilter::~BMessageFilter() { - ; } -//------------------------------------------------------------------------------ -BMessageFilter& BMessageFilter::operator=(const BMessageFilter& from) + + +BMessageFilter & +BMessageFilter::operator=(const BMessageFilter& from) { fFiltersAny = from.FiltersAnyCommand(); what = from.Command(); @@ -98,68 +92,63 @@ BMessageFilter& BMessageFilter::operator=(const BMessageFilter& from) 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; } -//------------------------------------------------------------------------------ -message_delivery BMessageFilter::MessageDelivery() const + + +message_delivery +BMessageFilter::MessageDelivery() const { return fDelivery; } -//------------------------------------------------------------------------------ -message_source BMessageFilter::MessageSource() const + + +message_source +BMessageFilter::MessageSource() const { return fSource; } -//------------------------------------------------------------------------------ -uint32 BMessageFilter::Command() const + + +uint32 +BMessageFilter::Command() const { return what; } -//------------------------------------------------------------------------------ -bool BMessageFilter::FiltersAnyCommand() const + + +bool +BMessageFilter::FiltersAnyCommand() const { return fFiltersAny; } -//------------------------------------------------------------------------------ -BLooper* BMessageFilter::Looper() const + + +BLooper * +BMessageFilter::Looper() const { 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; } -//------------------------------------------------------------------------------ -filter_hook BMessageFilter::FilterFunction() const + + +filter_hook +BMessageFilter::FilterFunction() const { return fFilterFunction; } -//------------------------------------------------------------------------------ - -/* - * $Log $ - * - * $Id $ - * - */ -