From d9e196c7f5aaae7a5451720883ed91fa534c9a90 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 26 Dec 2019 22:47:57 +0100 Subject: [PATCH] DefaultMediaTheme: move controls to a namespace They have generic names and are likely to conflict with other things. In particular, there is another BPrivate::TitleView in BColumnListView, which results in weird behavior (and me wasting days debugging things and scratching my head) when one links libmedia before libcolumnlistview and the wrong one ends up being called. --- src/kits/media/DefaultMediaTheme.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/kits/media/DefaultMediaTheme.cpp b/src/kits/media/DefaultMediaTheme.cpp index d2566939da..392e2c706e 100644 --- a/src/kits/media/DefaultMediaTheme.cpp +++ b/src/kits/media/DefaultMediaTheme.cpp @@ -34,6 +34,8 @@ using namespace BPrivate; namespace BPrivate { +namespace DefaultMediaControls { + class SeparatorView : public BView { public: SeparatorView(orientation orientation); @@ -140,6 +142,10 @@ class DiscreteMessageFilter : public MessageFilter { BDiscreteParameter &fParameter; }; +}; + +using namespace DefaultMediaControls; + } // namespace BPrivate