diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-04-12 16:38:26 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-12 20:33:06 +0200 |
commit | 1453c2c8f13bac64ecd1981af7cebf1c421808ac (patch) | |
tree | 7246d310899dea0c499cfe04addcb57e4776a4d0 /vcl/unx | |
parent | f7d8e3318044bb70647424a1eea354bc59e4ced5 (diff) |
prefer vector::data to &vector[0]
probably missed loads more
Change-Id: I53c9fe188055ef925fed54500e64b837cd56a1e7
Reviewed-on: https://gerrit.libreoffice.org/70676
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/gdiimpl.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/print/glyphset.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 21aa4d768d1b..7c6f40641887 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -1121,7 +1121,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont, for (int i = 0; i < nGlyphs; i++) aGlyphIds[i] = sal_uInt16(i); std::unique_ptr<sal_uInt16[]> pMetrics = GetTTSimpleGlyphMetrics(pTTFont, - &aGlyphIds[0], + aGlyphIds.data(), nGlyphs, bVertical); if (pMetrics) diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 6238a875536a..48a6a767e86b 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -1489,7 +1489,7 @@ bool X11SalGraphicsImpl::drawPolyPolygon( const int nTrapCount = aB2DTrapVector.size(); if( !nTrapCount ) return true; - const bool bDrawn = drawFilledTrapezoids( &aB2DTrapVector[0], nTrapCount, fTransparency ); + const bool bDrawn = drawFilledTrapezoids( aB2DTrapVector.data(), nTrapCount, fTransparency ); return bDrawn; } @@ -1565,7 +1565,7 @@ bool X11SalGraphicsImpl::drawFilledTrapezoids( const basegfx::B2DTrapezoid* pB2D // render the trapezoids const XRenderPictFormat* pMaskFormat = rRenderPeer.GetStandardFormatA8(); rRenderPeer.CompositeTrapezoids( PictOpOver, - rEntry.m_aPicture, aDstPic, pMaskFormat, 0, 0, &aTrapVector[0], aTrapVector.size() ); + rEntry.m_aPicture, aDstPic, pMaskFormat, 0, 0, aTrapVector.data(), aTrapVector.size() ); return true; } @@ -1639,7 +1639,7 @@ bool X11SalGraphicsImpl::drawFilledTriangles( // render the trapezoids const XRenderPictFormat* pMaskFormat = rRenderPeer.GetStandardFormatA8(); rRenderPeer.CompositeTriangles( PictOpOver, - rEntry.m_aPicture, aDstPic, pMaskFormat, 0, 0, &aTriVector[0], aTriVector.size() ); + rEntry.m_aPicture, aDstPic, pMaskFormat, 0, 0, aTriVector.data(), aTriVector.size() ); return true; } diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx index 0f259ab5b669..522bb06f99c6 100644 --- a/vcl/unx/generic/print/glyphset.cxx +++ b/vcl/unx/generic/print/glyphset.cxx @@ -233,7 +233,7 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile, aInfo.LoadFont( pSrcFont ); aInfo.CreateFontSubset( nTargetMask, pTmpFile, pGlyphSetName, - &aRequestedGlyphs[0], &aEncoding[0], nGlyphCount ); + &aRequestedGlyphs[0], aEncoding.data(), nGlyphCount ); } void diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 9cacc0a886b0..b18fc5cecce2 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2922,7 +2922,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) SalExtTextInputEvent aEv; aEv.maText = rSeq; - aEv.mpTextAttr = &attribs[0]; + aEv.mpTextAttr = attribs.data(); aEv.mnCursorPos = 0; aEv.mnCursorFlags = 0; diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index cc95a9f94e51..ebb35874bfef 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -3137,7 +3137,7 @@ void GtkSalFrame::IMHandler::endExtTextInput( EndExtTextInputFlags /*nFlags*/ ) if( ! aDel.isDeleted() ) { // mark previous preedit state again (will e.g. be sent at focus gain) - m_aInputEvent.mpTextAttr = &m_aInputFlags[0]; + m_aInputEvent.mpTextAttr = m_aInputFlags.data(); if( m_bFocused ) { // begin preedit again @@ -3453,7 +3453,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ } while (pango_attr_iterator_next (iter)); pango_attr_iterator_destroy(iter); - pThis->m_aInputEvent.mpTextAttr = &pThis->m_aInputFlags[0]; + pThis->m_aInputEvent.mpTextAttr = pThis->m_aInputFlags.data(); g_free( pText ); pango_attr_list_unref( pAttrs ); diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 687f69f440f2..33f5f08c1f17 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -3712,7 +3712,7 @@ void GtkSalFrame::IMHandler::endExtTextInput( EndExtTextInputFlags /*nFlags*/ ) if( ! aDel.isDeleted() ) { // mark previous preedit state again (will e.g. be sent at focus gain) - m_aInputEvent.mpTextAttr = &m_aInputFlags[0]; + m_aInputEvent.mpTextAttr = m_aInputFlags.data(); if( m_bFocused ) { // begin preedit again @@ -4019,7 +4019,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ } while (pango_attr_iterator_next (iter)); pango_attr_iterator_destroy(iter); - pThis->m_aInputEvent.mpTextAttr = &pThis->m_aInputFlags[0]; + pThis->m_aInputEvent.mpTextAttr = pThis->m_aInputFlags.data(); g_free( pText ); pango_attr_list_unref( pAttrs ); |