From 4b5091cfd768360a7de3d416de670dfcdeb36990 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 18 May 2015 16:42:39 +0100 Subject: cppunit: noExplicitConstructor Change-Id: Iaf1387ea236bf3a5db9b2165d5b827dbdcf95207 --- basctl/source/basicide/basidesh.cxx | 9 ++++++--- basctl/source/basicide/bastype2.hxx | 8 ++++++-- basctl/source/basicide/breakpoint.hxx | 9 ++++++++- basctl/source/basicide/layout.hxx | 2 +- basctl/source/basicide/moduldl2.cxx | 12 +++++++++--- basctl/source/basicide/moduldlg.hxx | 8 ++++---- basctl/source/basicide/objdlg.hxx | 4 ++-- basctl/source/basicide/scriptdocument.cxx | 11 +++++++---- basctl/source/basicide/unomodel.hxx | 2 +- basegfx/source/workbench/convexhull.cxx | 2 +- basic/qa/cppunit/basictest.hxx | 9 +++++---- 11 files changed, 50 insertions(+), 26 deletions(-) diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index b427e2cbdf35..e337fdf8699f 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -68,11 +68,14 @@ class ContainerListenerImpl : public ContainerListenerBASE { Shell* mpShell; public: - - ContainerListenerImpl (Shell* pShell) : mpShell(pShell) { } + explicit ContainerListenerImpl(Shell* pShell) + : mpShell(pShell) + { + } virtual ~ContainerListenerImpl() - { } + { + } void addContainerListener( const ScriptDocument& rScriptDocument, const OUString& aLibName ) { diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx index bf270e28413a..c0f02b49e1cc 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/basicide/bastype2.hxx @@ -62,8 +62,12 @@ private: EntryType m_eType; public: - Entry (EntryType eType) : m_eType(eType) { } - virtual ~Entry (); + explicit Entry(EntryType eType) + : m_eType(eType) + { + } + + virtual ~Entry(); EntryType GetType () const { return m_eType; } }; diff --git a/basctl/source/basicide/breakpoint.hxx b/basctl/source/basicide/breakpoint.hxx index 847f073523fe..5d1981bcf165 100644 --- a/basctl/source/basicide/breakpoint.hxx +++ b/basctl/source/basicide/breakpoint.hxx @@ -38,7 +38,14 @@ struct BreakPoint size_t nStopAfter; size_t nHitCount; - BreakPoint(size_t nL) { nLine = nL; nStopAfter = 0; nHitCount = 0; bEnabled = true; bTemp = false; } + explicit BreakPoint(size_t nL) + : bEnabled(true) + , bTemp(false) + , nLine(nL) + , nStopAfter(0) + , nHitCount(0) + { + } }; class BreakPointList diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx index 51e2ffdf45f1..340086656e68 100644 --- a/basctl/source/basicide/layout.hxx +++ b/basctl/source/basicide/layout.hxx @@ -54,7 +54,7 @@ public: virtual void dispose() SAL_OVERRIDE; protected: - Layout (vcl::Window* pParent); + explicit Layout(vcl::Window* pParent); void AddToLeft (DockingWindow* pWin, Size const& rSize) { aLeftSide.Add(pWin, rSize); } void AddToBottom (DockingWindow* pWin, Size const& rSize) { aBottomSide.Add(pWin, rSize); } diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 012419c85023..b8f68eed3495 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -74,7 +74,10 @@ class DummyInteractionHandler : public HandlerImpl_BASE { Reference< task::XInteractionHandler2 > m_xHandler; public: - DummyInteractionHandler( const Reference< task::XInteractionHandler2 >& xHandler ) : m_xHandler( xHandler ){} + explicit DummyInteractionHandler(const Reference& xHandler) + : m_xHandler(xHandler) + { + } virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { @@ -94,7 +97,10 @@ private: ScriptDocument m_aDocument; public: - LibUserData (ScriptDocument const& rDocument) : m_aDocument(rDocument) { } + explicit LibUserData(ScriptDocument const& rDocument) + : m_aDocument(rDocument) + { + } virtual ~LibUserData() {}; const ScriptDocument& GetDocument() const { return m_aDocument; } @@ -1166,7 +1172,7 @@ class OLibCommandEnvironment : public LibCommandEnvironmentHelper Reference< task::XInteractionHandler > mxInteraction; public: - OLibCommandEnvironment( Reference< task::XInteractionHandler > xInteraction ) + explicit OLibCommandEnvironment(const Reference& xInteraction) : mxInteraction( xInteraction ) {} diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 5b590bdc4ab4..ac7c56468da5 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -70,7 +70,7 @@ class GotoLineDialog : public ModalDialog VclPtr m_pOKButton; DECL_LINK(OkButtonHandler, void *); public: - GotoLineDialog(vcl::Window * pParent); + explicit GotoLineDialog(vcl::Window * pParent); virtual ~GotoLineDialog(); virtual void dispose() SAL_OVERRIDE; sal_Int32 GetLineNumber() const; @@ -87,7 +87,7 @@ private: DECL_LINK(OkButtonHandler, void *); public: - ExportDialog( vcl::Window * pParent ); + explicit ExportDialog( vcl::Window * pParent ); virtual ~ExportDialog(); virtual void dispose() SAL_OVERRIDE; @@ -153,7 +153,7 @@ private: VclPtr< ::CheckBox> m_pReplaceBox; public: - LibDialog( vcl::Window* pParent ); + explicit LibDialog(vcl::Window* pParent); virtual ~LibDialog(); virtual void dispose() SAL_OVERRIDE; @@ -255,7 +255,7 @@ protected: VclPtr pTabDlg; public: - LibPage( vcl::Window* pParent ); + explicit LibPage(vcl::Window* pParent); virtual ~LibPage(); virtual void dispose() SAL_OVERRIDE; diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx index 1ce7389044c4..eee31c2201dc 100644 --- a/basctl/source/basicide/objdlg.hxx +++ b/basctl/source/basicide/objdlg.hxx @@ -35,8 +35,8 @@ namespace basctl class ObjectCatalog : public DockingWindow { public: - ObjectCatalog (vcl::Window* pParent); - virtual ~ObjectCatalog (); + explicit ObjectCatalog(vcl::Window* pParent); + virtual ~ObjectCatalog(); virtual void dispose() SAL_OVERRIDE; public: void UpdateEntries () { aTree->UpdateEntries(); } diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index f777ad94c0d8..b318aa932ca7 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -123,7 +123,10 @@ namespace basctl class FilterDocuments : public docs::IDocumentDescriptorFilter { public: - FilterDocuments( bool _bFilterInvisible ) : m_bFilterInvisible( _bFilterInvisible ) { } + explicit FilterDocuments(bool _bFilterInvisible) + : m_bFilterInvisible(_bFilterInvisible) + { + } virtual ~FilterDocuments() {} @@ -193,8 +196,8 @@ namespace basctl public: Impl (); - Impl (Reference const& rxDocument); - virtual ~Impl (); + explicit Impl(Reference const& rxDocument); + virtual ~Impl(); /** determines whether the instance refers to a valid "document" with script and dialog libraries @@ -1128,7 +1131,7 @@ namespace basctl { struct DocumentTitleLess : public ::std::binary_function< ScriptDocument, ScriptDocument, bool > { - DocumentTitleLess( const CollatorWrapper& _rCollator ) + explicit DocumentTitleLess( const CollatorWrapper& _rCollator ) :m_aCollator( _rCollator ) { } diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index acd21ac62e3d..cd614e5515b0 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -30,7 +30,7 @@ class SIDEModel : public SfxBaseModel, { static void notImplemented() throw ( ::com::sun::star::io::IOException ); public: - SIDEModel( SfxObjectShell *pObjSh = 0 ); + explicit SIDEModel(SfxObjectShell *pObjSh = 0); virtual ~SIDEModel(); //XInterface diff --git a/basegfx/source/workbench/convexhull.cxx b/basegfx/source/workbench/convexhull.cxx index 5c40efda2929..e94c2d76045a 100644 --- a/basegfx/source/workbench/convexhull.cxx +++ b/basegfx/source/workbench/convexhull.cxx @@ -46,7 +46,7 @@ template double theta( const PointType& p1, const PointType& p template class ThetaCompare : public ::std::binary_function< const PointType&, const PointType&, bool > { public: - ThetaCompare( const PointType& rRefPoint ) : maRefPoint( rRefPoint ) {} + explicit ThetaCompare( const PointType& rRefPoint ) : maRefPoint( rRefPoint ) {} bool operator() ( const PointType& p1, const PointType& p2 ) { diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx index c866de077559..0d9c37898d8b 100644 --- a/basic/qa/cppunit/basictest.hxx +++ b/basic/qa/cppunit/basictest.hxx @@ -46,17 +46,18 @@ class MacroSnippet int nLine; int nCol; ErrorDetail() : nLine(0), nCol(0) {} - }; + } - MacroSnippet( const OUString& sSource ) : mbError(false) + explicit MacroSnippet(const OUString& sSource) + : mbError(false) { InitSnippet(); MakeModule( sSource ); - }; + } MacroSnippet() : mbError(false) { InitSnippet(); - }; + } void LoadSourceFromFile( const OUString& sMacroFileURL ) { OUString sSource; -- cgit