loplugin:deletedspecial (Mac OS X)

Change-Id: Ia09e2e7b3e40bd04da64b52fe29258017b90b156
This commit is contained in:
Stephan Bergmann 2015-02-07 17:24:28 +01:00
parent a5cbf486ac
commit a6f8766d35
7 changed files with 22 additions and 30 deletions

View File

@ -105,17 +105,21 @@ bool DeletedSpecial::VisitCXXMethodDecl(CXXMethodDecl const * decl) {
} else if (ctor != nullptr && ctor->isDefaultConstructor() } else if (ctor != nullptr && ctor->isDefaultConstructor()
&& std::distance(cls->ctor_begin(), cls->ctor_end()) == 1) && std::distance(cls->ctor_begin(), cls->ctor_end()) == 1)
{ {
if (whitelist(decl, "DocTemplLocaleHelper", "sfx2/source/doc/doctemplateslocal.hxx") if (whitelist(decl, "AquaA11yFocusListener", "vcl/osx/a11yfocuslistener.hxx")
|| whitelist(decl, "DocTemplLocaleHelper", "sfx2/source/doc/doctemplateslocal.hxx")
|| whitelist(decl, "ScViewDataTable", "sc/source/filter/excel/../../ui/inc/viewdata.hxx") || whitelist(decl, "ScViewDataTable", "sc/source/filter/excel/../../ui/inc/viewdata.hxx")
|| whitelist(decl, "ScViewDataTable", "sc/source/ui/inc/viewdata.hxx") || whitelist(decl, "ScViewDataTable", "sc/source/ui/inc/viewdata.hxx")
|| whitelist(decl, "SwLineInfo", "sw/source/core/text/inftxt.hxx") || whitelist(decl, "SwLineInfo", "sw/source/core/text/inftxt.hxx")
|| whitelist(decl, "XRenderPeer", "vcl/unx/generic/gdi/xrender_peer.hxx") || whitelist(decl, "XRenderPeer", "vcl/unx/generic/gdi/xrender_peer.hxx")
|| whitelist(decl, "desktop::DispatchWatcher", "desktop/source/app/dispatchwatcher.hxx")
|| whitelist(decl, "desktop::OfficeIPCThread", "desktop/source/app/officeipcthread.hxx") || whitelist(decl, "desktop::OfficeIPCThread", "desktop/source/app/officeipcthread.hxx")
|| whitelist(decl, "desktop::OfficeIPCThread", "desktop/source/lib/../app/officeipcthread.hxx") || whitelist(decl, "desktop::OfficeIPCThread", "desktop/source/lib/../app/officeipcthread.hxx")
|| whitelist(decl, "sd::DiscoveryService", "sd/source/ui/remotecontrol/DiscoveryService.hxx") || whitelist(decl, "sd::DiscoveryService", "sd/source/ui/remotecontrol/DiscoveryService.hxx")
|| whitelist(decl, "sd::IconCache", "sd/source/ui/inc/tools/IconCache.hxx") || whitelist(decl, "sd::IconCache", "sd/source/ui/inc/tools/IconCache.hxx")
|| whitelist(decl, "sd::RemoteServer", "sd/source/ui/inc/RemoteServer.hxx")
|| whitelist(decl, "sd::slidesorter::cache::PageCacheManager", "sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx") || whitelist(decl, "sd::slidesorter::cache::PageCacheManager", "sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx")
|| whitelist(decl, "sfx2::sidebar::CommandInfoProvider", "include/sfx2/sidebar/CommandInfoProvider.hxx") || whitelist(decl, "sfx2::sidebar::CommandInfoProvider", "include/sfx2/sidebar/CommandInfoProvider.hxx")
|| whitelist(decl, "vcl::SettingsConfigItem", "include/vcl/configsettings.hxx")
|| whitelist(decl, "writerfilter::ooxml::OOXMLFactory", "writerfilter/source/ooxml/OOXMLFactory.hxx")) || whitelist(decl, "writerfilter::ooxml::OOXMLFactory", "writerfilter/source/ooxml/OOXMLFactory.hxx"))
{ {
return true; return true;

View File

@ -192,9 +192,8 @@ public:
} }
private: private:
// prevent copy and assignment SalAquaFilePicker( const SalAquaFilePicker& ) SAL_DELETED_FUNCTION;
SalAquaFilePicker( const SalAquaFilePicker& ); SalAquaFilePicker& operator=( const SalAquaFilePicker& ) SAL_DELETED_FUNCTION;
SalAquaFilePicker& operator=( const SalAquaFilePicker& );
virtual void ensureFilterHelper(); virtual void ensureFilterHelper();

View File

@ -101,9 +101,8 @@ public:
throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: private:
// prevent copy and assignment SalAquaFolderPicker( const SalAquaFolderPicker& ) SAL_DELETED_FUNCTION;
SalAquaFolderPicker( const SalAquaFolderPicker& ); SalAquaFolderPicker& operator=( const SalAquaFolderPicker& ) SAL_DELETED_FUNCTION;
SalAquaFolderPicker& operator=( const SalAquaFolderPicker& );
// to instantiate own services // to instantiate own services
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;

View File

@ -73,9 +73,8 @@ class MacSpellChecker :
linguistic::PropertyHelper_Spell * pPropHelper; linguistic::PropertyHelper_Spell * pPropHelper;
bool bDisposing; bool bDisposing;
// disallow copy-constructor and assignment-operator for now MacSpellChecker(const MacSpellChecker &) SAL_DELETED_FUNCTION;
MacSpellChecker(const MacSpellChecker &); MacSpellChecker & operator = (const MacSpellChecker &) SAL_DELETED_FUNCTION;
MacSpellChecker & operator = (const MacSpellChecker &);
linguistic::PropertyHelper_Spell & GetPropHelper_Impl(); linguistic::PropertyHelper_Spell & GetPropHelper_Impl();
linguistic::PropertyHelper_Spell & GetPropHelper() linguistic::PropertyHelper_Spell & GetPropHelper()

View File

@ -10,19 +10,11 @@
#include "AppKit/NSOpenGLView.h" #include "AppKit/NSOpenGLView.h"
#include "AppKit/NSOpenGL.h" #include "AppKit/NSOpenGL.h"
class OpenGLWrapper namespace OpenGLWrapper
{ {
private: void swapBuffers(NSOpenGLView* pView);
void makeCurrent(NSOpenGLView* pView);
OpenGLWrapper(); void resetCurrent();
OpenGLWrapper(const OpenGLWrapper&); }
OpenGLWrapper& operator=(const OpenGLWrapper&);
public:
static void swapBuffers(NSOpenGLView* pView);
static void makeCurrent(NSOpenGLView* pView);
static void resetCurrent();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -202,9 +202,8 @@ public:
private: // data private: // data
static AquaSalFrame* s_pCaptureFrame; static AquaSalFrame* s_pCaptureFrame;
// make AquaSalFrame non copyable AquaSalFrame( const AquaSalFrame& ) SAL_DELETED_FUNCTION;
AquaSalFrame( const AquaSalFrame& ); AquaSalFrame& operator=(const AquaSalFrame&) SAL_DELETED_FUNCTION;
AquaSalFrame& operator=(const AquaSalFrame&);
}; };
#endif // INCLUDED_VCL_INC_OSX_SALFRAME_H #endif // INCLUDED_VCL_INC_OSX_SALFRAME_H

View File

@ -109,8 +109,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter
void setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation ); void setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation );
private: private:
AquaSalInfoPrinter( const AquaSalInfoPrinter& ); AquaSalInfoPrinter( const AquaSalInfoPrinter& ) SAL_DELETED_FUNCTION;
AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&); AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&) SAL_DELETED_FUNCTION;
}; };
// - AquaSalPrinter - // - AquaSalPrinter -
@ -143,8 +143,8 @@ class AquaSalPrinter : public SalPrinter
virtual sal_uLong GetErrorCode() SAL_OVERRIDE; virtual sal_uLong GetErrorCode() SAL_OVERRIDE;
private: private:
AquaSalPrinter( const AquaSalPrinter& ); AquaSalPrinter( const AquaSalPrinter& ) SAL_DELETED_FUNCTION;
AquaSalPrinter& operator=(const AquaSalPrinter&); AquaSalPrinter& operator=(const AquaSalPrinter&) SAL_DELETED_FUNCTION;
}; };
const double fPtTo100thMM = 35.27777778; const double fPtTo100thMM = 35.27777778;