diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-13 16:44:19 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-14 08:29:45 +0200 |
commit | c856ae17aff5db258eb16713f56fce9f28400d47 (patch) | |
tree | 5a02c77626257837c465212e1345c65334c72e37 /vcl/unx | |
parent | 2d2259c848b43f9f04d5bb6073c00b8ae124534a (diff) |
clang-tidy modernize-use-emplace in vcl
Change-Id: Ie0a6d105b0167431275e628935df4f4c1a36d070
Reviewed-on: https://gerrit.libreoffice.org/42259
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/app/gendisp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldata.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/print/common_gfx.cxx | 18 | ||||
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/print/text_gfx.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksys.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/salprn-gtk.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 2 |
12 files changed, 22 insertions, 22 deletions
diff --git a/vcl/unx/generic/app/gendisp.cxx b/vcl/unx/generic/app/gendisp.cxx index c1cd5a23112e..edaf0e6ffb95 100644 --- a/vcl/unx/generic/app/gendisp.cxx +++ b/vcl/unx/generic/app/gendisp.cxx @@ -92,7 +92,7 @@ void SalGenericDisplay::SendInternalEvent( SalFrame* pFrame, void* pData, SalEve { osl::MutexGuard g( m_aEventGuard ); - m_aUserEvents.push_back( SalUserEvent( pFrame, pData, nEvent ) ); + m_aUserEvents.emplace_back( pFrame, pData, nEvent ); PostUserEvent(); // wakeup the concrete mainloop } diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index fb5131473e5a..e753184b0bef 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -305,7 +305,7 @@ bool X11SalData::ErrorTrapPop( bool bIgnoreError ) void X11SalData::PushXErrorLevel( bool bIgnore ) { - m_aXErrorHandlerStack.push_back( XErrorStackEntry() ); + m_aXErrorHandlerStack.emplace_back( ); XErrorStackEntry& rEnt = m_aXErrorHandlerStack.back(); rEnt.m_bWas = false; rEnt.m_bIgnore = bIgnore; diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index b73c5046a3d2..d6958f9c407a 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -2281,7 +2281,7 @@ void SalDisplay::addXineramaScreenUnique( int i, long i_nX, long i_nY, long i_nW } } m_aXineramaScreenIndexMap[i] = m_aXineramaScreens.size(); - m_aXineramaScreens.push_back( tools::Rectangle( Point( i_nX, i_nY ), Size( i_nWidth, i_nHeight ) ) ); + m_aXineramaScreens.emplace_back( Point( i_nX, i_nY ), Size( i_nWidth, i_nHeight ) ); } void SalDisplay::InitXinerama() diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 65e5be8c244e..37f45aeac71c 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -342,7 +342,7 @@ FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern const * pPattern, if (FcPatternGetString( pPattern, elementlangtype, 0, &elementlang ) == FcResultMatch) { std::vector< lang_and_element > lang_and_elements; - lang_and_elements.push_back(lang_and_element(elementlang, *element)); + lang_and_elements.emplace_back(elementlang, *element); int k = 1; while (true) { @@ -350,7 +350,7 @@ FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern const * pPattern, break; if (FcPatternGetString( pPattern, elementtype, k, element ) != FcResultMatch) break; - lang_and_elements.push_back(lang_and_element(elementlang, *element)); + lang_and_elements.emplace_back(elementlang, *element); ++k; } diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx index 9b9f5dd8abb8..6fee6f53b485 100644 --- a/vcl/unx/generic/print/common_gfx.cxx +++ b/vcl/unx/generic/print/common_gfx.cxx @@ -103,7 +103,7 @@ PrinterGfx::PrinterGfx() maVirtualStatus.mnTextHeight = 12; maVirtualStatus.mnTextWidth = 0; - maGraphicsStack.push_back( GraphicsStatus() ); + maGraphicsStack.emplace_back( ); } PrinterGfx::~PrinterGfx() @@ -131,7 +131,7 @@ PrinterGfx::Clear() maClipRegion.clear(); maGraphicsStack.clear(); - maGraphicsStack.push_back( GraphicsStatus() ); + maGraphicsStack.emplace_back( ); } /* @@ -156,7 +156,7 @@ void PrinterGfx::UnionClipRegion (sal_Int32 nX,sal_Int32 nY,sal_Int32 nDX,sal_Int32 nDY) { if( nDX && nDY ) - maClipRegion.push_back (tools::Rectangle(Point(nX,nY ), Size(nDX,nDY))); + maClipRegion.emplace_back(Point(nX,nY ), Size(nDX,nDY)); } bool @@ -171,8 +171,8 @@ PrinterGfx::JoinVerticalClipRectangles( std::list< tools::Rectangle >::iterator& std::list< Point > leftside, rightside; tools::Rectangle aLastRect( *it ); - leftside.push_back( Point( it->Left(), it->Top() ) ); - rightside.push_back( Point( it->Right()+1, it->Top() ) ); + leftside.emplace_back( it->Left(), it->Top() ); + rightside.emplace_back( it->Right()+1, it->Top() ); while( nextit != maClipRegion.end() ) { tempit = nextit; @@ -192,8 +192,8 @@ PrinterGfx::JoinVerticalClipRectangles( std::list< tools::Rectangle >::iterator& std::abs( aLastRect.Right() - nextit->Right() ) > 2 ) { - leftside.push_back( Point( aLastRect.Left(), aLastRect.Bottom()+1 ) ); - rightside.push_back( Point( aLastRect.Right()+1, aLastRect.Bottom()+1 ) ); + leftside.emplace_back( aLastRect.Left(), aLastRect.Bottom()+1 ); + rightside.emplace_back( aLastRect.Right()+1, aLastRect.Bottom()+1 ); } aLastRect = *nextit; leftside.push_back( aLastRect.TopLeft() ); @@ -206,8 +206,8 @@ PrinterGfx::JoinVerticalClipRectangles( std::list< tools::Rectangle >::iterator& if( leftside.size() > 1 ) { // push the last coordinates - leftside.push_back( Point( aLastRect.Left(), aLastRect.Bottom()+1 ) ); - rightside.push_back( Point( aLastRect.Right()+1, aLastRect.Bottom()+1 ) ); + leftside.emplace_back( aLastRect.Left(), aLastRect.Bottom()+1 ); + rightside.emplace_back( aLastRect.Right()+1, aLastRect.Bottom()+1 ); // cool, we can concatenate rectangles const int nDX = -65536, nDY = 65536; diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 20b6d1484c01..8adcd655c762 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -1119,7 +1119,7 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo } // save current file and paper format aLastParm = aNewParm; - aPDFFiles.push_back( PDFPrintFile( aPDFUrl, aNewParm ) ); + aPDFFiles.emplace_back( aPDFUrl, aNewParm ); // update context aContext.URL = aPDFUrl; diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx index bbb8adede54f..24747ae119db 100644 --- a/vcl/unx/generic/print/text_gfx.cxx +++ b/vcl/unx/generic/print/text_gfx.cxx @@ -78,7 +78,7 @@ void PrinterGfx::drawGlyph(const Point& rPoint, // not found ? create a new one if (aIter == maPS3Font.end()) { - maPS3Font.push_back (GlyphSet(mnFontID, mbTextVertical)); + maPS3Font.emplace_back(mnFontID, mbTextVertical); maPS3Font.back().DrawGlyph (*this, rPoint, aGlyphId, nDelta); } } diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 0f0a64e707b4..842f11deea22 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -1093,7 +1093,7 @@ static void standardSysQueueTokenHandler( // do not insert duplicates (e.g. lpstat tends to produce such lines) if( aUniqueSet.find( aSysQueue ) == aUniqueSet.end() ) { - o_rQueues.push_back( PrinterInfoManager::SystemPrintQueue() ); + o_rQueues.emplace_back( ); o_rQueues.back().m_aQueue = aSysQueue; o_rQueues.back().m_aLocation = aSysQueue; aUniqueSet.insert( aSysQueue ); @@ -1138,7 +1138,7 @@ void SystemQueueInfo::run() if( (pPipe = popen( aCmdLine.getStr(), "r" )) ) { while( fgets( pBuffer, 1024, pPipe ) ) - aLines.push_back( OString( pBuffer ) ); + aLines.emplace_back( pBuffer ); if( ! pclose( pPipe ) ) { std::vector< PrinterInfoManager::SystemPrintQueue > aSysPrintQueues; diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 8bd532eea78c..789556a7f76f 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -3432,7 +3432,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent ) // event has a matching key press event in this list, we swallow // the key release because some GTK Input Methods don't swallow it // for us. - m_aPrevKeyPresses.push_back( PreviousKeyPress(pEvent) ); + m_aPrevKeyPresses.emplace_back(pEvent ); m_nPrevKeyPresses++; // Also pop off the earliest key press event if there are more than 10 diff --git a/vcl/unx/gtk/gtksys.cxx b/vcl/unx/gtk/gtksys.cxx index 7e46498e6461..d01eaa1f6873 100644 --- a/vcl/unx/gtk/gtksys.cxx +++ b/vcl/unx/gtk/gtksys.cxx @@ -119,7 +119,7 @@ GtkSalSystem::countScreenMonitors() GdkRectangleCoincident())); nMonitors = std::distance(aGeometries.begin(), aUniqueEnd); } - maScreenMonitors.push_back(std::make_pair(pScreen, nMonitors)); + maScreenMonitors.emplace_back(pScreen, nMonitors); } } diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx index 09c26aab4aab..a60a68e50843 100644 --- a/vcl/unx/gtk/salprn-gtk.cxx +++ b/vcl/unx/gtk/salprn-gtk.cxx @@ -537,7 +537,7 @@ GtkPrintDialog::impl_initCustomTab() lcl_setHelpText(pCurTabPage, aHelpTexts, 0); pCurParent = pCurTabPage; - aCustomTabs.push_back(std::make_pair(pCurTabPage, aText)); + aCustomTabs.emplace_back(pCurTabPage, aText); } else if (aCtrlType == "Subgroup") { diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 11d6c8cffed8..39be49496f06 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -3748,7 +3748,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent ) // event has a matching key press event in this list, we swallow // the key release because some GTK Input Methods don't swallow it // for us. - m_aPrevKeyPresses.push_back( PreviousKeyPress(pEvent) ); + m_aPrevKeyPresses.emplace_back(pEvent ); m_nPrevKeyPresses++; // Also pop off the earliest key press event if there are more than 10 |