From 686357a30c669aec2e8e6c0de2daaa1eb4cd0b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Sun, 28 Jul 2013 14:12:37 +0200
Subject: [PATCH] HaikuDepot: MainWindow: Class members for the created views

---
 src/apps/haiku-depot/MainWindow.cpp | 41 ++++++++++++++++-------------
 src/apps/haiku-depot/MainWindow.h   | 18 +++++++++++++
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/apps/haiku-depot/MainWindow.cpp b/src/apps/haiku-depot/MainWindow.cpp
index 6008c494f2..ffd288da4a 100644
--- a/src/apps/haiku-depot/MainWindow.cpp
+++ b/src/apps/haiku-depot/MainWindow.cpp
@@ -34,35 +34,31 @@ MainWindow::MainWindow(BRect frame)
 		B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
 		B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
 {
-	BMenuBar* mainMenu = new BMenuBar(B_TRANSLATE("Main Menu"));
-	BMenu* menu = new BMenu(B_TRANSLATE("Package"));
-	mainMenu->AddItem(menu);
+	BMenuBar* menuBar = new BMenuBar(B_TRANSLATE("Main Menu"));
+	_BuildMenu(menuBar);
 	
-	FilterView* filterView = new FilterView();
+	fFilterView = new FilterView();
+	fPackageListView = new PackageListView();
+	fPackageActionsView = new PackageActionsView();
+	fPackageInfoView = new PackageInfoView();
 	
-	PackageListView* packageListView = new PackageListView();
-
-	PackageActionsView* packageActionsView = new PackageActionsView();
-
-	PackageInfoView* packageInfoView = new PackageInfoView();
-	
-	BSplitView* splitView = new BSplitView(B_VERTICAL, B_USE_SMALL_SPACING);
+	fSplitView = new BSplitView(B_VERTICAL, B_USE_SMALL_SPACING);
 	
 	BLayoutBuilder::Group<>(this, B_VERTICAL, 0.0f)
-		.Add(mainMenu)
-		.Add(filterView)
+		.Add(menuBar)
+		.Add(fFilterView)
 		.AddGroup(B_VERTICAL)
-			.AddSplit(splitView)
-				.Add(packageListView)
-				.Add(packageInfoView)
+			.AddSplit(fSplitView)
+				.Add(fPackageListView)
+				.Add(fPackageInfoView)
 			.End()
-			.Add(packageActionsView)
+			.Add(fPackageActionsView)
 			.SetInsets(B_USE_DEFAULT_SPACING, 0.0f, B_USE_DEFAULT_SPACING,
 				B_USE_DEFAULT_SPACING)
 		.End()
 	;
 
-	splitView->SetCollapsible(0, false);
+	fSplitView->SetCollapsible(0, false);
 }
 
 
@@ -94,3 +90,12 @@ MainWindow::MessageReceived(BMessage* message)
 			break;
 	}
 }
+
+
+void
+MainWindow::_BuildMenu(BMenuBar* menuBar)
+{
+	BMenu* menu = new BMenu(B_TRANSLATE("Package"));
+	menuBar->AddItem(menu);
+
+}
diff --git a/src/apps/haiku-depot/MainWindow.h b/src/apps/haiku-depot/MainWindow.h
index 7f3476cfee..f148a7ad6c 100644
--- a/src/apps/haiku-depot/MainWindow.h
+++ b/src/apps/haiku-depot/MainWindow.h
@@ -7,6 +7,14 @@
 
 #include <Window.h>
 
+#include "Model.h"
+
+
+class BSplitView;
+class FilterView;
+class PackageActionsView;
+class PackageInfoView;
+class PackageListView;
 
 enum {
 	MSG_MAIN_WINDOW_CLOSED		= 'mwcl',
@@ -23,6 +31,16 @@ public:
 	virtual	void				MessageReceived(BMessage* message);
 
 private:
+			void				_BuildMenu(BMenuBar* menuBar);
+
+private:
+			FilterView*			fFilterView;
+			PackageActionsView*	fPackageActionsView;
+			PackageInfoView*	fPackageInfoView;
+			PackageListView*	fPackageListView;
+			BSplitView*			fSplitView;
+
+			Model				fModel;
 };
 
 #endif // MAIN_WINDOW_H