boost::noncopyable->'= delete'

Change-Id: If0f898a1e912fcd2095d8ba88b2b8046596e16ea

5 files changed, 23 insertions, 14 deletions

diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 4a5e3a6be5e7..807c69c0b63c 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace container {
 } } } }
 class BitmapEx;
 
-class ImplImageTree: private boost::noncopyable {
+class ImplImageTree {
 public:
     ImplImageTree();
 
@@ -57,6 +57,9 @@ public:
     css::uno::Reference< css::container::XNameAccess > getNameAccess();
 
 private:
+    ImplImageTree(const ImplImageTree&) SAL_DELETED_FUNCTION;
+    ImplImageTree& operator=(const ImplImageTree&) SAL_DELETED_FUNCTION;
+
     typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache;
     typedef std::unordered_map<OUString, OUString, OUStringHash> IconLinkHash;
 
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index e14c1c5fd334..92e94a2b62f2 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <list>
@@ -198,8 +197,11 @@ struct ImplAccessibleInfos
 
 enum AlwaysInputMode { AlwaysInputNone = 0, AlwaysInputEnabled = 1, AlwaysInputDisabled =2 };
 
-class WindowImpl: private boost::noncopyable
+class WindowImpl
 {
+private:
+    WindowImpl(const WindowImpl&) SAL_DELETED_FUNCTION;
+    WindowImpl& operator=(const WindowImpl&) SAL_DELETED_FUNCTION;
 public:
     WindowImpl( WindowType );
     ~WindowImpl();
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index f0d1ab36d653..80dd97cf80b5 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -23,12 +23,14 @@
 #include <rtl/ustring.hxx>
 #include <vcl/textdata.hxx>
 #include <vcl/txtattr.hxx>
-#include <boost/noncopyable.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
-class TextCharAttribList : boost::noncopyable
+class TextCharAttribList
 {
 private:
+    TextCharAttribList(const TextCharAttribList&) SAL_DELETED_FUNCTION;
+    TextCharAttribList& operator=(const TextCharAttribList&) SAL_DELETED_FUNCTION;
+
     typedef boost::ptr_vector<TextCharAttrib> TextCharAttribs;
     TextCharAttribs maAttribs;
     bool            mbHasEmptyAttribs;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index c2ec2a0db43f..3037fbff1e49 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -20,8 +20,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <boost/noncopyable.hpp>
-
 #include <comphelper/string.hxx>
 #include "vcl/ppdparser.hxx"
 #include "vcl/strhelper.hxx"
@@ -269,13 +267,17 @@ namespace
     struct thePPDCache : public rtl::Static<PPDCache, thePPDCache> {};
 }
 
-class PPDDecompressStream: private boost::noncopyable
+class PPDDecompressStream
 {
+private:
+    PPDDecompressStream(const PPDDecompressStream&) SAL_DELETED_FUNCTION;
+    PPDDecompressStream& operator=(const PPDDecompressStream&) SAL_DELETED_FUNCTION;
+
     SvFileStream*       mpFileStream;
     SvMemoryStream*     mpMemStream;
     OUString       maFileName;
 
-    public:
+public:
     PPDDecompressStream( const OUString& rFile );
     ~PPDDecompressStream();
 
diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
index dd92bfe53837..009903254606 100644
--- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
@@ -10,8 +10,6 @@
 #ifndef INCLUDED_VCL_UNX_GTK_INC_GTKPRINTWRAPPER_HXX
 #define INCLUDED_VCL_UNX_GTK_INC_GTKPRINTWRAPPER_HXX
 
-#include <boost/noncopyable.hpp>
-
 #include <gtk/gtk.h>
 
 #if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
@@ -23,9 +21,8 @@
 #include <gtk/gtkprintunixdialog.h>
 #endif
 
-#if !GTK_CHECK_VERSION(3,0,0)
 #include <osl/module.hxx>
-#endif
+#include <sal/types.h>
 
 #endif
 
@@ -34,8 +31,11 @@ namespace vcl
 namespace unx
 {
 
-class GtkPrintWrapper : private boost::noncopyable
+class GtkPrintWrapper
 {
+private:
+    GtkPrintWrapper(const GtkPrintWrapper&) SAL_DELETED_FUNCTION;
+    GtkPrintWrapper& operator=(const GtkPrintWrapper&) SAL_DELETED_FUNCTION;
 #if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
 public:
     GtkPrintWrapper();