From 3bf7deba1bfdd9b38e67a29e5b57eba3b372b6ea Mon Sep 17 00:00:00 2001
From: koldo <koldo@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 25 Dec 2016 16:14:01 +0000
Subject: [PATCH] Controls4U: Updates in namespace

git-svn-id: svn://ultimatepp.org/upp/trunk@10584 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 bazaar/Controls4U/ActiveX.cpp          | 5 +++--
 bazaar/Controls4U/ActiveX.h            | 4 ++--
 bazaar/Controls4U/ActiveX_base.h       | 5 +++--
 bazaar/Controls4U/Controls4U.cpp       | 6 +++---
 bazaar/Controls4U/Controls4U.h         | 5 +++--
 bazaar/Controls4U/IExplorerBrowser.cpp | 5 +++--
 bazaar/Controls4U/PainterCanvas.cpp    | 4 ++++
 bazaar/Controls4U/PainterCanvas.h      | 1 +
 bazaar/Controls4U/SliderCtrlX.cpp      | 7 +++++--
 bazaar/Controls4U/SliderCtrlX.h        | 4 ++--
 bazaar/Controls4U/SplitterButton.cpp   | 7 +++++--
 bazaar/Controls4U/SplitterButton.h     | 4 ++--
 bazaar/Controls4U/StarIndicator.cpp    | 5 +++--
 bazaar/Controls4U/StarIndicator.h      | 5 +++--
 14 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/bazaar/Controls4U/ActiveX.cpp b/bazaar/Controls4U/ActiveX.cpp
index eceb3599b..0bff5ef2a 100644
--- a/bazaar/Controls4U/ActiveX.cpp
+++ b/bazaar/Controls4U/ActiveX.cpp
@@ -3,7 +3,8 @@
 #include <CtrlLib/CtrlLib.h>
 #include "ActiveX.h"
 
-NAMESPACE_UPP
+using namespace Upp;
+//NAMESPACE_UPP
 
 bool BSTRSet(const String str, BSTR &bstr) {
 	wchar_t *buffer;
@@ -373,6 +374,6 @@ HRESULT STDMETHODCALLTYPE AXClientSite::OnPosRectChange(LPCRECT lprcPosRect) {
 	return S_OK;
 }
 
-END_UPP_NAMESPACE
+//END_UPP_NAMESPACE
 
 #endif
diff --git a/bazaar/Controls4U/ActiveX.h b/bazaar/Controls4U/ActiveX.h
index 65538ebfc..052f9aab7 100644
--- a/bazaar/Controls4U/ActiveX.h
+++ b/bazaar/Controls4U/ActiveX.h
@@ -16,7 +16,7 @@
 #include <Exdisp.h> 
 #include "plugin/vlc/axvlc_idl.h"
 
-NAMESPACE_UPP
+//NAMESPACE_UPP
 
 static const CLSID CLSID_MozillaBrowser = {0x1339B54C, 0x3453, 0x11D2, {0x93, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};	//http://www.iol.ie/~locka/mozilla/control.htm
 
@@ -137,6 +137,6 @@ private:
 	};
 };
 
-END_UPP_NAMESPACE
+//END_UPP_NAMESPACE
 
 #endif
diff --git a/bazaar/Controls4U/ActiveX_base.h b/bazaar/Controls4U/ActiveX_base.h
index c199db43d..8b07038b3 100644
--- a/bazaar/Controls4U/ActiveX_base.h
+++ b/bazaar/Controls4U/ActiveX_base.h
@@ -1,7 +1,8 @@
 #ifndef _hdIE_ActiveX_Support_h_
 #define _hdIE_ActiveX_Support_h_
 
-NAMESPACE_UPP
+using namespace Upp;
+//NAMESPACE_UPP
 
 bool BSTRSet(const String str, BSTR &bstr);
 String BSTRGet(BSTR &bstr);
@@ -119,6 +120,6 @@ private:
 	bool status;
 };
 
-END_UPP_NAMESPACE
+//END_UPP_NAMESPACE
 
 #endif
diff --git a/bazaar/Controls4U/Controls4U.cpp b/bazaar/Controls4U/Controls4U.cpp
index 31e4c87b3..94256b862 100644
--- a/bazaar/Controls4U/Controls4U.cpp
+++ b/bazaar/Controls4U/Controls4U.cpp
@@ -1,6 +1,7 @@
 #include <CtrlLib/CtrlLib.h>
