From bebcc474f865f05ed524f43fe27df98a5d1696dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 30 Oct 2012 20:37:51 +0100 Subject: [PATCH] Renamed a few files to better match their class names. --- .../inbound_filters/notifier/Jamfile | 10 +++++----- .../{ConfigView.cpp => NotifierConfigView.cpp} | 18 +++++++++--------- .../{ConfigView.h => NotifierConfigView.h} | 10 +++++----- .../{filter.cpp => NotifierFilter.cpp} | 4 ++-- ...ilNotification.rdef => NotifierFilter.rdef} | 0 .../fortune/{filter.cpp => FortuneFilter.cpp} | 0 .../outbound_filters/fortune/Jamfile | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) rename src/add-ons/mail_daemon/inbound_filters/notifier/{ConfigView.cpp => NotifierConfigView.cpp} (87%) rename src/add-ons/mail_daemon/inbound_filters/notifier/{ConfigView.h => NotifierConfigView.h} (78%) rename src/add-ons/mail_daemon/inbound_filters/notifier/{filter.cpp => NotifierFilter.cpp} (97%) rename src/add-ons/mail_daemon/inbound_filters/notifier/{NewMailNotification.rdef => NotifierFilter.rdef} (100%) rename src/add-ons/mail_daemon/outbound_filters/fortune/{filter.cpp => FortuneFilter.cpp} (100%) diff --git a/src/add-ons/mail_daemon/inbound_filters/notifier/Jamfile b/src/add-ons/mail_daemon/inbound_filters/notifier/Jamfile index f407acab9c..b00b5d4543 100644 --- a/src/add-ons/mail_daemon/inbound_filters/notifier/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/notifier/Jamfile @@ -5,11 +5,11 @@ UsePublicHeaders [ FDirName add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; -AddResources NewMailNotification : NewMailNotification.rdef ; +AddResources NewMailNotification : NotifierFilter.rdef ; Addon NewMailNotification : - filter.cpp - ConfigView.cpp + NotifierFilter.cpp + NotifierConfigView.cpp : be libmail.so localestub [ TargetLibsupc++ ] ; @@ -17,6 +17,6 @@ Addon NewMailNotification : DoCatalogs NewMailNotification : x-vnd.Haiku-NewMailNotification : - ConfigView.cpp - filter.cpp + NotifierFilter.cpp + NotifierConfigView.cpp ; diff --git a/src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.cpp b/src/add-ons/mail_daemon/inbound_filters/notifier/NotifierConfigView.cpp similarity index 87% rename from src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.cpp rename to src/add-ons/mail_daemon/inbound_filters/notifier/NotifierConfigView.cpp index 0f48672fe8..3827514c15 100644 --- a/src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.cpp +++ b/src/add-ons/mail_daemon/inbound_filters/notifier/NotifierConfigView.cpp @@ -6,7 +6,7 @@ */ -#include "ConfigView.h" +#include "NotifierConfigView.h" #include #include @@ -22,13 +22,13 @@ #undef B_TRANSLATION_CONTEXT -#define B_TRANSLATION_CONTEXT "ConfigView" +#define B_TRANSLATION_CONTEXT "NotifierConfigView" const uint32 kMsgNotifyMethod = 'nomt'; -ConfigView::ConfigView() +NotifierConfigView::NotifierConfigView() : BView("notifier_config", 0) { @@ -55,7 +55,7 @@ ConfigView::ConfigView() void -ConfigView::AttachedToWindow() +NotifierConfigView::AttachedToWindow() { if (BMenuField *field = dynamic_cast(FindView("notify"))) field->Menu()->SetTargetForItems(this); @@ -63,7 +63,7 @@ ConfigView::AttachedToWindow() void -ConfigView::SetTo(const BMessage *archive) +NotifierConfigView::SetTo(const BMessage *archive) { int32 method = archive->FindInt32("notification_method"); if (method < 0) @@ -82,7 +82,7 @@ ConfigView::SetTo(const BMessage *archive) void -ConfigView::UpdateNotifyText() +NotifierConfigView::UpdateNotifyText() { BMenuField *field; if ((field = dynamic_cast(FindView("notify"))) == NULL) @@ -105,7 +105,7 @@ ConfigView::UpdateNotifyText() void -ConfigView::MessageReceived(BMessage *msg) +NotifierConfigView::MessageReceived(BMessage *msg) { switch (msg->what) { case kMsgNotifyMethod: @@ -125,7 +125,7 @@ ConfigView::MessageReceived(BMessage *msg) status_t -ConfigView::Archive(BMessage *into, bool /*deep*/) const +NotifierConfigView::Archive(BMessage *into, bool /*deep*/) const { int32 method = 0; @@ -151,7 +151,7 @@ ConfigView::Archive(BMessage *into, bool /*deep*/) const BView* instantiate_filter_config_panel(BMailAddOnSettings& settings) { - ConfigView *view = new ConfigView(); + NotifierConfigView *view = new NotifierConfigView(); view->SetTo(&settings); return view; } diff --git a/src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.h b/src/add-ons/mail_daemon/inbound_filters/notifier/NotifierConfigView.h similarity index 78% rename from src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.h rename to src/add-ons/mail_daemon/inbound_filters/notifier/NotifierConfigView.h index db95ef0d81..d5b353b70f 100644 --- a/src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.h +++ b/src/add-ons/mail_daemon/inbound_filters/notifier/NotifierConfigView.h @@ -4,8 +4,8 @@ * * Distributed under the terms of the MIT License. */ -#ifndef CONFIG_VIEW_H -#define CONFIG_VIEW_H +#ifndef NOTIFIER_CONFIG_VIEW_H +#define NOTIFIER_CONFIG_VIEW_H #include @@ -21,9 +21,9 @@ enum { }; -class ConfigView : public BView { +class NotifierConfigView : public BView { public: - ConfigView(); + NotifierConfigView(); void SetTo(const BMessage *archive); @@ -36,4 +36,4 @@ public: }; -#endif // CONFIG_VIEW_H +#endif // NOTIFIER_CONFIG_VIEW_H diff --git a/src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp b/src/add-ons/mail_daemon/inbound_filters/notifier/NotifierFilter.cpp similarity index 97% rename from src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp rename to src/add-ons/mail_daemon/inbound_filters/notifier/NotifierFilter.cpp index c7a81e4a1d..219014b50a 100644 --- a/src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp +++ b/src/add-ons/mail_daemon/inbound_filters/notifier/NotifierFilter.cpp @@ -21,11 +21,11 @@ #include -#include "ConfigView.h" +#include "NotifierConfigView.h" #undef B_TRANSLATION_CONTEXT -#define B_TRANSLATION_CONTEXT "filter" +#define B_TRANSLATION_CONTEXT "NotifierFilter" class NotifyFilter : public BMailFilter { diff --git a/src/add-ons/mail_daemon/inbound_filters/notifier/NewMailNotification.rdef b/src/add-ons/mail_daemon/inbound_filters/notifier/NotifierFilter.rdef similarity index 100% rename from src/add-ons/mail_daemon/inbound_filters/notifier/NewMailNotification.rdef rename to src/add-ons/mail_daemon/inbound_filters/notifier/NotifierFilter.rdef diff --git a/src/add-ons/mail_daemon/outbound_filters/fortune/filter.cpp b/src/add-ons/mail_daemon/outbound_filters/fortune/FortuneFilter.cpp similarity index 100% rename from src/add-ons/mail_daemon/outbound_filters/fortune/filter.cpp rename to src/add-ons/mail_daemon/outbound_filters/fortune/FortuneFilter.cpp diff --git a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile index 44dcf8cd7f..ee11dd6100 100644 --- a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile +++ b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile @@ -9,7 +9,7 @@ AddResources Fortune : Fortune.rdef ; Addon Fortune : ConfigView.cpp - filter.cpp + FortuneFilter.cpp : be libmail.so localestub [ TargetLibsupc++ ] ; @@ -18,5 +18,5 @@ DoCatalogs Fortune : x-vnd.Haiku-Fortune : ConfigView.cpp - filter.cpp + FortuneFilter.cpp ;