diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-07 12:12:40 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-07 12:35:58 +0100 |
commit | b3893cc5fbe7dddd6eefe523436d058ab223700c (patch) | |
tree | 625e8715d49da7204f3b0398fb583b2fffc26955 /desktop | |
parent | 86fa2dcbd2f30155a80fd9a4d6e86200890f0d7a (diff) |
loplugin:deletedspecial
Change-Id: I1553902c1f7c30f2c64d2210dc301c5ae50c6c4b
Diffstat (limited to 'desktop')
10 files changed, 20 insertions, 25 deletions
diff --git a/desktop/source/app/configinit.hxx b/desktop/source/app/configinit.hxx index c026c4972c93..8719bc37f531 100644 --- a/desktop/source/app/configinit.hxx +++ b/desktop/source/app/configinit.hxx @@ -56,9 +56,8 @@ Context * m_pContext; InteractionHandler m_xHandler; private: - // not implemented - suppress copy - ConfigurationErrorHandler(const ConfigurationErrorHandler&); - void operator=(const ConfigurationErrorHandler&); + ConfigurationErrorHandler(const ConfigurationErrorHandler&) SAL_DELETED_FUNCTION; + void operator=(const ConfigurationErrorHandler&) SAL_DELETED_FUNCTION; }; diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index d93dd10e9b83..0de1148b66f0 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -76,8 +76,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> getPackage() const { return m_xPackage; } private: - SelectedPackage(SelectedPackage &); // not defined - void operator =(SelectedPackage &); // not defined + SelectedPackage(SelectedPackage &) SAL_DELETED_FUNCTION; + void operator =(SelectedPackage &) SAL_DELETED_FUNCTION; ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> m_xPackage; }; diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index a778ad37630a..1175470c33d5 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -41,8 +41,8 @@ public: virtual ~DependencyDialog(); private: - DependencyDialog(DependencyDialog &); // not defined - void operator =(DependencyDialog &); // not defined + DependencyDialog(DependencyDialog &) SAL_DELETED_FUNCTION; + void operator =(DependencyDialog &) SAL_DELETED_FUNCTION; ListBox* m_list; }; diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index 66c2d4d38e53..c4bec998081e 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx @@ -87,8 +87,8 @@ public: bool isBusy(); private: - ExtensionCmdQueue(ExtensionCmdQueue &); // not defined - void operator =(ExtensionCmdQueue &); // not defined + ExtensionCmdQueue(ExtensionCmdQueue &) SAL_DELETED_FUNCTION; + void operator =(ExtensionCmdQueue &) SAL_DELETED_FUNCTION; class Thread; diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index de861673fb29..c2eedcbba4b2 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -95,8 +95,8 @@ public: com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > > &rItemList ); private: - UpdateDialog(UpdateDialog &); // not defined - void operator =(UpdateDialog &); // not defined + UpdateDialog(UpdateDialog &) SAL_DELETED_FUNCTION; + void operator =(UpdateDialog &) SAL_DELETED_FUNCTION; struct DisabledUpdate; struct SpecificError; @@ -116,8 +116,8 @@ private: sal_uInt16 getItemCount() const; private: - CheckListBox(UpdateDialog::CheckListBox &); // not defined - void operator =(UpdateDialog::CheckListBox &); // not defined + CheckListBox(UpdateDialog::CheckListBox &) SAL_DELETED_FUNCTION; + void operator =(UpdateDialog::CheckListBox &) SAL_DELETED_FUNCTION; virtual void MouseButtonDown(MouseEvent const & event) SAL_OVERRIDE; virtual void MouseButtonUp(MouseEvent const & event) SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index f4aab63200f8..0dd3e5a97c5e 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -211,7 +211,6 @@ UpdateInstallDialog::UpdateInstallDialog( m_xComponentContext(xCtx), m_bError(false), m_bNoEntry(true), - m_bActivated(false), m_sInstalling(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_INSTALLING)), m_sFinished(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_FINISHED)), m_sNoErrors(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_NO_ERRORS)), diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 3bad18abe96d..bff71e788820 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -65,8 +65,8 @@ public: virtual short Execute() SAL_OVERRIDE; private: - UpdateInstallDialog(UpdateInstallDialog &); // not defined - void operator =(UpdateInstallDialog &); // not defined + UpdateInstallDialog(UpdateInstallDialog &) SAL_DELETED_FUNCTION; + void operator =(UpdateInstallDialog &) SAL_DELETED_FUNCTION; class Thread; friend class Thread; @@ -94,7 +94,6 @@ private: //Signals that an error occurred during download and installation bool m_bError; bool m_bNoEntry; - bool m_bActivated; OUString m_sInstalling; OUString m_sFinished; diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 97dd57ef44f8..a46980de6d90 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -83,8 +83,8 @@ public: void erase(OUString const & id, OUString const & fileName); private: - ActivePackages(ActivePackages &); // not defined - void operator =(ActivePackages &); // not defined + ActivePackages(ActivePackages &) SAL_DELETED_FUNCTION; + void operator =(ActivePackages &) SAL_DELETED_FUNCTION; #if HAVE_FEATURE_EXTENSIONS ::dp_misc::PersistentMap m_map; #endif diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 5e956689123e..a9e9f3de576d 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -47,8 +47,8 @@ private: css::uno::Reference<css::xml::dom::XDocument> m_doc; css::uno::Reference<css::xml::xpath::XXPathAPI> m_xpathApi; - BackendDb(BackendDb const &); - BackendDb & operator = (BackendDb const &); + BackendDb(BackendDb const &) SAL_DELETED_FUNCTION; + BackendDb & operator = (BackendDb const &) SAL_DELETED_FUNCTION; protected: const css::uno::Reference<css::uno::XComponentContext> m_xContext; diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index 8728d7ea199d..901e3278b798 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -35,10 +35,8 @@ namespace desktop { class UnxSplashScreen : public ::cppu::WeakImplHelper3< css::task::XStatusIndicator, css::lang::XInitialization, css::lang::XServiceInfo > { private: - // don't allow anybody but ourselves to create instances of this class - UnxSplashScreen( const UnxSplashScreen& ); - UnxSplashScreen( void ); - UnxSplashScreen operator =( const UnxSplashScreen& ); + UnxSplashScreen( const UnxSplashScreen& ) SAL_DELETED_FUNCTION; + UnxSplashScreen operator =( const UnxSplashScreen& ) SAL_DELETED_FUNCTION; virtual ~UnxSplashScreen(); |