+#include "Controls4U.h"
 
-#include "Controls4U/Controls4U.h"
+using namespace Upp;
 
 #define TFILE <Controls4U/Controls4U.t>
 #include <Core/t.h>
@@ -12,7 +13,7 @@
 #define TOPICFILE <Controls4U/src.tpp/all.i>
 #include <Core/topic_group.h>
 
-NAMESPACE_UPP
+
 
 void PaintCenterText(Painter &w, double x, double y, String text, Font fnt, Color color) {
 	Size sz = GetTextSize(text, fnt);
@@ -2134,4 +2135,3 @@ AboutUpp::AboutUpp() {
 	Add(about.SizePos());
 }
 	
-END_UPP_NAMESPACE
\ No newline at end of file
diff --git a/bazaar/Controls4U/Controls4U.h b/bazaar/Controls4U/Controls4U.h
index a2c433ca0..cb6c97359 100644
--- a/bazaar/Controls4U/Controls4U.h
+++ b/bazaar/Controls4U/Controls4U.h
@@ -12,7 +12,8 @@
 #include "Controls4U/StarIndicator.h"
 #include "Controls4U/SplitterButton.h"
 
-NAMESPACE_UPP
+//NAMESPACE_UPP
+using namespace Upp;
 
 double AngAdd(double ang, double val);
 
@@ -750,6 +751,6 @@ private:
 };
 	
 	
-END_UPP_NAMESPACE
+//END_UPP_NAMESPACE
 
 #endif
diff --git a/bazaar/Controls4U/IExplorerBrowser.cpp b/bazaar/Controls4U/IExplorerBrowser.cpp
index 3cacee755..737db3b84 100644
--- a/bazaar/Controls4U/IExplorerBrowser.cpp
+++ b/bazaar/Controls4U/IExplorerBrowser.cpp
@@ -3,7 +3,8 @@
 #include <CtrlLib/CtrlLib.h>
 #include "ActiveX.h" 
 
