diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 14:02:37 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-27 08:26:45 +0200 |
commit | d2a28ebd5878305b29d8dbfc3b537ddfaabd3625 (patch) | |
tree | 31cf4eead2c179466b5ae3e93b217780b70b3bc1 | |
parent | 739f746254853dbf6552b0fac9192bfd5ddd0118 (diff) |
vcl: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined counterparts,
but may prevent implicitly declared copy functions from being defined as non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: Ife5d8eb699b8b6c84b9229ae275dc386fa189bce
Reviewed-on: https://gerrit.libreoffice.org/58105
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r-- | include/vcl/IconThemeScanner.hxx | 2 | ||||
-rw-r--r-- | include/vcl/customweld.hxx | 5 | ||||
-rw-r--r-- | include/vcl/event.hxx | 2 | ||||
-rw-r--r-- | include/vcl/keycod.hxx | 9 | ||||
-rw-r--r-- | include/vcl/metaact.hxx | 204 | ||||
-rw-r--r-- | include/vcl/print.hxx | 3 | ||||
-rw-r--r-- | include/vcl/salnativewidgets.hxx | 44 | ||||
-rw-r--r-- | include/vcl/settings.hxx | 7 | ||||
-rw-r--r-- | include/vcl/vclptr.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/fontattributes.hxx | 1 | ||||
-rw-r--r-- | vcl/source/app/IconThemeScanner.cxx | 3 | ||||
-rw-r--r-- | vcl/source/app/settings.cxx | 25 | ||||
-rw-r--r-- | vcl/source/font/fontattributes.cxx | 14 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 8 | ||||
-rw-r--r-- | vcl/source/window/keyevent.cxx | 6 |
15 files changed, 257 insertions, 80 deletions
diff --git a/include/vcl/IconThemeScanner.hxx b/include/vcl/IconThemeScanner.hxx index 247b52d37711..03f472bd5928 100644 --- a/include/vcl/IconThemeScanner.hxx +++ b/include/vcl/IconThemeScanner.hxx @@ -34,8 +34,6 @@ namespace vcl { class VCL_DLLPUBLIC IconThemeScanner { public: - ~IconThemeScanner(); - /** Factory method to create the object. * Provide a path to search for IconThemes. */ diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx index c191b91ebf2b..f6770c8fe4a4 100644 --- a/include/vcl/customweld.hxx +++ b/include/vcl/customweld.hxx @@ -73,6 +73,11 @@ public: { } virtual ~CustomWidgetController(); + + CustomWidgetController(CustomWidgetController const&) = default; + CustomWidgetController(CustomWidgetController&&) = default; + CustomWidgetController& operator=(CustomWidgetController const&) = default; + CustomWidgetController& operator=(CustomWidgetController&&) = default; }; class VCL_DLLPUBLIC CustomWeld diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 050e7199cc45..22486490977a 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -62,8 +62,6 @@ public: sal_uInt16 GetRepeat() const { return mnRepeat; } KeyEvent LogicalTextDirectionality (TextDirectionality eMode) const; - KeyEvent (const KeyEvent& rKeyEvent); - }; inline KeyEvent::KeyEvent() diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index 405fbd5cd936..63bbf372f382 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -73,7 +73,6 @@ public: KeyFuncType GetFunction() const; - KeyCode& operator = ( const KeyCode& rKeyCode ); bool operator ==( const KeyCode& rKeyCode ) const; bool operator !=( const KeyCode& rKeyCode ) const; }; @@ -116,14 +115,6 @@ inline bool vcl::KeyCode::operator !=( const vcl::KeyCode& rKeyCode ) const return (GetFunction() != rKeyCode.GetFunction()); } -inline vcl::KeyCode& vcl::KeyCode::operator = ( const vcl::KeyCode& rKeyCode ) -{ - nKeyCodeAndModifiers = rKeyCode.nKeyCodeAndModifiers; - eFunc = rKeyCode.eFunc; - - return *this; -} - #endif // INCLUDED_VCL_KEYCOD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 2578cfd26c3e..ef582b1f97dd 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -101,6 +101,10 @@ private: public: MetaPixelAction(); + MetaPixelAction(MetaPixelAction const &) = default; + MetaPixelAction(MetaPixelAction &&) = default; + MetaPixelAction & operator =(MetaPixelAction const &) = default; + MetaPixelAction & operator =(MetaPixelAction &&) = default; protected: virtual ~MetaPixelAction() override; public: @@ -125,6 +129,10 @@ private: public: MetaPointAction(); + MetaPointAction(MetaPointAction const &) = default; + MetaPointAction(MetaPointAction &&) = default; + MetaPointAction & operator =(MetaPointAction const &) = default; + MetaPointAction & operator =(MetaPointAction &&) = default; protected: virtual ~MetaPointAction() override; public: @@ -151,6 +159,10 @@ private: public: MetaLineAction(); + MetaLineAction(MetaLineAction const &) = default; + MetaLineAction(MetaLineAction &&) = default; + MetaLineAction & operator =(MetaLineAction const &) = default; + MetaLineAction & operator =(MetaLineAction &&) = default; protected: virtual ~MetaLineAction() override; public: @@ -179,6 +191,10 @@ private: public: MetaRectAction(); + MetaRectAction(MetaRectAction const &) = default; + MetaRectAction(MetaRectAction &&) = default; + MetaRectAction & operator =(MetaRectAction const &) = default; + MetaRectAction & operator =(MetaRectAction &&) = default; protected: virtual ~MetaRectAction() override; public: @@ -205,6 +221,10 @@ private: public: MetaRoundRectAction(); + MetaRoundRectAction(MetaRoundRectAction const &) = default; + MetaRoundRectAction(MetaRoundRectAction &&) = default; + MetaRoundRectAction & operator =(MetaRoundRectAction const &) = default; + MetaRoundRectAction & operator =(MetaRoundRectAction &&) = default; protected: virtual ~MetaRoundRectAction() override; public: @@ -232,6 +252,10 @@ private: public: MetaEllipseAction(); + MetaEllipseAction(MetaEllipseAction const &) = default; + MetaEllipseAction(MetaEllipseAction &&) = default; + MetaEllipseAction & operator =(MetaEllipseAction const &) = default; + MetaEllipseAction & operator =(MetaEllipseAction &&) = default; protected: virtual ~MetaEllipseAction() override; public: @@ -258,6 +282,10 @@ private: public: MetaArcAction(); + MetaArcAction(MetaArcAction const &) = default; + MetaArcAction(MetaArcAction &&) = default; + MetaArcAction & operator =(MetaArcAction const &) = default; + MetaArcAction & operator =(MetaArcAction &&) = default; protected: virtual ~MetaArcAction() override; public: @@ -287,6 +315,10 @@ private: public: MetaPieAction(); + MetaPieAction(MetaPieAction const &) = default; + MetaPieAction(MetaPieAction &&) = default; + MetaPieAction & operator =(MetaPieAction const &) = default; + MetaPieAction & operator =(MetaPieAction &&) = default; protected: virtual ~MetaPieAction() override; public: @@ -316,6 +348,10 @@ private: public: MetaChordAction(); + MetaChordAction(MetaChordAction const &) = default; + MetaChordAction(MetaChordAction &&) = default; + MetaChordAction & operator =(MetaChordAction const &) = default; + MetaChordAction & operator =(MetaChordAction &&) = default; protected: virtual ~MetaChordAction() override; public: @@ -344,6 +380,10 @@ private: public: MetaPolyLineAction(); + MetaPolyLineAction(MetaPolyLineAction const &) = default; + MetaPolyLineAction(MetaPolyLineAction &&) = default; + MetaPolyLineAction & operator =(MetaPolyLineAction const &) = default; + MetaPolyLineAction & operator =(MetaPolyLineAction &&) = default; protected: virtual ~MetaPolyLineAction() override; public: @@ -370,6 +410,10 @@ private: public: MetaPolygonAction(); + MetaPolygonAction(MetaPolygonAction const &) = default; + MetaPolygonAction(MetaPolygonAction &&) = default; + MetaPolygonAction & operator =(MetaPolygonAction const &) = default; + MetaPolygonAction & operator =(MetaPolygonAction &&) = default; protected: virtual ~MetaPolygonAction() override; public: @@ -394,6 +438,10 @@ private: public: MetaPolyPolygonAction(); + MetaPolyPolygonAction(MetaPolyPolygonAction const &) = default; + MetaPolyPolygonAction(MetaPolyPolygonAction &&) = default; + MetaPolyPolygonAction & operator =(MetaPolyPolygonAction const &) = default; + MetaPolyPolygonAction & operator =(MetaPolyPolygonAction &&) = default; protected: virtual ~MetaPolyPolygonAction() override; public: @@ -421,6 +469,10 @@ private: public: MetaTextAction(); + MetaTextAction(MetaTextAction const &) = default; + MetaTextAction(MetaTextAction &&) = default; + MetaTextAction & operator =(MetaTextAction const &) = default; + MetaTextAction & operator =(MetaTextAction &&) = default; protected: virtual ~MetaTextAction() override; public: @@ -491,6 +543,10 @@ private: public: MetaStretchTextAction(); + MetaStretchTextAction(MetaStretchTextAction const &) = default; + MetaStretchTextAction(MetaStretchTextAction &&) = default; + MetaStretchTextAction & operator =(MetaStretchTextAction const &) = default; + MetaStretchTextAction & operator =(MetaStretchTextAction &&) = default; protected: virtual ~MetaStretchTextAction() override; public: @@ -523,6 +579,10 @@ private: public: MetaTextRectAction(); + MetaTextRectAction(MetaTextRectAction const &) = default; + MetaTextRectAction(MetaTextRectAction &&) = default; + MetaTextRectAction & operator =(MetaTextRectAction const &) = default; + MetaTextRectAction & operator =(MetaTextRectAction &&) = default; protected: virtual ~MetaTextRectAction() override; public: @@ -554,6 +614,10 @@ private: public: MetaTextLineAction(); + MetaTextLineAction(MetaTextLineAction const &) = default; + MetaTextLineAction(MetaTextLineAction &&) = default; + MetaTextLineAction & operator =(MetaTextLineAction const &) = default; + MetaTextLineAction & operator =(MetaTextLineAction &&) = default; protected: virtual ~MetaTextLineAction() override; public: @@ -585,6 +649,10 @@ private: public: MetaBmpAction(); + MetaBmpAction(MetaBmpAction const &) = default; + MetaBmpAction(MetaBmpAction &&) = default; + MetaBmpAction & operator =(MetaBmpAction const &) = default; + MetaBmpAction & operator =(MetaBmpAction &&) = default; protected: virtual ~MetaBmpAction() override; public: @@ -612,6 +680,10 @@ private: public: MetaBmpScaleAction(); + MetaBmpScaleAction(MetaBmpScaleAction const &) = default; + MetaBmpScaleAction(MetaBmpScaleAction &&) = default; + MetaBmpScaleAction & operator =(MetaBmpScaleAction const &) = default; + MetaBmpScaleAction & operator =(MetaBmpScaleAction &&) = default; protected: virtual ~MetaBmpScaleAction() override; public: @@ -643,6 +715,10 @@ private: public: MetaBmpScalePartAction(); + MetaBmpScalePartAction(MetaBmpScalePartAction const &) = default; + MetaBmpScalePartAction(MetaBmpScalePartAction &&) = default; + MetaBmpScalePartAction & operator =(MetaBmpScalePartAction const &) = default; + MetaBmpScalePartAction & operator =(MetaBmpScalePartAction &&) = default; protected: virtual ~MetaBmpScalePartAction() override; public: @@ -674,6 +750,10 @@ private: public: MetaBmpExAction(); + MetaBmpExAction(MetaBmpExAction const &) = default; + MetaBmpExAction(MetaBmpExAction &&) = default; + MetaBmpExAction & operator =(MetaBmpExAction const &) = default; + MetaBmpExAction & operator =(MetaBmpExAction &&) = default; protected: virtual ~MetaBmpExAction() override; public: @@ -701,6 +781,10 @@ private: public: MetaBmpExScaleAction(); + MetaBmpExScaleAction(MetaBmpExScaleAction const &) = default; + MetaBmpExScaleAction(MetaBmpExScaleAction &&) = default; + MetaBmpExScaleAction & operator =(MetaBmpExScaleAction const &) = default; + MetaBmpExScaleAction & operator =(MetaBmpExScaleAction &&) = default; protected: virtual ~MetaBmpExScaleAction() override; public: @@ -732,6 +816,10 @@ private: public: MetaBmpExScalePartAction(); + MetaBmpExScalePartAction(MetaBmpExScalePartAction const &) = default; + MetaBmpExScalePartAction(MetaBmpExScalePartAction &&) = default; + MetaBmpExScalePartAction & operator =(MetaBmpExScalePartAction const &) = default; + MetaBmpExScalePartAction & operator =(MetaBmpExScalePartAction &&) = default; protected: virtual ~MetaBmpExScalePartAction() override; public: @@ -764,6 +852,10 @@ private: public: MetaMaskAction(); + MetaMaskAction(MetaMaskAction const &) = default; + MetaMaskAction(MetaMaskAction &&) = default; + MetaMaskAction & operator =(MetaMaskAction const &) = default; + MetaMaskAction & operator =(MetaMaskAction &&) = default; protected: virtual ~MetaMaskAction() override; public: @@ -795,6 +887,10 @@ private: public: MetaMaskScaleAction(); + MetaMaskScaleAction(MetaMaskScaleAction const &) = default; + MetaMaskScaleAction(MetaMaskScaleAction &&) = default; + MetaMaskScaleAction & operator =(MetaMaskScaleAction const &) = default; + MetaMaskScaleAction & operator =(MetaMaskScaleAction &&) = default; protected: virtual ~MetaMaskScaleAction() override; public: @@ -829,6 +925,10 @@ private: public: MetaMaskScalePartAction(); + MetaMaskScalePartAction(MetaMaskScalePartAction const &) = default; + MetaMaskScalePartAction(MetaMaskScalePartAction &&) = default; + MetaMaskScalePartAction & operator =(MetaMaskScalePartAction const &) = default; + MetaMaskScalePartAction & operator =(MetaMaskScalePartAction &&) = default; protected: virtual ~MetaMaskScalePartAction() override; public: @@ -862,6 +962,10 @@ private: public: MetaGradientAction(); + MetaGradientAction(MetaGradientAction const &) = default; + MetaGradientAction(MetaGradientAction &&) = default; + MetaGradientAction & operator =(MetaGradientAction const &) = default; + MetaGradientAction & operator =(MetaGradientAction &&) = default; protected: virtual ~MetaGradientAction() override; public: @@ -888,6 +992,10 @@ private: public: MetaGradientExAction(); + MetaGradientExAction(MetaGradientExAction const &) = default; + MetaGradientExAction(MetaGradientExAction &&) = default; + MetaGradientExAction & operator =(MetaGradientExAction const &) = default; + MetaGradientExAction & operator =(MetaGradientExAction &&) = default; protected: virtual ~MetaGradientExAction() override; public: @@ -914,6 +1022,10 @@ private: public: MetaHatchAction(); + MetaHatchAction(MetaHatchAction const &) = default; + MetaHatchAction(MetaHatchAction &&) = default; + MetaHatchAction & operator =(MetaHatchAction const &) = default; + MetaHatchAction & operator =(MetaHatchAction &&) = default; protected: virtual ~MetaHatchAction() override; public: @@ -940,6 +1052,10 @@ private: public: MetaWallpaperAction(); + MetaWallpaperAction(MetaWallpaperAction const &) = default; + MetaWallpaperAction(MetaWallpaperAction &&) = default; + MetaWallpaperAction & operator =(MetaWallpaperAction const &) = default; + MetaWallpaperAction & operator =(MetaWallpaperAction &&) = default; protected: virtual ~MetaWallpaperAction() override; public: @@ -967,6 +1083,10 @@ private: public: MetaClipRegionAction(); + MetaClipRegionAction(MetaClipRegionAction const &) = default; + MetaClipRegionAction(MetaClipRegionAction &&) = default; + MetaClipRegionAction & operator =(MetaClipRegionAction const &) = default; + MetaClipRegionAction & operator =(MetaClipRegionAction &&) = default; protected: virtual ~MetaClipRegionAction() override; public: @@ -992,6 +1112,10 @@ private: public: MetaISectRectClipRegionAction(); + MetaISectRectClipRegionAction(MetaISectRectClipRegionAction const &) = default; + MetaISectRectClipRegionAction(MetaISectRectClipRegionAction &&) = default; + MetaISectRectClipRegionAction & operator =(MetaISectRectClipRegionAction const &) = default; + MetaISectRectClipRegionAction & operator =(MetaISectRectClipRegionAction &&) = default; protected: virtual ~MetaISectRectClipRegionAction() override; public: @@ -1016,6 +1140,10 @@ private: public: MetaISectRegionClipRegionAction(); + MetaISectRegionClipRegionAction(MetaISectRegionClipRegionAction const &) = default; + MetaISectRegionClipRegionAction(MetaISectRegionClipRegionAction &&) = default; + MetaISectRegionClipRegionAction & operator =(MetaISectRegionClipRegionAction const &) = default; + MetaISectRegionClipRegionAction & operator =(MetaISectRegionClipRegionAction &&) = default; protected: virtual ~MetaISectRegionClipRegionAction() override; public: @@ -1041,6 +1169,10 @@ private: public: MetaMoveClipRegionAction(); + MetaMoveClipRegionAction(MetaMoveClipRegionAction const &) = default; + MetaMoveClipRegionAction(MetaMoveClipRegionAction &&) = default; + MetaMoveClipRegionAction & operator =(MetaMoveClipRegionAction const &) = default; + MetaMoveClipRegionAction & operator =(MetaMoveClipRegionAction &&) = default; protected: virtual ~MetaMoveClipRegionAction() override; public: @@ -1066,6 +1198,10 @@ private: public: MetaLineColorAction(); + MetaLineColorAction(MetaLineColorAction const &) = default; + MetaLineColorAction(MetaLineColorAction &&) = default; + MetaLineColorAction & operator =(MetaLineColorAction const &) = default; + MetaLineColorAction & operator =(MetaLineColorAction &&) = default; protected: virtual ~MetaLineColorAction() override; public: @@ -1089,6 +1225,10 @@ private: public: MetaFillColorAction(); + MetaFillColorAction(MetaFillColorAction const &) = default; + MetaFillColorAction(MetaFillColorAction &&) = default; + MetaFillColorAction & operator =(MetaFillColorAction const &) = default; + MetaFillColorAction & operator =(MetaFillColorAction &&) = default; protected: virtual ~MetaFillColorAction() override; public: @@ -1111,6 +1251,10 @@ private: public: MetaTextColorAction(); + MetaTextColorAction(MetaTextColorAction const &) = default; + MetaTextColorAction(MetaTextColorAction &&) = default; + MetaTextColorAction & operator =(MetaTextColorAction const &) = default; + MetaTextColorAction & operator =(MetaTextColorAction &&) = default; protected: virtual ~MetaTextColorAction() override; public: @@ -1133,6 +1277,10 @@ private: public: MetaTextFillColorAction(); + MetaTextFillColorAction(MetaTextFillColorAction const &) = default; + MetaTextFillColorAction(MetaTextFillColorAction &&) = default; + MetaTextFillColorAction & operator =(MetaTextFillColorAction const &) = default; + MetaTextFillColorAction & operator =(MetaTextFillColorAction &&) = default; protected: virtual ~MetaTextFillColorAction() override; public: @@ -1156,6 +1304,10 @@ private: public: MetaTextLineColorAction(); + MetaTextLineColorAction(MetaTextLineColorAction const &) = default; + MetaTextLineColorAction(MetaTextLineColorAction &&) = default; + MetaTextLineColorAction & operator =(MetaTextLineColorAction const &) = default; + MetaTextLineColorAction & operator =(MetaTextLineColorAction &&) = default; protected: virtual ~MetaTextLineColorAction() override; public: @@ -1179,6 +1331,10 @@ private: public: MetaOverlineColorAction(); + MetaOverlineColorAction(MetaOverlineColorAction const &) = default; + MetaOverlineColorAction(MetaOverlineColorAction &&) = default; + MetaOverlineColorAction & operator =(MetaOverlineColorAction const &) = default; + MetaOverlineColorAction & operator =(MetaOverlineColorAction &&) = default; protected: virtual ~MetaOverlineColorAction() override; public: @@ -1201,6 +1357,10 @@ private: public: MetaTextAlignAction(); + MetaTextAlignAction(MetaTextAlignAction const &) = default; + MetaTextAlignAction(MetaTextAlignAction &&) = default; + MetaTextAlignAction & operator =(MetaTextAlignAction const &) = default; + MetaTextAlignAction & operator =(MetaTextAlignAction &&) = default; protected: virtual ~MetaTextAlignAction() override; public: @@ -1222,6 +1382,10 @@ private: public: MetaMapModeAction(); + MetaMapModeAction(MetaMapModeAction const &) = default; + MetaMapModeAction(MetaMapModeAction &&) = default; + MetaMapModeAction & operator =(MetaMapModeAction const &) = default; + MetaMapModeAction & operator =(MetaMapModeAction &&) = default; protected: virtual ~MetaMapModeAction() override; public: @@ -1245,6 +1409,10 @@ private: public: MetaFontAction(); + MetaFontAction(MetaFontAction const &) = default; + MetaFontAction(MetaFontAction &&) = default; + MetaFontAction & operator =(MetaFontAction const &) = default; + MetaFontAction & operator =(MetaFontAction &&) = default; protected: virtual ~MetaFontAction() override; public: @@ -1268,6 +1436,10 @@ private: public: MetaPushAction(); + MetaPushAction(MetaPushAction const &) = default; + MetaPushAction(MetaPushAction &&) = default; + MetaPushAction & operator =(MetaPushAction const &) = default; + MetaPushAction & operator =(MetaPushAction &&) = default; protected: virtual ~MetaPushAction() override; public: @@ -1286,6 +1458,10 @@ class VCL_DLLPUBLIC MetaPopAction : public MetaAction public: MetaPopAction(); + MetaPopAction(MetaPopAction const &) = default; + MetaPopAction(MetaPopAction &&) = default; + MetaPopAction & operator =(MetaPopAction const &) = default; + MetaPopAction & operator =(MetaPopAction &&) = default; protected: virtual ~MetaPopAction() override; public: @@ -1303,6 +1479,10 @@ private: public: MetaRasterOpAction(); + MetaRasterOpAction(MetaRasterOpAction const &) = default; + MetaRasterOpAction(MetaRasterOpAction &&) = default; + MetaRasterOpAction & operator =(MetaRasterOpAction const &) = default; + MetaRasterOpAction & operator =(MetaRasterOpAction &&) = default; protected: virtual ~MetaRasterOpAction() override; public: @@ -1325,6 +1505,10 @@ private: public: MetaTransparentAction(); + MetaTransparentAction(MetaTransparentAction const &) = default; + MetaTransparentAction(MetaTransparentAction &&) = default; + MetaTransparentAction & operator =(MetaTransparentAction const &) = default; + MetaTransparentAction & operator =(MetaTransparentAction &&) = default; protected: virtual ~MetaTransparentAction() override; public: @@ -1353,6 +1537,10 @@ private: public: MetaFloatTransparentAction(); + MetaFloatTransparentAction(MetaFloatTransparentAction const &) = default; + MetaFloatTransparentAction(MetaFloatTransparentAction &&) = default; + MetaFloatTransparentAction & operator =(MetaFloatTransparentAction const &) = default; + MetaFloatTransparentAction & operator =(MetaFloatTransparentAction &&) = default; protected: virtual ~MetaFloatTransparentAction() override; public: @@ -1384,6 +1572,10 @@ private: public: MetaEPSAction(); + MetaEPSAction(MetaEPSAction const &) = default; + MetaEPSAction(MetaEPSAction &&) = default; + MetaEPSAction & operator =(MetaEPSAction const &) = default; + MetaEPSAction & operator =(MetaEPSAction &&) = default; protected: virtual ~MetaEPSAction() override; public: @@ -1413,6 +1605,10 @@ private: public: MetaRefPointAction(); + MetaRefPointAction(MetaRefPointAction const &) = default; + MetaRefPointAction(MetaRefPointAction &&) = default; + MetaRefPointAction & operator =(MetaRefPointAction const &) = default; + MetaRefPointAction & operator =(MetaRefPointAction &&) = default; protected: virtual ~MetaRefPointAction() override; public: @@ -1469,6 +1665,10 @@ private: public: MetaLayoutModeAction(); + MetaLayoutModeAction(MetaLayoutModeAction const &) = default; + MetaLayoutModeAction(MetaLayoutModeAction &&) = default; + MetaLayoutModeAction & operator =(MetaLayoutModeAction const &) = default; + MetaLayoutModeAction & operator =(MetaLayoutModeAction &&) = default; protected: virtual ~MetaLayoutModeAction() override; public: @@ -1490,6 +1690,10 @@ private: public: MetaTextLanguageAction(); + MetaTextLanguageAction(MetaTextLanguageAction const &) = default; + MetaTextLanguageAction(MetaTextLanguageAction &&) = default; + MetaTextLanguageAction & operator =(MetaTextLanguageAction const &) = default; + MetaTextLanguageAction & operator =(MetaTextLanguageAction &&) = default; protected: virtual ~MetaTextLanguageAction() override; public: diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 2fe921ee1870..f0ae63b1cb15 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -76,8 +76,6 @@ private: public: QueueInfo(); - QueueInfo( const QueueInfo& rInfo ); - ~QueueInfo(); const OUString& GetPrinterName() const { return maPrinterName; } const OUString& GetDriver() const { return maDriver; } @@ -128,7 +126,6 @@ private: public: PrinterOptions(); - ~PrinterOptions(); bool IsReduceTransparency() const { return mbReduceTransparency; } void SetReduceTransparency( bool bSet ) { mbReduceTransparency = bSet; } diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index cdc19718f46f..3f27365604b0 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -269,6 +269,11 @@ class VCL_DLLPUBLIC ImplControlValue virtual ~ImplControlValue(); + ImplControlValue(ImplControlValue const &) = default; + ImplControlValue(ImplControlValue &&) = default; + ImplControlValue & operator =(ImplControlValue const &) = default; + ImplControlValue & operator =(ImplControlValue &&) = default; + virtual ImplControlValue* clone() const; ControlType getType() const { return mType; } @@ -309,6 +314,11 @@ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue }; virtual ~ScrollbarValue() override; virtual ScrollbarValue* clone() const override; + + ScrollbarValue(ScrollbarValue const &) = default; + ScrollbarValue(ScrollbarValue &&) = default; + ScrollbarValue & operator =(ScrollbarValue const &) = default; + ScrollbarValue & operator =(ScrollbarValue &&) = default; }; class VCL_DLLPUBLIC SliderValue : public ImplControlValue @@ -326,6 +336,11 @@ class VCL_DLLPUBLIC SliderValue : public ImplControlValue {} virtual ~SliderValue() override; virtual SliderValue* clone() const override; + + SliderValue(SliderValue const &) = default; + SliderValue(SliderValue &&) = default; + SliderValue & operator =(SliderValue const &) = default; + SliderValue & operator =(SliderValue &&) = default; }; /* TabitemValue: @@ -362,6 +377,11 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue virtual ~TabitemValue() override; virtual TabitemValue* clone() const override; + TabitemValue(TabitemValue const &) = default; + TabitemValue(TabitemValue &&) = default; + TabitemValue & operator =(TabitemValue const &) = default; + TabitemValue & operator =(TabitemValue &&) = default; + bool isLeftAligned() const { return bool(mnAlignment & TabitemFlags::LeftAligned); } bool isRightAligned() const { return bool(mnAlignment & TabitemFlags::RightAligned); } bool isBothAligned() const { return isLeftAligned() && isRightAligned(); } @@ -398,6 +418,11 @@ class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue virtual ~SpinbuttonValue() override; virtual SpinbuttonValue* clone() const override; + + SpinbuttonValue(SpinbuttonValue const &) = default; + SpinbuttonValue(SpinbuttonValue &&) = default; + SpinbuttonValue & operator =(SpinbuttonValue const &) = default; + SpinbuttonValue & operator =(SpinbuttonValue &&) = default; }; /* Toolbarvalue: @@ -411,6 +436,12 @@ public: { mbIsTopDockingArea = false; } virtual ~ToolbarValue() override; virtual ToolbarValue* clone() const override; + + ToolbarValue(ToolbarValue const &) = default; + ToolbarValue(ToolbarValue &&) = default; + ToolbarValue & operator =(ToolbarValue const &) = default; + ToolbarValue & operator =(ToolbarValue &&) = default; + tools::Rectangle maGripRect; bool mbIsTopDockingArea; // indicates that this is the top aligned dockingarea // adjacent to the menubar, only used on Windows @@ -427,6 +458,10 @@ public: { maTopDockingAreaHeight=0; } virtual ~MenubarValue() override; virtual MenubarValue* clone() const override; + MenubarValue(MenubarValue const &) = default; + MenubarValue(MenubarValue &&) = default; + MenubarValue & operator =(MenubarValue const &) = default; + MenubarValue & operator =(MenubarValue &&) = default; int maTopDockingAreaHeight; }; @@ -444,6 +479,10 @@ public: {} virtual ~MenupopupValue() override; virtual MenupopupValue* clone() const override; + MenupopupValue(MenupopupValue const &) = default; + MenupopupValue(MenupopupValue &&) = default; + MenupopupValue & operator =(MenupopupValue const &) = default; + MenupopupValue & operator =(MenupopupValue &&) = default; tools::Rectangle maItemRect; }; @@ -460,6 +499,11 @@ public: virtual ~PushButtonValue() override; virtual PushButtonValue* clone() const override; + PushButtonValue(PushButtonValue const &) = default; + PushButtonValue(PushButtonValue &&) = default; + PushButtonValue & operator =(PushButtonValue const &) = default; + PushButtonValue & operator =(PushButtonValue &&) = default; + bool mbBevelButton:1; // only used on OSX bool mbSingleLine:1; // only used on OSX }; diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 491831e147d9..a004b23e8ebc 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -96,8 +96,6 @@ private: public: MouseSettings(); - ~MouseSettings(); - void SetOptions( MouseSettingsOptions nOptions ); MouseSettingsOptions GetOptions() const; @@ -243,7 +241,6 @@ private: public: StyleSettings(); - ~StyleSettings(); void Set3DColors( const Color& rColor ); @@ -623,7 +620,6 @@ class VCL_DLLPUBLIC MiscSettings public: MiscSettings(); - ~MiscSettings(); #ifdef _WIN32 void SetEnableATToolSupport( bool bEnable ); @@ -645,7 +641,6 @@ class VCL_DLLPUBLIC HelpSettings public: HelpSettings(); - ~HelpSettings(); sal_uLong GetTipDelay() const; void SetTipTimeout( sal_uLong nTipTimeout ); @@ -678,8 +673,6 @@ private: public: AllSettings(); - AllSettings( const AllSettings& rSet ); - ~AllSettings(); void SetMouseSettings( const MouseSettings& rSet ); const MouseSettings& GetMouseSettings() const; diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx index 8dc250c7a640..642a57ea5ec2 100644 --- a/include/vcl/vclptr.hxx +++ b/include/vcl/vclptr.hxx @@ -115,6 +115,10 @@ public: assert((!m_rInnerRef.get() || m_rInnerRef->isDisposed() || m_rInnerRef->getRefCount() > 1) && "someone forgot to call dispose()"); } + VclPtr(VclPtr const &) = default; + VclPtr(VclPtr &&) = default; + VclPtr & operator =(VclPtr const &) = default; + VclPtr & operator =(VclPtr &&) = default; #endif /** diff --git a/vcl/inc/fontattributes.hxx b/vcl/inc/fontattributes.hxx index 5487ac621668..b5fed601022c 100644 --- a/vcl/inc/fontattributes.hxx +++ b/vcl/inc/fontattributes.hxx @@ -31,7 +31,6 @@ class VCL_DLLPUBLIC FontAttributes { public: explicit FontAttributes(); - FontAttributes( const FontAttributes& ); // device independent font functions const OUString& GetFamilyName() const { return maFamilyName; } diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx index 846eeaa7c942..86cf5112b15b 100644 --- a/vcl/source/app/IconThemeScanner.cxx +++ b/vcl/source/app/IconThemeScanner.cxx @@ -184,9 +184,6 @@ IconThemeScanner::GetStandardIconThemePath() return aPathOptions.GetIconsetPath(); } -IconThemeScanner::~IconThemeScanner() -{} - namespace { class SameTheme diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index a000b065092d..4354ff573bee 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -433,10 +433,6 @@ MouseSettings::MouseSettings() { } -MouseSettings::~MouseSettings() -{ -} - void MouseSettings::CopyData() { // copy if other references exist @@ -715,10 +711,6 @@ StyleSettings::StyleSettings() { } -StyleSettings::~StyleSettings() -{ -} - void StyleSettings::SetFaceColor( const Color& rColor ) { @@ -2346,10 +2338,6 @@ MiscSettings::MiscSettings() { } -MiscSettings::~MiscSettings() -{ -} - bool MiscSettings::operator ==( const MiscSettings& rSet ) const { if ( mxData == rSet.mxData ) @@ -2529,10 +2517,6 @@ HelpSettings::HelpSettings() { } -HelpSettings::~HelpSettings() -{ -} - bool HelpSettings::operator ==( const HelpSettings& rSet ) const { if ( mxData == rSet.mxData ) @@ -2614,15 +2598,6 @@ AllSettings::AllSettings() { } -AllSettings::AllSettings( const AllSettings& rSet ) -{ - mxData = rSet.mxData; -} - -AllSettings::~AllSettings() -{ -} - void AllSettings::CopyData() { // copy if other references exist diff --git a/vcl/source/font/fontattributes.cxx b/vcl/source/font/fontattributes.cxx index 56c28fc21e2a..52dfdc63a376 100644 --- a/vcl/source/font/fontattributes.cxx +++ b/vcl/source/font/fontattributes.cxx @@ -33,20 +33,6 @@ FontAttributes::FontAttributes() mnQuality( 0 ) {} -FontAttributes::FontAttributes( const FontAttributes& rFontAttributes ) : - maFamilyName( rFontAttributes.maFamilyName ), - maStyleName( rFontAttributes.maStyleName ), - meWeight( rFontAttributes.meWeight ), - meFamily( rFontAttributes.meFamily ), - mePitch( rFontAttributes.mePitch ), - meWidthType( rFontAttributes.meWidthType ), - meItalic( rFontAttributes.meItalic ), - meCharSet( rFontAttributes.meCharSet ), - mbSymbolFlag( rFontAttributes.mbSymbolFlag ), - maMapNames( rFontAttributes.maMapNames ), - mnQuality( rFontAttributes.mnQuality ) -{} - bool FontAttributes::CompareDeviceIndependentFontAttributes(const FontAttributes& rOther) const { if (maFamilyName != rOther.maFamilyName) diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index a98d26589c8b..4760cdff6e90 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -102,10 +102,6 @@ PrinterOptions::PrinterOptions() : { } -PrinterOptions::~PrinterOptions() -{ -} - void PrinterOptions::ReadFromConfig( bool i_bFile ) { bool bSuccess = false; @@ -336,10 +332,6 @@ QueueInfo::QueueInfo() mnJobs = 0; } -QueueInfo::QueueInfo( const QueueInfo& ) = default; - -QueueInfo::~QueueInfo() = default; - SalPrinterQueueInfo::SalPrinterQueueInfo() { mnStatus = PrintQueueFlags::NONE; diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx index f0d11065afb2..e4c19c88c8d8 100644 --- a/vcl/source/window/keyevent.cxx +++ b/vcl/source/window/keyevent.cxx @@ -21,12 +21,6 @@ #include <com/sun/star/awt/KeyModifier.hpp> #include <vcl/event.hxx> -KeyEvent::KeyEvent (const KeyEvent& rKeyEvent) : - maKeyCode (rKeyEvent.maKeyCode), - mnRepeat (rKeyEvent.mnRepeat), - mnCharCode(rKeyEvent.mnCharCode) -{} - KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const { KeyEvent aClone(*this); |