From a5ec0eeb43a14b09d418eed8da3d8767e63c3882 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Fri, 20 Nov 2009 18:35:54 +0000
Subject: [PATCH] Renamed the BMessengers to make clearer to which messengers
 they refer to. Made some parameters const references. Removed leftovers.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34162 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/terminal/AppearPrefView.cpp | 18 +++---------------
 src/apps/terminal/AppearPrefView.h   |  4 ++--
 src/apps/terminal/PrefWindow.cpp     | 14 +++++++-------
 src/apps/terminal/PrefWindow.h       |  4 ++--
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/apps/terminal/AppearPrefView.cpp b/src/apps/terminal/AppearPrefView.cpp
index bc94bf802f..464a1d740c 100644
--- a/src/apps/terminal/AppearPrefView.cpp
+++ b/src/apps/terminal/AppearPrefView.cpp
@@ -28,9 +28,9 @@
 
 
 AppearancePrefView::AppearancePrefView(const char *name,
-		BMessenger messenger)
+		const BMessenger &messenger)
 	: PrefView(name),
-	fAppearancePrefViewMessenger(messenger)
+	fTerminalMessenger(messenger)
 {
   	const char *color_tbl[] = {
 		PREF_TEXT_FORE_COLOR,
@@ -57,9 +57,6 @@ AppearancePrefView::AppearancePrefView(const char *name,
 		NULL
   	};
 
-	float greenDividerSize = StringWidth("Green:") + 8.0;
-	float colorDividerSize = StringWidth("Color:") + 8.0;
-
 	SetLayout(new BGroupLayout(B_HORIZONTAL));
 	
 	BMenu *fontMenu = _MakeFontMenu(MSG_HALF_FONT_CHANGED,
@@ -83,13 +80,8 @@ AppearancePrefView::AppearancePrefView(const char *name,
 	
 	AddChild(layoutView);
 	
-	//fFont->SetDivider(colorDividerSize);
 	fFont->SetAlignment(B_ALIGN_RIGHT);
-	
-	//fFontSize->SetDivider(greenDividerSize);
 	fFontSize->SetAlignment(B_ALIGN_RIGHT);
-
-	//fColorField->SetDivider(colorDividerSize);
 	fColorField->SetAlignment(B_ALIGN_RIGHT);
 
 	fColorControl->SetValue(PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR));
@@ -101,10 +93,6 @@ AppearancePrefView::AppearancePrefView(const char *name,
 	redInput->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
 	greenInput->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
 	blueInput->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
-
-	/*redInput->SetDivider(greenDividerSize);
-	greenInput->SetDivider(greenDividerSize);
-	blueInput->SetDivider(greenDividerSize);*/
 }
 
 
@@ -200,7 +188,7 @@ AppearancePrefView::MessageReceived(BMessage *msg)
 	}
 
 	if (modified) {
-		fAppearancePrefViewMessenger.SendMessage(msg);
+		fTerminalMessenger.SendMessage(msg);
 
 		BMessenger messenger(this);
 		messenger.SendMessage(MSG_PREF_MODIFIED);
diff --git a/src/apps/terminal/AppearPrefView.h b/src/apps/terminal/AppearPrefView.h
index 29c54e964d..228e5d7ee1 100644
--- a/src/apps/terminal/AppearPrefView.h
+++ b/src/apps/terminal/AppearPrefView.h
@@ -19,7 +19,7 @@ class TTextControl;
 
 class AppearancePrefView : public PrefView {
 	public:
-		AppearancePrefView(const char *name, BMessenger messenger);
+		AppearancePrefView(const char *name, const BMessenger &messenger);
 
 		virtual	void	Revert();
 		virtual void	MessageReceived(BMessage *message);
@@ -38,7 +38,7 @@ class AppearancePrefView : public PrefView {
 		BMenuField		*fColorField;
 		BColorControl	*fColorControl;
 
-		BMessenger fAppearancePrefViewMessenger;
+		BMessenger fTerminalMessenger;
 };
 
 #endif	// APPEARANCE_PREF_VIEW_H
diff --git a/src/apps/terminal/PrefWindow.cpp b/src/apps/terminal/PrefWindow.cpp
index c9937a6f56..0479407b67 100644
--- a/src/apps/terminal/PrefWindow.cpp
+++ b/src/apps/terminal/PrefWindow.cpp
@@ -23,19 +23,19 @@
 #include <stdio.h>
 
 
-PrefWindow::PrefWindow(BMessenger messenger)
+PrefWindow::PrefWindow(const BMessenger &messenger)
 	: BWindow(BRect(0, 0, 375, 185), "Terminal Preferences",
 		B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
 		B_NOT_RESIZABLE|B_NOT_ZOOMABLE|B_AUTO_UPDATE_SIZE_LIMITS),
 	fPreviousPref(new PrefHandler(PrefHandler::Default())),
 	fSavePanel(NULL),
 	fDirty(false),
-	fPrefDlgMessenger(messenger)
+	fTerminalMessenger(messenger)
 {
 	BLayoutBuilder::Group<>(this, B_VERTICAL)
 		.AddGroup(B_VERTICAL, 1)
 		.SetInsets(10, 10, 10, 10)
-			.Add(new AppearancePrefView("Appearance", fPrefDlgMessenger))
+			.Add(new AppearancePrefView("Appearance", fTerminalMessenger))
 			.AddGroup(B_HORIZONTAL)
 				.Add(fSaveAsFileButton = new BButton("savebutton",
 					"Save to File" B_UTF8_ELLIPSIS,
@@ -68,7 +68,7 @@ PrefWindow::~PrefWindow()
 void
 PrefWindow::Quit()
 {
-	fPrefDlgMessenger.SendMessage(MSG_PREF_CLOSED);
+	fTerminalMessenger.SendMessage(MSG_PREF_CLOSED);
 	delete fPreviousPref;
 	delete fSavePanel;
 	BWindow::Quit();
@@ -148,9 +148,9 @@ PrefWindow::_Revert()
 	if (fDirty) {
 		PrefHandler::SetDefault(new PrefHandler(fPreviousPref));
 
-		fPrefDlgMessenger.SendMessage(MSG_HALF_FONT_CHANGED);
-		fPrefDlgMessenger.SendMessage(MSG_COLOR_CHANGED);
-		fPrefDlgMessenger.SendMessage(MSG_INPUT_METHOD_CHANGED);
+		fTerminalMessenger.SendMessage(MSG_HALF_FONT_CHANGED);
+		fTerminalMessenger.SendMessage(MSG_COLOR_CHANGED);
+		fTerminalMessenger.SendMessage(MSG_INPUT_METHOD_CHANGED);
 
 		fDirty = false;
 	}
diff --git a/src/apps/terminal/PrefWindow.h b/src/apps/terminal/PrefWindow.h
index b2ade9eeb5..3dea594989 100644
--- a/src/apps/terminal/PrefWindow.h
+++ b/src/apps/terminal/PrefWindow.h
@@ -31,7 +31,7 @@ class PrefHandler;
 class PrefWindow : public BWindow
 {
 	public:
-		PrefWindow(BMessenger messenger);
+		PrefWindow(const BMessenger &messenger);
 		virtual ~PrefWindow();
 
 		virtual void Quit();
@@ -54,7 +54,7 @@ class PrefWindow : public BWindow
 						*fSaveButton;
 
 		bool			fDirty;
-		BMessenger		fPrefDlgMessenger;
+		BMessenger		fTerminalMessenger;
 };
 
 #endif	// PREFDLG_H_INCLUDED