-NAMESPACE_UPP
+using namespace Upp;
+//NAMESPACE_UPP
 
 bool InternetExplorerBrowser::Browse(const String &strurl) {
 	IIWebBrowser webBrowser(this);
@@ -182,6 +183,6 @@ bool InternetExplorerBrowser::SetSilent(bool val) {
 	return false;
 }
 
-END_UPP_NAMESPACE
+//END_UPP_NAMESPACE
 
 #endif
diff --git a/bazaar/Controls4U/PainterCanvas.cpp b/bazaar/Controls4U/PainterCanvas.cpp
index ca463fbbc..e66def1d6 100644
--- a/bazaar/Controls4U/PainterCanvas.cpp
+++ b/bazaar/Controls4U/PainterCanvas.cpp
@@ -1,4 +1,8 @@
+#include <CtrlLib/CtrlLib.h>
 #include "Controls4U.h"
+
+using namespace Upp;
+
 #include <plugin/jpg/jpg.h>
 
 #define TFILE <Controls4U/Controls4U.t>
diff --git a/bazaar/Controls4U/PainterCanvas.h b/bazaar/Controls4U/PainterCanvas.h
index c6a8c70c8..fcf0a4081 100644
--- a/bazaar/Controls4U/PainterCanvas.h
+++ b/bazaar/Controls4U/PainterCanvas.h
@@ -1,6 +1,7 @@
 #ifndef _Controls4U_PainterCanvas_h_
 #define _Controls4U_PainterCanvas_h_
 
+
 class Svg2DTransform {
 public:
 	Svg2DTransform() 						{Init();}
diff --git a/bazaar/Controls4U/SliderCtrlX.cpp b/bazaar/Controls4U/SliderCtrlX.cpp
index facc1dd00..326e95de7 100644
--- a/bazaar/Controls4U/SliderCtrlX.cpp
+++ b/bazaar/Controls4U/SliderCtrlX.cpp
@@ -13,9 +13,12 @@
  **********************************************************************************************/
 
 #include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
 #include "SliderCtrlX.h"
 
-NAMESPACE_UPP
+//NAMESPACE_UPP
 
 #define IMAGECLASS SliderThumbsImg
 #define IMAGEFILE <Controls4U/SliderCtrlX.iml>
@@ -573,4 +576,4 @@ int SliderCtrlX::SliderToClient(int v) const
 	return v;
 }
 
-END_UPP_NAMESPACE
\ No newline at end of file
+//END_UPP_NAMESPACE
\ No newline at end of file
diff --git a/bazaar/Controls4U/SliderCtrlX.h b/bazaar/Controls4U/SliderCtrlX.h
index d88d1f6e2..a5d1fe51a 100644
--- a/bazaar/Controls4U/SliderCtrlX.h
+++ b/bazaar/Controls4U/SliderCtrlX.h
@@ -1,4 +1,4 @@
-NAMESPACE_UPP
+//NAMESPACE_UPP
 
 class SliderCtrlX : public Ctrl {
 	static const int BORDER_SIZE = 2;
@@ -111,4 +111,4 @@ public:
 	SliderCtrlX&	UseCustomThumbs( bool b = true )	{ m_bUseCustomThumbs = b; return *this; };
 };
 
-END_UPP_NAMESPACE
\ No newline at end of file
+//END_UPP_NAMESPACE
\ No newline at end of file
diff --git a/bazaar/Controls4U/SplitterButton.cpp b/bazaar/Controls4U/SplitterButton.cpp
index a566357b6..8400dad5b 100644
--- a/bazaar/Controls4U/SplitterButton.cpp
+++ b/bazaar/Controls4U/SplitterButton.cpp
@@ -1,7 +1,10 @@
 #include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
 #include "SplitterButton.h"
 
-NAMESPACE_UPP
+//NAMESPACE_UPP
 
 SplitterButton::SplitterButton() {
 	Add(splitter.SizePos());
@@ -168,4 +171,4 @@ void SplitterButton::SetArrows() {
 	}
 }
 		
-END_UPP_NAMESPACE
\ No newline at end of file
+//END_UPP_NAMESPACE
\ No newline at end of file
diff --git a/bazaar/Controls4U/SplitterButton.h b/bazaar/Controls4U/SplitterButton.h
index b4158c266..c45e5f4ab 100644
--- a/bazaar/Controls4U/SplitterButton.h
+++ b/bazaar/Controls4U/SplitterButton.h
@@ -1,7 +1,7 @@
 #ifndef _Controls4U_SplitterButton_h_
 #define _Controls4U_SplitterButton_h_
 
-NAMESPACE_UPP
+//NAMESPACE_UPP
 
 class SplitterButton : public StaticRect {
 public:
@@ -49,6 +49,6 @@ private:
 	void SetArrows();
 };
 
-END_UPP_NAMESPACE
+//END_UPP_NAMESPACE
 
 #endif
diff --git a/bazaar/Controls4U/StarIndicator.cpp b/bazaar/Controls4U/StarIndicator.cpp
index d4201e583..4fd490d29 100644
--- a/bazaar/Controls4U/StarIndicator.cpp
+++ b/bazaar/Controls4U/StarIndicator.cpp
@@ -21,7 +21,8 @@
 #include <CtrlLib/CtrlLib.h>
 #include "StarIndicator.h"
 
-NAMESPACE_UPP
+using namespace Upp;
+//NAMESPACE_UPP
 
 #define IMAGECLASS StarsImg
 #define IMAGEFILE <Controls4U/StarIndicator.iml>
@@ -180,4 +181,4 @@ StarIndicator&	StarIndicator::SetVotes(int n)
 	return *this;
 }
 
-END_UPP_NAMESPACE
+//END_UPP_NAMESPACE
diff --git a/bazaar/Controls4U/StarIndicator.h b/bazaar/Controls4U/StarIndicator.h
index 50e9aef9c..a120c6d7b 100644
--- a/bazaar/Controls4U/StarIndicator.h
+++ b/bazaar/Controls4U/StarIndicator.h
@@ -1,6 +1,7 @@
 #include <CtrlLib/CtrlLib.h>
 
-NAMESPACE_UPP
+using namespace Upp;
+//NAMESPACE_UPP
 
 class StarIndicator : public ProgressIndicator {
 private:
@@ -35,4 +36,4 @@ public:
 	virtual StarIndicator&	ShowVotes(bool b)		{ m_bVotes=b; return *this; }
 };
 
-END_UPP_NAMESPACE
\ No newline at end of file
+//END_UPP_NAMESPACE
\ No newline at end of file