summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-02-07 17:24:28 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-02-07 17:24:43 +0100
commita6f8766d352f33beea5631697fd8c7be2be5e85b (patch)
treeaaa9be1872e1d7c68698de7a34dc84b7ce09b182 /vcl
parenta5cbf486ac69a8c6c090df032a24f7c14138ef8e (diff)
loplugin:deletedspecial (Mac OS X)
Change-Id: Ia09e2e7b3e40bd04da64b52fe29258017b90b156
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/OpenGLWrapper.hxx18
-rw-r--r--vcl/inc/osx/salframe.h5
-rw-r--r--vcl/inc/osx/salprn.h8
3 files changed, 11 insertions, 20 deletions
diff --git a/vcl/inc/OpenGLWrapper.hxx b/vcl/inc/OpenGLWrapper.hxx
index 0b90b41ac4e2..9134801ea98a 100644
--- a/vcl/inc/OpenGLWrapper.hxx
+++ b/vcl/inc/OpenGLWrapper.hxx
@@ -10,19 +10,11 @@
#include "AppKit/NSOpenGLView.h"
#include "AppKit/NSOpenGL.h"
-class OpenGLWrapper
+namespace OpenGLWrapper
{
-private:
-
- OpenGLWrapper();
- OpenGLWrapper(const OpenGLWrapper&);
- OpenGLWrapper& operator=(const OpenGLWrapper&);
-
-public:
-
- static void swapBuffers(NSOpenGLView* pView);
- static void makeCurrent(NSOpenGLView* pView);
- static void resetCurrent();
-};
+ void swapBuffers(NSOpenGLView* pView);
+ void makeCurrent(NSOpenGLView* pView);
+ void resetCurrent();
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 8bb0acf982c3..20c89c8ea93d 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -202,9 +202,8 @@ public:
private: // data
static AquaSalFrame* s_pCaptureFrame;
- // make AquaSalFrame non copyable
- AquaSalFrame( const AquaSalFrame& );
- AquaSalFrame& operator=(const AquaSalFrame&);
+ AquaSalFrame( const AquaSalFrame& ) SAL_DELETED_FUNCTION;
+ AquaSalFrame& operator=(const AquaSalFrame&) SAL_DELETED_FUNCTION;
};
#endif // INCLUDED_VCL_INC_OSX_SALFRAME_H
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 7d35a99ac659..18f0bbafff67 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -109,8 +109,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter
void setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation );
private:
- AquaSalInfoPrinter( const AquaSalInfoPrinter& );
- AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&);
+ AquaSalInfoPrinter( const AquaSalInfoPrinter& ) SAL_DELETED_FUNCTION;
+ AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&) SAL_DELETED_FUNCTION;
};
// - AquaSalPrinter -
@@ -143,8 +143,8 @@ class AquaSalPrinter : public SalPrinter
virtual sal_uLong GetErrorCode() SAL_OVERRIDE;
private:
- AquaSalPrinter( const AquaSalPrinter& );
- AquaSalPrinter& operator=(const AquaSalPrinter&);
+ AquaSalPrinter( const AquaSalPrinter& ) SAL_DELETED_FUNCTION;
+ AquaSalPrinter& operator=(const AquaSalPrinter&) SAL_DELETED_FUNCTION;
};
const double fPtTo100thMM = 35.27777778;