From e9208b68765a0b50fcb6c35c260d8eda904423d4 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Wed, 13 Apr 2016 14:12:07 -0700 Subject: [PATCH] ScreenSaver: Rename BuildScreenSaverDefaultSettingsView ...to just DefaultSettingsView It is just as obvious what it does in context, but shorter. Rename the function it contains from BuildDefaultScreenSaverSettingsView to BuildDefaultSettingsView --- .../BuildScreenSaverDefaultSettingsView.h | 24 ------------------- .../screen_saver/DefaultSettingsView.h | 23 ++++++++++++++++++ .../screen_savers/butterfly/Butterfly.cpp | 5 ++-- src/add-ons/screen_savers/butterfly/Jamfile | 2 +- .../screen_savers/debugnow/DebugNow.cpp | 5 ++-- src/add-ons/screen_savers/debugnow/Jamfile | 2 +- src/add-ons/screen_savers/glife/Jamfile | 2 +- src/add-ons/screen_savers/haiku/Jamfile | 2 +- .../screen_savers/haiku/ScreenSaver.cpp | 4 ++-- .../screen_savers/icons/IconsSaver.cpp | 5 ++-- src/add-ons/screen_savers/icons/Jamfile | 2 +- src/add-ons/screen_savers/message/Jamfile | 2 +- src/add-ons/screen_savers/message/Message.cpp | 4 ++-- ...ttingsView.cpp => DefaultSettingsView.cpp} | 5 ++-- src/kits/screensaver/Jamfile | 2 +- .../screensaver/ScreenSaverWindow.cpp | 5 ++-- 16 files changed, 44 insertions(+), 50 deletions(-) delete mode 100644 headers/private/screen_saver/BuildScreenSaverDefaultSettingsView.h create mode 100644 headers/private/screen_saver/DefaultSettingsView.h rename src/kits/screensaver/{BuildScreenSaverDefaultSettingsView.cpp => DefaultSettingsView.cpp} (85%) diff --git a/headers/private/screen_saver/BuildScreenSaverDefaultSettingsView.h b/headers/private/screen_saver/BuildScreenSaverDefaultSettingsView.h deleted file mode 100644 index 41414301aa..0000000000 --- a/headers/private/screen_saver/BuildScreenSaverDefaultSettingsView.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2009 Haiku, Inc. All rights reserved. - * Distributed under the terms of the MIT License. - * - * Authors: - * Ryan Leavengood, leavengood@gmail.com - */ -#ifndef _BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW_H -#define _BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW_H - - -class BView; - -namespace BPrivate { - -void -BuildScreenSaverDefaultSettingsView(BView* view, const char* moduleName, - const char* info); - -} // namespace BPrivate - - -#endif // _BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW_H - diff --git a/headers/private/screen_saver/DefaultSettingsView.h b/headers/private/screen_saver/DefaultSettingsView.h new file mode 100644 index 0000000000..6dba52dad9 --- /dev/null +++ b/headers/private/screen_saver/DefaultSettingsView.h @@ -0,0 +1,23 @@ +/* + * Copyright 2009 Haiku, Inc. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Ryan Leavengood, leavengood@gmail.com + */ +#ifndef _DEFAULT_SETTINGS_VIEW_H +#define _DEFAULT_SETTINGS_VIEW_H + + +class BView; + +namespace BPrivate { + +void +BuildDefaultSettingsView(BView* view, const char* moduleName, const char* info); + +} // namespace BPrivate + + +#endif // _DEFAULT_SETTINGS_VIEW_H + diff --git a/src/add-ons/screen_savers/butterfly/Butterfly.cpp b/src/add-ons/screen_savers/butterfly/Butterfly.cpp index e012bc2a7f..99256b6699 100644 --- a/src/add-ons/screen_savers/butterfly/Butterfly.cpp +++ b/src/add-ons/screen_savers/butterfly/Butterfly.cpp @@ -14,11 +14,10 @@ #include #include +#include #include #include -#include - #undef B_TRANSLATION_CONTEXT #define B_TRANSLATION_CONTEXT "Screensaver Butterfly" @@ -43,7 +42,7 @@ Butterfly::Butterfly(BMessage* archive, image_id imageId) void Butterfly::StartConfig(BView* view) { - BPrivate::BuildScreenSaverDefaultSettingsView(view, "Butterfly", + BPrivate::BuildDefaultSettingsView(view, "Butterfly", B_TRANSLATE("by Geoffry Song")); } diff --git a/src/add-ons/screen_savers/butterfly/Jamfile b/src/add-ons/screen_savers/butterfly/Jamfile index 260f3628df..fe02c61e35 100644 --- a/src/add-ons/screen_savers/butterfly/Jamfile +++ b/src/add-ons/screen_savers/butterfly/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src add-ons screen_savers butterfly ; UsePrivateHeaders screen_saver ; - # For BuildScreenSaverDefaultSettingsView + # For BuildDefaultSettingsView AddResources Butterfly : Butterfly.rdef ; diff --git a/src/add-ons/screen_savers/debugnow/DebugNow.cpp b/src/add-ons/screen_savers/debugnow/DebugNow.cpp index 674b62608c..4c94ee5857 100644 --- a/src/add-ons/screen_savers/debugnow/DebugNow.cpp +++ b/src/add-ons/screen_savers/debugnow/DebugNow.cpp @@ -10,12 +10,11 @@ #include "DebugNow.h" #include +#include #include #include #include -#include - #undef B_TRANSLATION_CONTEXT #define B_TRANSLATION_CONTEXT "Screensaver DebugNow" @@ -51,7 +50,7 @@ DebugNow::DebugNow(BMessage* archive, image_id id) void DebugNow::StartConfig(BView* view) { - BPrivate::BuildScreenSaverDefaultSettingsView(view, "DEBUG NOW", + BPrivate::BuildDefaultSettingsView(view, "DEBUG NOW", B_TRANSLATE("by Ryan Leavengood")); } diff --git a/src/add-ons/screen_savers/debugnow/Jamfile b/src/add-ons/screen_savers/debugnow/Jamfile index 2df4d61bc9..af319cd255 100644 --- a/src/add-ons/screen_savers/debugnow/Jamfile +++ b/src/add-ons/screen_savers/debugnow/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons screen_savers debugnow ; SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders screen_saver ; - # For BuildScreenSaverDefaultSettingsView + # For BuildDefaultSettingsView AddResources DebugNow : DebugNow.rdef ; diff --git a/src/add-ons/screen_savers/glife/Jamfile b/src/add-ons/screen_savers/glife/Jamfile index fe5e5e309d..3cc1057a92 100644 --- a/src/add-ons/screen_savers/glife/Jamfile +++ b/src/add-ons/screen_savers/glife/Jamfile @@ -5,7 +5,7 @@ UseBuildFeatureHeaders mesa ; SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders screen_saver ; - # For BuildScreenSaverDefaultSettingsView + # For BuildDefaultSettingsView local sources = GLifeSaver.cpp diff --git a/src/add-ons/screen_savers/haiku/Jamfile b/src/add-ons/screen_savers/haiku/Jamfile index 71c680eb7a..9f8dd9e276 100644 --- a/src/add-ons/screen_savers/haiku/Jamfile +++ b/src/add-ons/screen_savers/haiku/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons screen_savers haiku ; SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders screen_saver ; - # For BuildScreenSaverDefaultSettingsView + # For BuildDefaultSettingsView AddResources Haiku : ScreenSaver.rdef ; diff --git a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp b/src/add-ons/screen_savers/haiku/ScreenSaver.cpp index dcb5a0d307..4bd9590f2a 100644 --- a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp +++ b/src/add-ons/screen_savers/haiku/ScreenSaver.cpp @@ -12,12 +12,12 @@ #include #include +#include #include #include #include #include -#include #undef B_TRANSLATION_CONTEXT #define B_TRANSLATION_CONTEXT "Screensaver Haiku" @@ -61,7 +61,7 @@ ScreenSaver::ScreenSaver(BMessage *archive, image_id id) void ScreenSaver::StartConfig(BView *view) { - BPrivate::BuildScreenSaverDefaultSettingsView(view, "Haiku", + BPrivate::BuildDefaultSettingsView(view, "Haiku", B_TRANSLATE("by Marcus Overhagen")); } diff --git a/src/add-ons/screen_savers/icons/IconsSaver.cpp b/src/add-ons/screen_savers/icons/IconsSaver.cpp index 796aebb9b1..3a026e5e6d 100644 --- a/src/add-ons/screen_savers/icons/IconsSaver.cpp +++ b/src/add-ons/screen_savers/icons/IconsSaver.cpp @@ -16,10 +16,9 @@ #include #include +#include #include -#include - #include "IconDisplay.h" #include "VectorIcon.h" @@ -176,7 +175,7 @@ IconsSaver::Draw(BView* view, int32 frame) void IconsSaver::StartConfig(BView* view) { - BPrivate::BuildScreenSaverDefaultSettingsView(view, "Icons", + BPrivate::BuildDefaultSettingsView(view, "Icons", B_TRANSLATE("by Vincent Duvert")); } diff --git a/src/add-ons/screen_savers/icons/Jamfile b/src/add-ons/screen_savers/icons/Jamfile index a916022b72..2f53874f14 100644 --- a/src/add-ons/screen_savers/icons/Jamfile +++ b/src/add-ons/screen_savers/icons/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src add-ons screen_savers icons ; UsePrivateHeaders screen_saver ; - # For BuildScreenSaverDefaultSettingsView + # For BuildDefaultSettingsView AddResources Icons : Icons.rdef ; diff --git a/src/add-ons/screen_savers/message/Jamfile b/src/add-ons/screen_savers/message/Jamfile index 595531a653..5bbcb3b48b 100644 --- a/src/add-ons/screen_savers/message/Jamfile +++ b/src/add-ons/screen_savers/message/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src add-ons screen_savers message ; UsePrivateHeaders screen_saver ; - # For BuildScreenSaverDefaultSettingsView + # For BuildDefaultSettingsView UsePrivateHeaders shared ; # For ObjectList diff --git a/src/add-ons/screen_savers/message/Message.cpp b/src/add-ons/screen_savers/message/Message.cpp index e9811fa792..cd6eb9f84a 100644 --- a/src/add-ons/screen_savers/message/Message.cpp +++ b/src/add-ons/screen_savers/message/Message.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -23,7 +24,6 @@ #include #include -#include #undef B_TRANSLATION_CONTEXT #define B_TRANSLATION_CONTEXT "Screensaver Message" @@ -120,7 +120,7 @@ Message::~Message() void Message::StartConfig(BView *view) { - BPrivate::BuildScreenSaverDefaultSettingsView(view, "Message", + BPrivate::BuildDefaultSettingsView(view, "Message", B_TRANSLATE("by Ryan Leavengood")); } diff --git a/src/kits/screensaver/BuildScreenSaverDefaultSettingsView.cpp b/src/kits/screensaver/DefaultSettingsView.cpp similarity index 85% rename from src/kits/screensaver/BuildScreenSaverDefaultSettingsView.cpp rename to src/kits/screensaver/DefaultSettingsView.cpp index a8f9be5a3c..4294f630cd 100644 --- a/src/kits/screensaver/BuildScreenSaverDefaultSettingsView.cpp +++ b/src/kits/screensaver/DefaultSettingsView.cpp @@ -8,7 +8,7 @@ */ -#include +#include #include #include @@ -19,8 +19,7 @@ namespace BPrivate { // Provides a consistent look for the settings view for screen savers // that don't provide any configuration settings. void -BuildScreenSaverDefaultSettingsView(BView* view, const char* moduleName, - const char* info) +BuildDefaultSettingsView(BView* view, const char* moduleName, const char* info) { view->SetViewUIColor(B_PANEL_BACKGROUND_COLOR); diff --git a/src/kits/screensaver/Jamfile b/src/kits/screensaver/Jamfile index ff742c7d60..3f4c396aa9 100644 --- a/src/kits/screensaver/Jamfile +++ b/src/kits/screensaver/Jamfile @@ -11,7 +11,7 @@ local architectureObject ; for architectureObject in [ MultiArchSubDirSetup ] { on $(architectureObject) { SharedLibrary [ MultiArchDefaultGristFiles libscreensaver.so ] : - BuildScreenSaverDefaultSettingsView.cpp + DefaultSettingsView.cpp ScreenSaver.cpp ScreenSaverSettings.cpp ScreenSaverRunner.cpp diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp index b69990859e..b1d7a1b77a 100644 --- a/src/preferences/screensaver/ScreenSaverWindow.cpp +++ b/src/preferences/screensaver/ScreenSaverWindow.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -49,8 +50,6 @@ #include // for std::max and std::min -#include - #include "PreviewView.h" #include "ScreenCornerSelector.h" #include "ScreenSaverItem.h" @@ -865,7 +864,7 @@ ModulesView::_OpenSaver() if (fSettingsView->ChildAt(0) == NULL) { // There are no settings at all, we add the module name here to // let it look a bit better at least. - BPrivate::BuildScreenSaverDefaultSettingsView(fSettingsView, + BPrivate::BuildDefaultSettingsView(fSettingsView, fSettings.ModuleName()[0] ? fSettings.ModuleName() : B_TRANSLATE("Blackness"), saver != NULL || !fSettings.ModuleName()[0]