From bffb78de5b118ce7f46f01b4ade6bced61bb9ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= <jonas@kirilla.com>
Date: Thu, 17 Mar 2011 02:28:45 +0000
Subject: [PATCH] Build fix. CID 3165 FORWARD_NULL, avoid casting be_app.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40986 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/preferences/datatranslations/DataTranslations.cpp  |  9 +--------
 src/preferences/datatranslations/DataTranslations.h    | 10 ----------
 .../datatranslations/DataTranslationsSettings.cpp      | 10 ++++++++++
 .../datatranslations/DataTranslationsSettings.h        |  2 ++
 .../datatranslations/DataTranslationsWindow.cpp        |  6 +++---
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/preferences/datatranslations/DataTranslations.cpp b/src/preferences/datatranslations/DataTranslations.cpp
index 17d1b702ae..d011c221ec 100644
--- a/src/preferences/datatranslations/DataTranslations.cpp
+++ b/src/preferences/datatranslations/DataTranslations.cpp
@@ -14,13 +14,13 @@
 
 #include <Alert.h>
 #include <Catalog.h>
+#include <Entry.h>
 #include <Directory.h>
 #include <FindDirectory.h>
 #include <String.h>
 #include <TranslatorRoster.h>
 #include <TextView.h>
 
-#include "DataTranslationsSettings.h"
 #include "DataTranslationsWindow.h"
 
 
@@ -43,13 +43,6 @@ DataTranslationsApplication::~DataTranslationsApplication()
 }
 
 
-void
-DataTranslationsApplication::SetWindowCorner(const BPoint& leftTop)
-{
-	fSettings.SetWindowCorner(leftTop);
-}
-
-
 void
 DataTranslationsApplication::AboutRequested()
 {
diff --git a/src/preferences/datatranslations/DataTranslations.h b/src/preferences/datatranslations/DataTranslations.h
index 24b4d1da6b..6a6f998c20 100644
--- a/src/preferences/datatranslations/DataTranslations.h
+++ b/src/preferences/datatranslations/DataTranslations.h
@@ -13,8 +13,6 @@
 
 #include <Application.h>
 
-#include "DataTranslationsSettings.h"
-
 
 class BDirectory;
 class BEntry;
@@ -28,18 +26,10 @@ public:
 	virtual void				RefsReceived(BMessage* message);
 	virtual void				AboutRequested();
 
-			BPoint				WindowCorner() const {
-									return fSettings.WindowCorner();
-								}
-			void				SetWindowCorner(const BPoint& leftTop);
-
 private:
 			void				_InstallError(const char* name, status_t status);
 			status_t			_Install(BDirectory& target, BEntry& entry);
 			void				_NoTranslatorError(const char* name);
-
-private:
-			DataTranslationsSettings	fSettings;
 };
 
 
diff --git a/src/preferences/datatranslations/DataTranslationsSettings.cpp b/src/preferences/datatranslations/DataTranslationsSettings.cpp
index 7c8e4917d4..0db5e9c6c2 100644
--- a/src/preferences/datatranslations/DataTranslationsSettings.cpp
+++ b/src/preferences/datatranslations/DataTranslationsSettings.cpp
@@ -19,6 +19,9 @@
 #include <Path.h>
 
 
+static DataTranslationsSettings sDataTranslationsSettings;
+
+
 DataTranslationsSettings::DataTranslationsSettings()
 {
 	BPath path;
@@ -61,3 +64,10 @@ DataTranslationsSettings::SetWindowCorner(BPoint corner)
 {
 	fCorner = corner;
 }
+
+
+DataTranslationsSettings*
+DataTranslationsSettings::Instance()
+{
+	return &sDataTranslationsSettings;
+}
diff --git a/src/preferences/datatranslations/DataTranslationsSettings.h b/src/preferences/datatranslations/DataTranslationsSettings.h
index aa5e0cd4d5..177d101ce8 100644
--- a/src/preferences/datatranslations/DataTranslationsSettings.h
+++ b/src/preferences/datatranslations/DataTranslationsSettings.h
@@ -20,6 +20,8 @@ public:
 			BPoint			WindowCorner() const { return fCorner; }
 			void			SetWindowCorner(BPoint corner);
 
+	static DataTranslationsSettings*	Instance();
+
 private:
 			BPoint			fCorner;
 };
diff --git a/src/preferences/datatranslations/DataTranslationsWindow.cpp b/src/preferences/datatranslations/DataTranslationsWindow.cpp
index 4a2dec0add..fffc5522c5 100644
--- a/src/preferences/datatranslations/DataTranslationsWindow.cpp
+++ b/src/preferences/datatranslations/DataTranslationsWindow.cpp
@@ -34,6 +34,7 @@
 #include <TranslatorRoster.h>
 
 #include "DataTranslations.h"
+#include "DataTranslationsSettings.h"
 #include "IconView.h"
 #include "TranslatorListView.h"
 
@@ -52,7 +53,7 @@ DataTranslationsWindow::DataTranslationsWindow()
 		B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
 		| B_NOT_RESIZABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
-	MoveTo(static_cast<DataTranslationsApplication*>(be_app)->WindowCorner());
+	MoveTo(DataTranslationsSettings::Instance()->WindowCorner());
 
 	_SetupViews();
 
@@ -210,9 +211,8 @@ bool
 DataTranslationsWindow::QuitRequested()
 {
 	BPoint pt(Frame().LeftTop());
-	dynamic_cast<DataTranslationsApplication*>(be_app)->SetWindowCorner(pt);
+	DataTranslationsSettings::Instance()->SetWindowCorner(pt);
 	be_app->PostMessage(B_QUIT_REQUESTED);
-
 	return true;
 }