diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-01 09:48:16 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-02 07:03:08 +0100 |
commit | 8467d764187691f53e66d3568270197b162332d8 (patch) | |
tree | 4516bb3ea935427d4549ce09615a22bf5663096a /include | |
parent | 9ec1f722caedbeb04f96258f23442f8ee92a42be (diff) |
fix signatures of deleted copy/assign operators
Change-Id: Id1a0749b78a7021be3564487fb974d7084705129
Reviewed-on: https://gerrit.libreoffice.org/62718
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
24 files changed, 55 insertions, 55 deletions
diff --git a/include/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx index 7118006ef71b..389593fd57be 100644 --- a/include/codemaker/exceptiontree.hxx +++ b/include/codemaker/exceptiontree.hxx @@ -55,8 +55,8 @@ struct ExceptionTreeNode { Children children; private: - ExceptionTreeNode(ExceptionTreeNode &) = delete; - void operator =(ExceptionTreeNode) = delete; + ExceptionTreeNode(ExceptionTreeNode const &) = delete; + ExceptionTreeNode& operator =(ExceptionTreeNode const &) = delete; void clearChildren(); }; @@ -106,8 +106,8 @@ public: ExceptionTreeNode const & getRoot() const { return m_root; } private: - ExceptionTree(ExceptionTree &) = delete; - void operator =(const ExceptionTree&) = delete; + ExceptionTree(ExceptionTree const &) = delete; + ExceptionTree& operator =(const ExceptionTree&) = delete; ExceptionTreeNode m_root; }; diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx index e9859f37c999..d82c8fb1cb20 100644 --- a/include/codemaker/generatedtypeset.hxx +++ b/include/codemaker/generatedtypeset.hxx @@ -58,8 +58,8 @@ public: { return m_set.find(type) != m_set.end(); } private: - GeneratedTypeSet(GeneratedTypeSet &) = delete; - void operator =(const GeneratedTypeSet&) = delete; + GeneratedTypeSet(GeneratedTypeSet const &) = delete; + GeneratedTypeSet& operator =(GeneratedTypeSet const &) = delete; std::unordered_set< OString > m_set; }; diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx index bc2ebf54f675..3ec50176f786 100644 --- a/include/comphelper/asyncnotification.hxx +++ b/include/comphelper/asyncnotification.hxx @@ -44,8 +44,8 @@ namespace comphelper virtual ~AnyEvent() override; private: - AnyEvent( AnyEvent& ) = delete; - void operator=( AnyEvent& ) = delete; + AnyEvent( AnyEvent const & ) = delete; + AnyEvent& operator=( AnyEvent const & ) = delete; }; diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx index f3b34adb32a7..0d4e6ba310e8 100644 --- a/include/editeng/swafopt.hxx +++ b/include/editeng/swafopt.hxx @@ -57,7 +57,7 @@ class SortedAutoCompleteStrings { bool owning_; - void operator =(SortedAutoCompleteStrings) = delete; + SortedAutoCompleteStrings& operator =(SortedAutoCompleteStrings const &) = delete; #if !HAVE_CPP_GUARANTEED_COPY_ELISION public: diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx index c39d985a0cf6..efddbee3eeb0 100644 --- a/include/jvmaccess/unovirtualmachine.hxx +++ b/include/jvmaccess/unovirtualmachine.hxx @@ -88,8 +88,8 @@ public: void * getClassLoader() const { return m_classLoader;} private: - UnoVirtualMachine(UnoVirtualMachine &) = delete; - void operator =(UnoVirtualMachine &) = delete; + UnoVirtualMachine(UnoVirtualMachine const &) = delete; + UnoVirtualMachine& operator =(UnoVirtualMachine const &) = delete; virtual ~UnoVirtualMachine() override; diff --git a/include/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx index 21c507290f18..69931dfeeced 100644 --- a/include/jvmaccess/virtualmachine.hxx +++ b/include/jvmaccess/virtualmachine.hxx @@ -82,8 +82,8 @@ public: JNIEnv * getEnvironment() const { return m_pEnvironment; } private: - AttachGuard(AttachGuard &) = delete; - void operator =(AttachGuard) = delete; + AttachGuard(AttachGuard const &) = delete; + AttachGuard& operator =(AttachGuard const &) = delete; rtl::Reference< VirtualMachine > m_xMachine; JNIEnv * m_pEnvironment; @@ -128,8 +128,8 @@ public: JNIEnv const * pMainThreadEnv); private: - VirtualMachine(VirtualMachine &) = delete; - void operator =(VirtualMachine) = delete; + VirtualMachine(VirtualMachine const &) = delete; + VirtualMachine& operator =(VirtualMachine const & ) = delete; virtual ~VirtualMachine() override; diff --git a/include/registry/writer.hxx b/include/registry/writer.hxx index 17d6838bd831..4bf6724610cf 100644 --- a/include/registry/writer.hxx +++ b/include/registry/writer.hxx @@ -278,8 +278,8 @@ public: } private: - Writer(Writer &) = delete; - void operator =(Writer) = delete; + Writer(Writer const &) = delete; + Writer& operator =(Writer const &) = delete; void * m_handle; }; diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 1c3e2b37caa6..703998b3644a 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -50,8 +50,8 @@ class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog std::unique_ptr<SfxItemSet> pOutputSet; private: - SfxModalDialog(SfxModalDialog &) = delete; - void operator =(SfxModalDialog &) = delete; + SfxModalDialog(SfxModalDialog const &) = delete; + SfxModalDialog& operator =(SfxModalDialog const &) = delete; SAL_DLLPRIVATE void SetDialogData_Impl(); SAL_DLLPRIVATE void GetDialogData_Impl(); @@ -81,8 +81,8 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog Size aSize; std::unique_ptr< SfxModelessDialog_Impl > pImpl; - SfxModelessDialog(SfxModelessDialog &) = delete; - void operator =(SfxModelessDialog &) = delete; + SfxModelessDialog(SfxModelessDialog const &) = delete; + SfxModelessDialog& operator =(SfxModelessDialog const &) = delete; void Init(SfxBindings *pBindinx, SfxChildWindow *pCW); @@ -150,8 +150,8 @@ class SFX2_DLLPUBLIC SfxFloatingWindow: public FloatingWindow Size aSize; std::unique_ptr< SfxFloatingWindow_Impl > pImpl; - SfxFloatingWindow(SfxFloatingWindow &) = delete; - void operator =(SfxFloatingWindow &) = delete; + SfxFloatingWindow(SfxFloatingWindow const &) = delete; + SfxFloatingWindow& operator =(SfxFloatingWindow const &) = delete; protected: SfxFloatingWindow( SfxBindings *pBindings, diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 6d6d681a26c2..e75c043f0c19 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -48,8 +48,8 @@ private: SfxChildWindow* pMgr; std::unique_ptr< SfxDockingWindow_Impl > pImpl; - SfxDockingWindow(SfxDockingWindow &) = delete; - void operator =(SfxDockingWindow &) = delete; + SfxDockingWindow(SfxDockingWindow const &) = delete; + SfxDockingWindow& operator =(SfxDockingWindow const &) = delete; protected: SfxChildAlignment CalcAlignment(const Point& rPos, tools::Rectangle& rRect ); diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx index d7d690e78ea8..4231baee4fa8 100644 --- a/include/sfx2/printer.hxx +++ b/include/sfx2/printer.hxx @@ -36,7 +36,7 @@ private: std::unique_ptr<SfxItemSet> pOptions; bool bKnown; - SAL_DLLPRIVATE void operator =(SfxPrinter &) = delete; + SfxPrinter& operator =(SfxPrinter const &) = delete; public: SfxPrinter( std::unique_ptr<SfxItemSet> &&pTheOptions ); diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index d524ba892400..b309187139be 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -75,8 +75,8 @@ friend class SfxFrameStatusListener; rtl::Reference<SfxFrameStatusListener> m_xStatusListener; private: - SfxPopupWindow(SfxPopupWindow &) = delete; - void operator =(SfxPopupWindow &) = delete; + SfxPopupWindow(SfxPopupWindow const &) = delete; + SfxPopupWindow& operator =(SfxPopupWindow const &) = delete; void Delete(); protected: diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 2b8ce9ee299a..d61cda9dba39 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -447,8 +447,8 @@ namespace svt }; private: - EditBrowseBox(EditBrowseBox&) = delete; - EditBrowseBox& operator=(EditBrowseBox&) = delete; + EditBrowseBox(EditBrowseBox const &) = delete; + EditBrowseBox& operator=(EditBrowseBox const &) = delete; class BrowserMouseEventPtr { diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx index 8372c1a6562b..19b6f26acdd6 100644 --- a/include/svtools/javacontext.hxx +++ b/include/svtools/javacontext.hxx @@ -58,8 +58,8 @@ namespace svt virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) override; private: - JavaContext(JavaContext&) = delete; - JavaContext& operator = (JavaContext&) = delete; + JavaContext(JavaContext const &) = delete; + JavaContext& operator = (JavaContext const &) = delete; oslInterlockedCount m_aRefCount; css::uno::Reference< css::uno::XCurrentContext > m_xNextContext; diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 8ac275295314..0df41c9648b8 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -124,8 +124,8 @@ public: bool isColumnHeader(); sdr::table::SdrTableObj* GetTableObj() { return mxTableObj.get(); } private: - SvxTableController(SvxTableController &) = delete; - void operator =(SvxTableController &) = delete; + SvxTableController(SvxTableController const &) = delete; + SvxTableController& operator =(SvxTableController const &) = delete; // internals enum class TblAction diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index 8f5b7902b757..03b6a091a8eb 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -54,8 +54,8 @@ namespace svx Color const & GetCurrentColor() const { return maCurColor; } private: - ToolboxButtonColorUpdater(ToolboxButtonColorUpdater &) = delete; - void operator =(ToolboxButtonColorUpdater) = delete; + ToolboxButtonColorUpdater(ToolboxButtonColorUpdater const &) = delete; + ToolboxButtonColorUpdater& operator =(ToolboxButtonColorUpdater const &) = delete; bool const mbWideButton; sal_uInt16 const mnBtnId; diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx index 24fa7b27ef07..89a7dd593863 100644 --- a/include/unoidl/unoidl.hxx +++ b/include/unoidl/unoidl.hxx @@ -37,7 +37,7 @@ public: const OUString& getUri() const { return uri_; } private: - void operator =(NoSuchFileException) = delete; + NoSuchFileException& operator =(NoSuchFileException const &) = delete; OUString const uri_; }; @@ -60,7 +60,7 @@ public: const OUString& getDetail() const { return detail_; } private: - void operator =(FileFormatException) = delete; + FileFormatException& operator =(FileFormatException const &) = delete; OUString const uri_; OUString const detail_; diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx index 8df85d04858c..4e0206ace017 100644 --- a/include/unotools/options.hxx +++ b/include/unotools/options.hxx @@ -100,8 +100,8 @@ public: virtual ~Options() override = 0; private: - Options(Options &) = delete; - void operator =(Options &) = delete; + Options(Options const &) = delete; + Options& operator =(Options const &) = delete; protected: virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, ConfigurationHints nHint ) override; diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx index 88bdf0bd6da1..0b673774dc75 100644 --- a/include/vcl/uitest/uiobject.hxx +++ b/include/vcl/uitest/uiobject.hxx @@ -38,8 +38,8 @@ typedef std::map<const OUString, OUString> StringMap; */ class UITEST_DLLPUBLIC UIObject { - UIObject(UIObject &) = delete; - void operator =(UIObject) = delete; + UIObject(UIObject const &) = delete; + UIObject& operator =(UIObject const &) = delete; public: UIObject() = default; diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 9f1d0e802f91..698fd038bbde 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -181,8 +181,8 @@ class VCL_DLLPUBLIC VclSimpleEvent private: VclEventId nId; - VclSimpleEvent(VclSimpleEvent &) = delete; - void operator =(VclSimpleEvent) = delete; + VclSimpleEvent(VclSimpleEvent const &) = delete; + VclSimpleEvent& operator =(VclSimpleEvent const &) = delete; public: VclSimpleEvent( VclEventId n ) { nId = n; } @@ -211,8 +211,8 @@ private: VclPtr<Menu> pMenu; sal_uInt16 const mnPos; - VclMenuEvent(VclMenuEvent &) = delete; - void operator =(VclMenuEvent) = delete; + VclMenuEvent(VclMenuEvent const &) = delete; + VclMenuEvent& operator =(VclMenuEvent const &) = delete; public: VclMenuEvent( Menu* pM, VclEventId n, sal_uInt16 nPos ); diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx index ac74e09f8f9f..38544067c63d 100644 --- a/include/xmloff/SchXMLExportHelper.hxx +++ b/include/xmloff/SchXMLExportHelper.hxx @@ -57,8 +57,8 @@ public: void SetDestinationShellID( const OUString& rShellID ); private: - SchXMLExportHelper(SchXMLExportHelper &) = delete; - void operator =(SchXMLExportHelper &) = delete; + SchXMLExportHelper(SchXMLExportHelper const &) = delete; + SchXMLExportHelper& operator =(SchXMLExportHelper const &) = delete; private: std::unique_ptr<SchXMLExportHelper_Impl> m_pImpl; diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index 32163f5385dd..8b506b6dc4ad 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -44,8 +44,8 @@ private: css::uno::Reference < css::style::XStyle > mxStyle; SvXMLImportContextRef const mxStyles; - XMLPropStyleContext(XMLPropStyleContext &) = delete; - void operator =(XMLPropStyleContext &) = delete; + XMLPropStyleContext(XMLPropStyleContext const &) = delete; + XMLPropStyleContext& operator =(XMLPropStyleContext const &) = delete; protected: diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index f19080d0c518..5b2099714c0d 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -528,7 +528,7 @@ public: void PopTextListsHelper(); private: - XMLTextParagraphExport(XMLTextParagraphExport &) = delete; + XMLTextParagraphExport(XMLTextParagraphExport const &) = delete; }; inline const XMLTextListAutoStylePool& diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index ec280ead6cf2..fe4cf515ea49 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -57,8 +57,8 @@ class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public salhelper::SimpleRefer SvXMLImport& rImport; // access to error handling - SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &) = delete; - void operator =(SvXMLImportPropertyMapper &) = delete; + SvXMLImportPropertyMapper(SvXMLImportPropertyMapper const &) = delete; + SvXMLImportPropertyMapper& operator =(SvXMLImportPropertyMapper const &) = delete; protected: diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index dfeb41e7261d..6d60a1114b73 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -168,8 +168,8 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext SAL_DLLPRIVATE const SvXMLTokenMap& GetStyleStylesElemTokenMap(); - SvXMLStylesContext(SvXMLStylesContext &) = delete; - void operator =(SvXMLStylesContext &) = delete; + SvXMLStylesContext(SvXMLStylesContext const &) = delete; + SvXMLStylesContext& operator =(SvXMLStylesContext const &) = delete; protected: |