diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-07 12:34:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-07 12:36:05 +0100 |
commit | add9dae7035a86204def97a953c75e26f313c51c (patch) | |
tree | 68121740d18bf6ebe919ae1b953cd51e54ab5639 /vcl/inc | |
parent | 2cebd4d0860c7bf3d601023b942fdbe1a522d33a (diff) |
loplugin:deletedspecial
Change-Id: I9ea64443350ed2e1341b99270fa8b29189f07eb2
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/brdwin.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/cvtsvm.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/graphite_features.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/image.h | 12 | ||||
-rw-r--r-- | vcl/inc/impfont.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/outfont.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/sallayout.hxx | 15 | ||||
-rw-r--r-- | vcl/inc/textlayout.hxx | 5 |
9 files changed, 25 insertions, 33 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 119f24c9e48a..e859e35065b6 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -111,9 +111,8 @@ private: WinBits nStyle, sal_uInt16 nTypeStyle, const ::com::sun::star::uno::Any& ); - // Copy assignment is forbidden and not implemented. - ImplBorderWindow (const ImplBorderWindow &); - ImplBorderWindow& operator= (const ImplBorderWindow &); + ImplBorderWindow (const ImplBorderWindow &) SAL_DELETED_FUNCTION; + ImplBorderWindow& operator= (const ImplBorderWindow &) SAL_DELETED_FUNCTION; public: ImplBorderWindow( vcl::Window* pParent, diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx index 5f2b69933c68..437839dcfb88 100644 --- a/vcl/inc/cvtsvm.hxx +++ b/vcl/inc/cvtsvm.hxx @@ -89,9 +89,8 @@ public: ~SVMConverter() {} private: - // Not implemented - SVMConverter( const SVMConverter& ); - SVMConverter& operator=( const SVMConverter& ); + SVMConverter( const SVMConverter& ) SAL_DELETED_FUNCTION; + SVMConverter& operator=( const SVMConverter& ) SAL_DELETED_FUNCTION; }; #endif // INCLUDED_VCL_INC_CVTSVM_HXX diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 382e70c5206a..c8d3552ba7c9 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -303,9 +303,8 @@ private: ServerFont& mrServerFont; com::sun::star::uno::Reference<com::sun::star::i18n::XBreakIterator> mxBreak; - // enforce proper copy semantic - SAL_DLLPRIVATE ServerFontLayout( const ServerFontLayout& ); - SAL_DLLPRIVATE ServerFontLayout& operator=( const ServerFontLayout& ); + ServerFontLayout( const ServerFontLayout& ) SAL_DELETED_FUNCTION; + ServerFontLayout& operator=( const ServerFontLayout& ) SAL_DELETED_FUNCTION; }; diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx index 2b8b81b1a72c..e957b508e1cb 100644 --- a/vcl/inc/graphite_features.hxx +++ b/vcl/inc/graphite_features.hxx @@ -57,7 +57,7 @@ namespace grutils size_t numFeatures() const { return mnNumSettings; } gr_feature_val * values() const { return mpSettings; }; private: - GrFeatureParser(const GrFeatureParser & copy); + GrFeatureParser(const GrFeatureParser & copy) SAL_DELETED_FUNCTION; void setLang(const gr_face * face, const OString & lang); bool isCharId(const OString & id, size_t offset, size_t length); gr_uint32 getCharId(const OString & id, size_t offset, size_t length); diff --git a/vcl/inc/image.h b/vcl/inc/image.h index b9767ce0362c..ced9debcc6a6 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -49,9 +49,9 @@ private: void ImplUpdateDisplayBmp( OutputDevice* pOutDev ); void ImplUpdateDisabledBmpEx( int nPos ); -private: // prevent assignment and copy construction - ImplImageBmp( const ImplImageBmp& ); - void operator=( const ImplImageBmp& ); +private: + ImplImageBmp( const ImplImageBmp& ) SAL_DELETED_FUNCTION; + void operator=( const ImplImageBmp& ) SAL_DELETED_FUNCTION; }; // - ImageTypes - @@ -137,9 +137,9 @@ struct ImplImage ImplImage(); ~ImplImage(); -private: // prevent assignment and copy construction - ImplImage( const ImplImage&); - void operator=( const ImplImage&); +private: + ImplImage( const ImplImage&) SAL_DELETED_FUNCTION; + void operator=( const ImplImage&) SAL_DELETED_FUNCTION; }; #endif // INCLUDED_VCL_INC_IMAGE_H diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 8efb30b9363f..3a02b1d9483a 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -168,9 +168,8 @@ private: friend void intrusive_ptr_add_ref(ImplFontCharMap* pImplFontCharMap); friend void intrusive_ptr_release(ImplFontCharMap* pImplFontCharMap); - // prevent assignment and copy construction - explicit ImplFontCharMap( const ImplFontCharMap& ); - void operator=( const ImplFontCharMap& ); + ImplFontCharMap( const ImplFontCharMap& ) SAL_DELETED_FUNCTION; + void operator=( const ImplFontCharMap& ) SAL_DELETED_FUNCTION; static ImplFontCharMapPtr getDefaultMap( bool bSymbols=false); bool isDefaultMap() const; diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 69de06ac1cf9..4533be7b06b3 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -297,8 +297,8 @@ public: sal_Int32 Count() const { return mnLines; } private: - ImplMultiTextLineInfo( const ImplMultiTextLineInfo& ); - ImplMultiTextLineInfo& operator=( const ImplMultiTextLineInfo& ); + ImplMultiTextLineInfo( const ImplMultiTextLineInfo& ) SAL_DELETED_FUNCTION; + ImplMultiTextLineInfo& operator=( const ImplMultiTextLineInfo& ) SAL_DELETED_FUNCTION; }; #endif // INCLUDED_VCL_INC_OUTFONT_HXX diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 545181ac85c3..698263a55d31 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -208,9 +208,8 @@ protected: static int CalcAsianKerning( sal_UCS4, bool bLeft, bool bVertical ); private: - // enforce proper copy semantic - SAL_DLLPRIVATE SalLayout( const SalLayout& ); - SAL_DLLPRIVATE SalLayout& operator=( const SalLayout& ); + SalLayout( const SalLayout& ) SAL_DELETED_FUNCTION; + SalLayout& operator=( const SalLayout& ) SAL_DELETED_FUNCTION; protected: int mnMinCharPos; @@ -257,9 +256,8 @@ private: virtual void DropGlyph( int ) SAL_OVERRIDE {} virtual void Simplify( bool ) SAL_OVERRIDE {} - // enforce proper copy semantic - SAL_DLLPRIVATE MultiSalLayout( const MultiSalLayout& ); - SAL_DLLPRIVATE MultiSalLayout& operator=( const MultiSalLayout& ); + MultiSalLayout( const MultiSalLayout& ) SAL_DELETED_FUNCTION; + MultiSalLayout& operator=( const MultiSalLayout& ) SAL_DELETED_FUNCTION; private: SalLayout* mpLayouts[ MAX_FALLBACK ]; @@ -363,9 +361,8 @@ protected: private: mutable Point maBasePoint; - // enforce proper copy semantic - SAL_DLLPRIVATE GenericSalLayout( const GenericSalLayout& ); - SAL_DLLPRIVATE GenericSalLayout& operator=( const GenericSalLayout& ); + GenericSalLayout( const GenericSalLayout& ) SAL_DELETED_FUNCTION; + GenericSalLayout& operator=( const GenericSalLayout& ) SAL_DELETED_FUNCTION; }; #undef SalGraphics diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index 3ba4d6012f9e..3510df221a66 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -97,9 +97,8 @@ namespace vcl MetricVector* _pVector = NULL, OUString* _pDisplayText = NULL ); private: - ControlTextRenderer(); // never implemented - ControlTextRenderer( const ControlTextRenderer& ); // never implemented - ControlTextRenderer& operator=( const ControlTextRenderer& ); // never implemented + ControlTextRenderer( const ControlTextRenderer& ) SAL_DELETED_FUNCTION; + ControlTextRenderer& operator=( const ControlTextRenderer& ) SAL_DELETED_FUNCTION; private: ::std::unique_ptr< ReferenceDeviceTextLayout > m_pImpl; |