hrev49989 adds 1 changeset to branch 'master'
old head: cef0a7b2621c207c7fe13e8b07f488665a85d484
new head: 1d11475790d26d2c0e3cda3f3e8ad12218cb72b6
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=1d11475790d2+%5Ecef0a7b2621c
----------------------------------------------------------------------------
1d11475790d2: BAboutWindow: Put the AboutView and StripeView into BPrivate.
To avoid name clashes. Possibly fixes the HaikuDepot crashes.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev49989
Commit: 1d11475790d26d2c0e3cda3f3e8ad12218cb72b6
URL: http://cgit.haiku-os.org/haiku/commit/?id=1d11475790d2
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Wed Jan 6 20:08:34 2016 UTC
----------------------------------------------------------------------------
2 files changed, 8 insertions(+), 2 deletions(-)
headers/private/interface/AboutWindow.h | 4 +++-
src/kits/interface/AboutWindow.cpp | 6 +++++-
----------------------------------------------------------------------------
diff --git a/headers/private/interface/AboutWindow.h
b/headers/private/interface/AboutWindow.h
index 225483f..749174a 100644
--- a/headers/private/interface/AboutWindow.h
+++ b/headers/private/interface/AboutWindow.h
@@ -15,7 +15,9 @@
#include <View.h>
+namespace BPrivate {
class AboutView;
+}
class BBitmap;
class BPoint;
@@ -72,7 +74,7 @@ private:
virtual void _ReservedAboutWindow1();
private:
- AboutView* fAboutView;
+ BPrivate::AboutView* fAboutView;
// FBC Padding
uint32 _reserved[20];
diff --git a/src/kits/interface/AboutWindow.cpp
b/src/kits/interface/AboutWindow.cpp
index a5f32c3..3f68399 100644
--- a/src/kits/interface/AboutWindow.cpp
+++ b/src/kits/interface/AboutWindow.cpp
@@ -48,6 +48,8 @@ using BPrivate::gSystemCatalog;
#define B_TRANSLATION_CONTEXT "AboutWindow"
+namespace BPrivate {
+
class StripeView : public BView {
public:
StripeView(BBitmap*
icon);
@@ -371,6 +373,8 @@ AboutView::SetVersion(const char* version)
return B_OK;
}
+} // namespace BPrivate
+
// #pragma mark - BAboutWindow
@@ -390,7 +394,7 @@ BAboutWindow::BAboutWindow(const char* appName, const char*
signature)
title.ReplaceFirst("%app%", appName);
SetTitle(title.String());
- fAboutView = new AboutView(appName, signature);
+ fAboutView = new BPrivate::AboutView(appName, signature);
AddChild(fAboutView);
MoveTo(AboutPosition(Frame().Width(), Frame().Height()));
