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
haiku · Apr 13, 2016 · e9208b6 · e9208b6
1 parent 3801c37
commit e9208b6
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 50 deletions.
diff --git a/headers/private/screen_saver/BuildScreenSaverDefaultSettingsView.h b/headers/private/screen_saver/BuildScreenSaverDefaultSettingsView.h
diff --git a/headers/private/screen_saver/DefaultSettingsView.h 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
@@ -14,11 +14,10 @@
 #include <stdlib.h>
 
 #include <Catalog.h>
+#include <DefaultSettingsView.h>
 #include <OS.h>
 #include <View.h>
 
-#include <BuildScreenSaverDefaultSettingsView.h>
-
 #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
@@ -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
@@ -10,12 +10,11 @@
 #include "DebugNow.h"
 
 #include <Catalog.h>
+#include <DefaultSettingsView.h>
 #include <Font.h>
 #include <StringView.h>
 #include <View.h>
 
-#include <BuildScreenSaverDefaultSettingsView.h>
-
 
 #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
@@ -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
@@ -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
@@ -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
@@ -12,12 +12,12 @@
 #include <stdlib.h>
 
 #include <Catalog.h>
+#include <DefaultSettingsView.h>
 #include <Font.h>
 #include <ScreenSaver.h>
 #include <StringView.h>
 #include <View.h>
 
-#include <BuildScreenSaverDefaultSettingsView.h>
 
 #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
@@ -16,10 +16,9 @@
 
 #include <Bitmap.h>
 #include <Catalog.h>
+#include <DefaultSettingsView.h>
 #include <MimeType.h>
 
-#include <BuildScreenSaverDefaultSettingsView.h>
-
 #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
@@ -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
@@ -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
@@ -13,6 +13,7 @@
 
 #include <Bitmap.h>
 #include <Catalog.h>
+#include <DefaultSettingsView.h>
 #include <Font.h>
 #include <ObjectList.h>
 #include <Picture.h>
@@ -23,7 +24,6 @@
 #include <TextView.h>
 #include <View.h>
 
-#include <BuildScreenSaverDefaultSettingsView.h>
 
 #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/...r/BuildScreenSaverDefaultSettingsView.cpp → src/kits/screensaver/DefaultSettingsView.cpp b/...r/BuildScreenSaverDefaultSettingsView.cpp → src/kits/screensaver/DefaultSettingsView.cpp
@@ -8,7 +8,7 @@
  */
 
 
-#include <BuildScreenSaverDefaultSettingsView.h>
+#include <DefaultSettingsView.h>
 
 #include <LayoutBuilder.h>
 #include <StringView.h>
@@ -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
@@ -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
@@ -23,6 +23,7 @@
 #include <Catalog.h>
 #include <CheckBox.h>
 #include <ControlLook.h>
+#include <DefaultSettingsView.h>
 #include <Directory.h>
 #include <DurationFormat.h>
 #include <Entry.h>
@@ -49,8 +50,6 @@
 #include <algorithm>
 	// for std::max and std::min
 
-#include <BuildScreenSaverDefaultSettingsView.h>
-
 #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]