diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-12 15:12:39 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-12 16:12:18 +0200 |
commit | 240974561685ff44c1abf5157a043d0fde4654d1 (patch) | |
tree | 26f2bca7a3c1e34c4656906ae6d7e5cad260623a /vcl | |
parent | 1334ee97787aa7cea399fa7f1633aea84ff8047d (diff) |
loplugin:simplifyconstruct in ucbhelper..vcl
Change-Id: Id435bb3289dcfd9a7aeca6a661e249085958cb7c
Reviewed-on: https://gerrit.libreoffice.org/60392
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
33 files changed, 16 insertions, 77 deletions
diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx index 37bb2fafabba..fddd371d8a2e 100644 --- a/vcl/inc/controldata.hxx +++ b/vcl/inc/controldata.hxx @@ -29,12 +29,6 @@ namespace vcl { mutable std::unique_ptr<ControlLayoutData> mpLayoutData; VclPtr<OutputDevice> mpReferenceDevice; - - ImplControlData() - :mpLayoutData( nullptr ) - ,mpReferenceDevice( nullptr ) - { - } }; } // namespace vcl diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 7d31e3753f46..d97c0fee128e 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -29,7 +29,6 @@ class VCL_DLLPUBLIC SvpSalBitmap : public SalBitmap { std::unique_ptr<BitmapBuffer> mpDIB; public: - SvpSalBitmap() : mpDIB(nullptr) {} virtual ~SvpSalBitmap() override; // SalBitmap diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 9fff1d50cc13..4c966bd408ef 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -69,8 +69,7 @@ public: }; OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent, SalGeometryProvider *pProvider) - : mpContext(nullptr) - , mrParent(rParent) + : mrParent(rParent) , mpProvider(pProvider) , mpProgram(nullptr) , mpFlush(new OpenGLFlushIdle(this)) diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 6349df729ffb..5f1f309e21d4 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -127,7 +127,6 @@ struct Impl_IMEInfos Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos) : aOldTextAfterStartPos(rOldTextAfterStartPos), - pAttribs(nullptr), nPos(nP), nLen(0), bCursor(true), diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index edf0df728ba0..8ffa935e9141 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -115,7 +115,6 @@ OString MenuButton::GetCurItemIdent() const MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits ) : PushButton(WindowType::MENUBUTTON) - , mpMenuTimer(nullptr) , mnCurItemId(0) , mbDelayMenu(false) { diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index d3ebd1ae618c..9d02a83bc9c0 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -65,13 +65,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; TextEngine::TextEngine() - : mpDoc {nullptr} - , mpTEParaPortions {nullptr} - , mpViews {nullptr} - , mpActiveView {nullptr} - , mpUndoManager {nullptr} - , mpIdleFormatter {nullptr} - , mpLocaleDataWrapper {nullptr} + : mpActiveView {nullptr} , maTextColor {COL_BLACK} , mnMaxTextLen {0} , mnMaxTextWidth {0} diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index fac71cecaf1c..b02e77c9b6a3 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1070,8 +1070,7 @@ ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter(const OUString& rFilterPath namespace { struct Cache : public rtl::Static<ImpFilterLibCache, Cache> {}; } GraphicFilter::GraphicFilter( bool bConfig ) - : pErrorEx(nullptr) - , bUseConfig(bConfig) + : bUseConfig(bConfig) { ImplInit(); } diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index a495c9391f21..b58ce8503e14 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -63,7 +63,6 @@ PhysicalFontCollection::PhysicalFontCollection() : mbMatchData( false ) , mpPreMatchHook( nullptr ) , mpFallbackHook( nullptr ) - , mpFallbackList( nullptr ) , mnFallbackCount( -1 ) {} diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index f7d39099d624..5a733c8dd9f2 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1056,7 +1056,6 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) MetaTextArrayAction::MetaTextArrayAction() : MetaAction ( MetaActionType::TEXTARRAY ), - mpDXAry ( nullptr ), mnIndex ( 0 ), mnLen ( 0 ) {} diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index acafb54f587e..79c55efbc6a5 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -260,8 +260,7 @@ public: ReferenceXObjectEmit m_aReferenceXObject; JPGEmit() - : m_pStream(nullptr) - , m_nObject(0) + : m_nObject(0) , m_bTrueColor(false) { } diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 908dc4c3d460..befdfcf4bba6 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -183,9 +183,6 @@ public: PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream ) : mrPNGStream( rPNGStream ), mpMaskAcc ( nullptr ), - mpInflateInBuf ( nullptr ), - mpScanPrior ( nullptr ), - mpTransTab ( nullptr ), mpScanCurrent ( nullptr ), mpColorTable ( const_cast<sal_uInt8*>(mpDefaultColorTable) ), mnChunkType ( 0 ), @@ -217,13 +214,11 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream ) mbIDATComplete( false ), mbpHYs ( false ), mbIgnoreGammaChunk ( false ), - mbIgnoreCRC( utl::ConfigManager::IsFuzzing() ), + mbIgnoreCRC( utl::ConfigManager::IsFuzzing() ) #if OSL_DEBUG_LEVEL > 0 - mnAllocSizeScanline(0), - mnAllocSizeScanlineAlpha(0), + ,mnAllocSizeScanline(0), + mnAllocSizeScanlineAlpha(0) #endif - mpScanline(nullptr), - mpScanlineAlpha(nullptr) { // prepare the PNG data stream mnOrigStreamMode = mrPNGStream.GetEndian(); diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index d40e68a137b0..b9fd9988c9bc 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -103,9 +103,6 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, , mnMaxChunkSize(0) , mbStatus(true) , mpMaskAccess(nullptr) - , mpDeflateInBuf(nullptr) - , mpPreviousScan(nullptr) - , mpCurrentScan(nullptr) , mnDeflateInSize(0) , mnWidth(0) , mnHeight(0) diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx index 3beb9b8aab4e..662c2505553d 100644 --- a/vcl/source/gdi/vectorgraphicdata.cxx +++ b/vcl/source/gdi/vectorgraphicdata.cxx @@ -230,8 +230,7 @@ VectorGraphicData::VectorGraphicData( maSequence(), maReplacement(), mNestedBitmapSize(0), - meVectorGraphicDataType(eVectorDataType), - mpExternalHeader(nullptr) + meVectorGraphicDataType(eVectorDataType) { } @@ -245,8 +244,7 @@ VectorGraphicData::VectorGraphicData( maSequence(), maReplacement(), mNestedBitmapSize(0), - meVectorGraphicDataType(eVectorDataType), - mpExternalHeader(nullptr) + meVectorGraphicDataType(eVectorDataType) { SvFileStream rIStm(rPath, StreamMode::STD_READ); if(rIStm.GetError()) diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx index 757ae1fc03e2..8d11aada14fd 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -33,8 +33,6 @@ OutDevState::OutDevState() : mbMapActive(false) - , mpClipRegion(nullptr) - , mpFont(nullptr) , meTextAlign(ALIGN_TOP) , meRasterOp(RasterOp::OverPaint) , mnTextLayoutMode(ComplexTextLayoutFlags::Default) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 4403140df3f6..ed3016ad64d2 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -1442,7 +1442,6 @@ void Dialog::set_default_response(int response) } VclBuilderContainer::VclBuilderContainer() - : m_pUIBuilder(nullptr) { } diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 86a7140cce43..77aca029ca29 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -157,7 +157,6 @@ FloatingWindow::FloatingWindow(vcl::Window* pParent, const OString& rID, const O : SystemWindow(WindowType::FLOATINGWINDOW) , mpNextFloat(nullptr) , mpFirstPopupModeWin(nullptr) - , mpImplData(nullptr) , mnPostId(nullptr) , mnPopupModeFlags(FloatWinPopupFlags::NONE) , mnTitle(FloatWinTitleType::Unknown) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 255a315f3755..1fc1ca4b991f 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -183,9 +183,7 @@ Menu::Menu() nTextPos(0), bCanceled(false), bInCallback(false), - bKilled(false), - mpLayoutData(nullptr), - mpSalMenu(nullptr) + bKilled(false) { } diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 67bc756b30da..70c0f6f528a8 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -211,7 +211,6 @@ public: PaintHelper::PaintHelper(vcl::Window *pWindow, ImplPaintFlags nPaintFlags) : m_pWindow(pWindow) - , m_pChildRegion(nullptr) , m_nPaintFlags(nPaintFlags) , m_bPop(false) , m_bRestoreCursor(false) diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index f8f566e96f39..9be367442e21 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -645,7 +645,6 @@ namespace { PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterController>& i_rController ) : ModalDialog(i_pParent, "PrintDialog", "vcl/ui/printdialog.ui") - , mpCustomOptionsUIBuilder(nullptr) , maPController( i_rController ) , maNUpPage(m_pUIBuilder.get()) , maJobPage(m_pUIBuilder.get()) diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 2674bf7199cf..18da9e6e432c 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -106,7 +106,6 @@ ImplSplitItem::ImplSplitItem() , mnOldSplitSize(0) , mnOldWidth(0) , mnOldHeight(0) - , mpSet(nullptr) , mnId(0) , mnBits(SplitWindowItemFlags::NONE) , mbFixed(false) @@ -117,7 +116,6 @@ ImplSplitItem::ImplSplitItem() } ImplSplitSet::ImplSplitSet() : - mpWallpaper( nullptr ), mnLastSize( 0 ), mnSplitSize( SPLITWIN_SPLITSIZE ), mnId( 0 ), diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 0a28da840392..c6ebf3916303 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -44,8 +44,7 @@ using namespace vcl; #define TB_SEP_SIZE 8 // Separator size -ImplToolBoxPrivateData::ImplToolBoxPrivateData() : - m_pLayoutData( nullptr ) +ImplToolBoxPrivateData::ImplToolBoxPrivateData() { meButtonSize = ToolBoxButtonSize::DontCare; mpMenu = VclPtr<PopupMenu>::Create(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index c6d2fea5c614..7675cf9ae221 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -751,10 +751,8 @@ WindowImpl::~WindowImpl() } ImplWinData::ImplWinData() : - mpExtOldAttrAry(nullptr), mnCursorExtWidth(0), mbVertical(false), - mpCompositionCharRects(nullptr), mnCompositionCharRects(0), mnTrackFlags(ShowTrackFlags::NONE), mnIsTopWindow(sal_uInt16(~0)), // not initialized yet, 0/1 will indicate TopWindow (see IsTopWindow()) diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index ddce3f81da27..9d87117db531 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -283,7 +283,6 @@ SalDisplay::SalDisplay( Display *display ) : nShiftKeySym_( 0 ), nCtrlKeySym_( 0 ), nMod1KeySym_( 0 ), - m_pWMAdaptor( nullptr ), m_bXinerama( false ), m_bUseRandRWrapper( true ), m_nLastUserEventTime( CurrentTime ) diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 3c49bb9d00b5..ca40710aa0bd 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -93,9 +93,7 @@ private: }; FontCfgWrapper::FontCfgWrapper() - : - m_pOutlineSet( nullptr ), - m_pLanguageTag( nullptr ) + : m_pOutlineSet( nullptr ) { FcInit(); } diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index e301ab701d2b..ab7c274d58a9 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -112,7 +112,7 @@ PrintFontManager::PrintFont::PrintFont() } GenericUnixSalData::GenericUnixSalData(GenericUnixSalDataType const t, SalInstance *const pInstance) - : m_eType(t), m_pDisplay(nullptr), m_pPrintFontManager(nullptr) + : m_eType(t) { m_pInstance = pInstance; SetSalData(this); } diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 5dcfcef19974..a99dba3e77f2 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -65,9 +65,7 @@ ImplSalBitmapCache* X11SalBitmap::mpCache = nullptr; sal_uLong X11SalBitmap::mnCacheInstCount = 0; X11SalBitmap::X11SalBitmap() - : mpDIB( nullptr ) - , mpDDB( nullptr ) - , mbGrey( false ) + : mbGrey( false ) { } diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 1d6d5bf657ac..c6eff6d45304 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -72,7 +72,6 @@ X11SalGraphics::X11SalGraphics(): m_pFrame(nullptr), m_pVDev(nullptr), m_pColormap(nullptr), - m_pDeleteColormap(nullptr), hDrawable_(None), m_nXScreen( 0 ), m_pXRenderFormat(nullptr), diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 69da74515515..6fb0c7e8b21d 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -174,8 +174,7 @@ FreetypeFontInfo::FreetypeFontInfo( const FontAttributes& rDevFontAttributes, mnFaceNum( nFaceNum ), mnRefCount( 0 ), mnFontId( nFontId ), - maDevFontAttributes( rDevFontAttributes ), - mxFontCharMap( nullptr ) + maDevFontAttributes( rDevFontAttributes ) { // prefer font with low ID maDevFontAttributes.IncreaseQualityBy( 10000 - nFontId ); diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 45ce18e4a09d..19d38d65341d 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -459,7 +459,6 @@ OUString SalGenericInstance::GetDefaultPrinter() } PspSalInfoPrinter::PspSalInfoPrinter() - : m_pGraphics( nullptr ) { } diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index dd259fdf3e8b..8b01494ddb44 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -241,9 +241,6 @@ namespace psp public: std::vector< std::unique_ptr<PPDParser> > aAllParsers; std::unique_ptr<std::unordered_map< OUString, OUString >> pAllPPDFiles; - PPDCache() - : pAllPPDFiles(nullptr) - {} }; } @@ -276,9 +273,7 @@ public: const OUString& GetFileName() const { return maFileName; } }; -PPDDecompressStream::PPDDecompressStream( const OUString& i_rFile ) : - mpFileStream( nullptr ), - mpMemStream( nullptr ) +PPDDecompressStream::PPDDecompressStream( const OUString& i_rFile ) { Open( i_rFile ); } diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index a750f6fcb4f7..127bbf1b3670 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -107,7 +107,6 @@ void PrinterInfoManager::release() } PrinterInfoManager::PrinterInfoManager( Type eType ) : - m_pQueueInfo( nullptr ), m_eType( eType ), m_bUseIncludeFeature( false ), m_bUseJobPatch( true ), diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index b63e4ac235ad..c3f9b25d677b 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -450,7 +450,6 @@ bool GtkSalFrame::doKeyCallback( guint state, GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) : m_nXScreen( getDisplay()->GetDefaultXScreen() ) - , m_pGraphics(nullptr) , m_bGraphics(false) { getDisplay()->registerFrame( this ); @@ -462,7 +461,6 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) GtkSalFrame::GtkSalFrame( SystemParentData* pSysData ) : m_nXScreen( getDisplay()->GetDefaultXScreen() ) - , m_pGraphics(nullptr) , m_bGraphics(false) { getDisplay()->registerFrame( this ); diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 17659c3744fc..1f36f039a58c 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -488,7 +488,6 @@ bool GtkSalFrame::doKeyCallback( guint state, GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) : m_nXScreen( getDisplay()->GetDefaultXScreen() ) , m_pHeaderBar(nullptr) - , m_pGraphics(nullptr) , m_bGraphics(false) { getDisplay()->registerFrame( this ); @@ -501,7 +500,6 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) GtkSalFrame::GtkSalFrame( SystemParentData* pSysData ) : m_nXScreen( getDisplay()->GetDefaultXScreen() ) , m_pHeaderBar(nullptr) - , m_pGraphics(nullptr) , m_bGraphics(false) { getDisplay()->registerFrame( this ); |