boost::foo_ptr->std::foo_ptr

Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a

9 files changed, 28 insertions, 31 deletions

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index ef8264bdd299..0622f0922adc 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -20,7 +20,6 @@
 #include <set>
 #include <stack>
 #include <vector>
-#include <boost/noncopyable.hpp>
 #ifdef check
 #  //some problem with MacOSX and a check define
 #  undef check
@@ -40,7 +39,7 @@ class VclExpander;
 class VclMultiLineEdit;
 namespace xmlreader { class XmlReader; }
 
-class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable
+class VCL_DLLPUBLIC VclBuilder
 {
 public:
     typedef std::map<OString, OString> stringmap;
@@ -115,6 +114,9 @@ public:
     css::uno::Reference<css::frame::XFrame> getFrame() { return m_xFrame; }
 
 private:
+    VclBuilder(const VclBuilder&) SAL_DELETED_FUNCTION;
+    VclBuilder& operator=(const VclBuilder&) SAL_DELETED_FUNCTION;
+
     typedef boost::ptr_map<OUString, osl::Module> ModuleMap;
 
     //We store these until the builder is deleted, that way we can use the
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 3ab556ddfe50..20f56710828b 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -273,12 +273,10 @@ public:
 
 
 // - RadioButton -
-
-
 class VCL_DLLPUBLIC RadioButton : public Button
 {
 private:
-    boost::shared_ptr< std::vector<RadioButton*> > m_xGroup;
+    std::shared_ptr< std::vector<RadioButton*> > m_xGroup;
     Rectangle       maStateRect;
     Rectangle       maMouseRect;
     Image           maImage;
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 02769231db34..0e98da6a6878 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -52,7 +52,6 @@ class NSOpenGLView;
 #endif
 
 #include <vcl/vclopengl_dllapi.hxx>
-#include <boost/scoped_ptr.hpp>
 #include <boost/ptr_container/ptr_map.hpp>
 #include <vcl/window.hxx>
 #include <tools/gen.hxx>
@@ -250,10 +249,10 @@ private:
 #endif
 
     GLWindow m_aGLWin;
-    boost::scoped_ptr<vcl::Window> m_pWindow;
-    vcl::Window* mpWindow; //points to m_pWindow or the parent window, don't delete it
+    std::unique_ptr<vcl::Window> m_xWindow;
+    vcl::Window* mpWindow; //points to m_xWindow or the parent window, don't delete it
     SystemChildWindow* m_pChildWindow;
-    boost::scoped_ptr<SystemChildWindow> m_pChildWindowGC;
+    std::unique_ptr<SystemChildWindow> m_xChildWindowGC;
     bool mbInitialized;
     int  mnRefCount;
     bool mbRequestLegacyContext;
diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx
index c95b02d5261a..9724eb3d9ffd 100644
--- a/include/vcl/openglwin.hxx
+++ b/include/vcl/openglwin.hxx
@@ -14,8 +14,6 @@
 #include <vcl/syschild.hxx>
 #include <vcl/vclopengl_dllapi.hxx>
 
-#include <boost/scoped_ptr.hpp>
-
 class OpenGLContext;
 class OpenGLWindowImpl;
 
@@ -49,7 +47,7 @@ public:
     virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
 
 private:
-    boost::scoped_ptr<OpenGLWindowImpl> mpImpl;
+    std::unique_ptr<OpenGLWindowImpl> mxImpl;
     IRenderer* mpRenderer;
 
     Point maStartPoint;
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 6a2aaa2ea85e..ec1063b6b717 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -43,8 +43,6 @@
 
 #include <unotools/fontdefs.hxx>
 
-#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
 #ifdef check
 #  //some problem with MacOSX and a check define
 #  undef check
@@ -54,6 +52,7 @@
 #include <com/sun/star/drawing/LineCap.hpp>
 #include <com/sun/star/uno/Reference.h>
 
+#include <memory>
 #include <vector>
 
 #if defined UNX
@@ -250,7 +249,7 @@ extern const sal_uLong nVCLBLut[ 6 ];
 extern const sal_uLong nVCLDitherLut[ 256 ];
 extern const sal_uLong nVCLLut[ 256 ];
 
-class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable
+class VCL_DLLPUBLIC OutputDevice
 {
     friend class Printer;
     friend class VirtualDevice;
@@ -260,6 +259,9 @@ class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable
     friend void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight );
 
 private:
+    OutputDevice(const OutputDevice&) SAL_DELETED_FUNCTION;
+    OutputDevice& operator=(const OutputDevice&) SAL_DELETED_FUNCTION;
+
     mutable SalGraphics*            mpGraphics;         ///< Graphics context to draw on
     mutable OutputDevice*           mpPrevGraphics;     ///< Previous output device in list
     mutable OutputDevice*           mpNextGraphics;     ///< Next output device in list
@@ -316,7 +318,7 @@ private:
     TextAlign                       meTextAlign;
     RasterOp                        meRasterOp;
     Wallpaper                       maBackground;
-    boost::scoped_ptr<AllSettings>  mxSettings;
+    std::unique_ptr<AllSettings>    mxSettings;
     MapMode                         maMapMode;
     Point                           maRefPoint;
     sal_uInt16                      mnAntialiasing;
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 5b4b35d0951e..f8c1ff55b479 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -35,8 +35,6 @@
 #include <com/sun/star/security/XCertificate.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
-#include <boost/scoped_ptr.hpp>
-
 #include <list>
 #include <vector>
 #include <set>
@@ -77,7 +75,7 @@ class VCL_DLLPUBLIC PDFOutputStream
 
 class VCL_DLLPUBLIC PDFWriter
 {
-    boost::scoped_ptr<PDFWriterImpl> pImplementation;
+    std::unique_ptr<PDFWriterImpl> xImplementation;
 public:
     // extended line info
     enum CapType { capButt, capRound, capSquare };
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index b182d36b8848..60090cea5122 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -22,9 +22,8 @@
 
 #include <tools/gen.hxx>
 #include <vcl/dllapi.h>
-
 #include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 class ImplRegionBand;
 class RegionBand;
@@ -34,9 +33,9 @@ namespace vcl { class Window; }
 class OutputDevice;
 class Bitmap;
 
-typedef boost::shared_ptr< RegionBand > RegionBandPtr;
-typedef boost::shared_ptr< tools::PolyPolygon > PolyPolygonPtr;
-typedef boost::shared_ptr< basegfx::B2DPolyPolygon > B2DPolyPolygonPtr;
+typedef std::shared_ptr< RegionBand > RegionBandPtr;
+typedef std::shared_ptr< tools::PolyPolygon > PolyPolygonPtr;
+typedef std::shared_ptr< basegfx::B2DPolyPolygon > B2DPolyPolygonPtr;
 typedef std::vector< Rectangle > RectangleVector;
 
 namespace vcl {
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 9fc2d917f079..7de317f5eee6 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1623,7 +1623,6 @@ namespace vcl
 /** guard class that uses tryToAcquire() and has isAcquired() to check
  */
 class SolarMutexTryAndBuyGuard
-    : private boost::noncopyable
 {
     private:
         bool m_isAcquired;
@@ -1632,6 +1631,9 @@ class SolarMutexTryAndBuyGuard
 #endif
         comphelper::SolarMutex& m_rSolarMutex;
 
+        SolarMutexTryAndBuyGuard(const SolarMutexTryAndBuyGuard&) SAL_DELETED_FUNCTION;
+        SolarMutexTryAndBuyGuard& operator=(const SolarMutexTryAndBuyGuard&) SAL_DELETED_FUNCTION;
+
     public:
 
     SolarMutexTryAndBuyGuard()
diff --git a/include/vcl/svgdata.hxx b/include/vcl/svgdata.hxx
index d4173f9182d1..15d27565b670 100644
--- a/include/vcl/svgdata.hxx
+++ b/include/vcl/svgdata.hxx
@@ -22,14 +22,11 @@
 
 #include <basegfx/range/b2drange.hxx>
 #include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
 #include <com/sun/star/graphic/XPrimitive2D.hpp>
 #include <vcl/bitmapex.hxx>
 #include <rtl/ustring.hxx>
 
 
-
 typedef boost::shared_array< sal_uInt8 > SvgDataArray;
 typedef ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > Primitive2DReference;
 typedef ::com::sun::star::uno::Sequence< Primitive2DReference > Primitive2DSequence;
@@ -44,8 +41,7 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx(
     const sal_uInt32 nMaximumQuadraticPixels = 500000);
 
 
-
-class VCL_DLLPUBLIC SvgData : private boost::noncopyable
+class VCL_DLLPUBLIC SvgData
 {
 private:
     // the file and length
@@ -64,6 +60,9 @@ private:
     void ensureReplacement();
     void ensureSequenceAndRange();
 
+    SvgData(const SvgData&) SAL_DELETED_FUNCTION;
+    SvgData& operator=(const SvgData&) SAL_DELETED_FUNCTION;
+
 public:
     SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath);
     SvgData(const OUString& rPath);
@@ -79,7 +78,7 @@ public:
     const BitmapEx& getReplacement() const;
 };
 
-typedef boost::shared_ptr< SvgData > SvgDataPtr;
+typedef std::shared_ptr< SvgData > SvgDataPtr;
 
 #endif // INCLUDED_VCL_SVGDATA_HXX