diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-15 20:54:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-16 12:54:45 +0000 |
| commit | 01a8bda416d1598f5486f95b6a57d61ff09873ed (patch) | |
| tree | c37934d13308426d22599f63bf8666305a6b1f80 /vcl/unx | |
| parent | a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 (diff) | |
boost::noncopyable->'= delete'
Change-Id: If0f898a1e912fcd2095d8ba88b2b8046596e16ea
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/gtk/inc/gtkprintwrapper.hxx | 10 |
2 files changed, 11 insertions, 9 deletions
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(); |