summaryrefslogtreecommitdiff
path: root/vcl/source/window/builder.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-13 16:44:19 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-09-14 08:29:45 +0200
commitc856ae17aff5db258eb16713f56fce9f28400d47 (patch)
tree5a02c77626257837c465212e1345c65334c72e37 /vcl/source/window/builder.cxx
parent2d2259c848b43f9f04d5bb6073c00b8ae124534a (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/source/window/builder.cxx')
-rw-r--r--vcl/source/window/builder.cxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 693e1771eaa2..d9501548a843 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -948,7 +948,7 @@ bool VclBuilder::extractGroup(const OString &id, stringmap &rMap)
sal_Int32 nDelim = sID.indexOf(':');
if (nDelim != -1)
sID = sID.copy(0, nDelim);
- m_pParserState->m_aGroupMaps.push_back(RadioButtonGroupMap(id, sID.toUtf8()));
+ m_pParserState->m_aGroupMaps.emplace_back(id, sID.toUtf8());
rMap.erase(aFind);
return true;
}
@@ -958,19 +958,19 @@ bool VclBuilder::extractGroup(const OString &id, stringmap &rMap)
void VclBuilder::connectNumericFormatterAdjustment(const OString &id, const OUString &rAdjustment)
{
if (!rAdjustment.isEmpty())
- m_pParserState->m_aNumericFormatterAdjustmentMaps.push_back(WidgetAdjustmentMap(id, rAdjustment));
+ m_pParserState->m_aNumericFormatterAdjustmentMaps.emplace_back(id, rAdjustment);
}
void VclBuilder::connectTimeFormatterAdjustment(const OString &id, const OUString &rAdjustment)
{
if (!rAdjustment.isEmpty())
- m_pParserState->m_aTimeFormatterAdjustmentMaps.push_back(WidgetAdjustmentMap(id, rAdjustment));
+ m_pParserState->m_aTimeFormatterAdjustmentMaps.emplace_back(id, rAdjustment);
}
void VclBuilder::connectDateFormatterAdjustment(const OString &id, const OUString &rAdjustment)
{
if (!rAdjustment.isEmpty())
- m_pParserState->m_aDateFormatterAdjustmentMaps.push_back(WidgetAdjustmentMap(id, rAdjustment));
+ m_pParserState->m_aDateFormatterAdjustmentMaps.emplace_back(id, rAdjustment);
}
bool VclBuilder::extractAdjustmentToMap(const OString& id, VclBuilder::stringmap& rMap, std::vector<WidgetAdjustmentMap>& rAdjustmentMap)
@@ -978,7 +978,7 @@ bool VclBuilder::extractAdjustmentToMap(const OString& id, VclBuilder::stringmap
VclBuilder::stringmap::iterator aFind = rMap.find(OString("adjustment"));
if (aFind != rMap.end())
{
- rAdjustmentMap.push_back(WidgetAdjustmentMap(id, aFind->second));
+ rAdjustmentMap.emplace_back(id, aFind->second);
rMap.erase(aFind);
return true;
}
@@ -1030,8 +1030,8 @@ bool VclBuilder::extractModel(const OString &id, stringmap &rMap)
VclBuilder::stringmap::iterator aFind = rMap.find(OString("model"));
if (aFind != rMap.end())
{
- m_pParserState->m_aModelMaps.push_back(ComboBoxModelMap(id, aFind->second,
- extractActive(rMap)));
+ m_pParserState->m_aModelMaps.emplace_back(id, aFind->second,
+ extractActive(rMap));
rMap.erase(aFind);
return true;
}
@@ -1043,7 +1043,7 @@ bool VclBuilder::extractBuffer(const OString &id, stringmap &rMap)
VclBuilder::stringmap::iterator aFind = rMap.find(OString("buffer"));
if (aFind != rMap.end())
{
- m_pParserState->m_aTextBufferMaps.push_back(TextBufferMap(id, aFind->second));
+ m_pParserState->m_aTextBufferMaps.emplace_back(id, aFind->second);
rMap.erase(aFind);
return true;
}
@@ -1075,7 +1075,7 @@ bool VclBuilder::extractButtonImage(const OString &id, stringmap &rMap, bool bRa
VclBuilder::stringmap::iterator aFind = rMap.find(OString("image"));
if (aFind != rMap.end())
{
- m_pParserState->m_aButtonImageWidgetMaps.push_back(ButtonImageWidgetMap(id, aFind->second, bRadio));
+ m_pParserState->m_aButtonImageWidgetMaps.emplace_back(id, aFind->second, bRadio);
rMap.erase(aFind);
return true;
}
@@ -1091,7 +1091,7 @@ void VclBuilder::extractMnemonicWidget(const OString &rLabelID, stringmap &rMap)
sal_Int32 nDelim = sID.indexOf(':');
if (nDelim != -1)
sID = sID.copy(0, nDelim);
- m_pParserState->m_aMnemonicWidgetMaps.push_back(MnemonicWidgetMap(rLabelID, sID));
+ m_pParserState->m_aMnemonicWidgetMaps.emplace_back(rLabelID, sID);
rMap.erase(aFind);
}
}
@@ -1153,14 +1153,14 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
OString sTabPageId = get_by_window(pParent) +
OString("-page") +
OString::number(nNewPageCount);
- m_aChildren.push_back(WinAndId(sTabPageId, pPage, false));
+ m_aChildren.emplace_back(sTabPageId, pPage, false);
pPage->SetHelpId(m_sHelpRoot + sTabPageId);
//And give the page one container as a child to make it a layout enabled
//tab page
VclPtrInstance<VclBin> pContainer(pPage);
pContainer->Show();
- m_aChildren.push_back(WinAndId(OString(), pContainer, false));
+ m_aChildren.emplace_back(OString(), pContainer, false);
pContainer->SetHelpId(m_sHelpRoot + sTabPageId + OString("-bin"));
pParent = pContainer;
@@ -1239,7 +1239,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
else
{
xButton = extractStockAndBuildMenuButton(pParent, rMap);
- m_pParserState->m_aButtonMenuMaps.push_back(ButtonMenuMap(id, sMenu));
+ m_pParserState->m_aButtonMenuMaps.emplace_back(id, sMenu);
}
xButton->SetImageAlign(ImageAlign::Left); //default to left
setupFromActionName(xButton, rMap, m_xFrame);
@@ -1251,7 +1251,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
OUString sMenu = BuilderUtils::extractCustomProperty(rMap);
assert(sMenu.getLength() && "not implemented yet");
xButton = extractStockAndBuildMenuToggleButton(pParent, rMap);
- m_pParserState->m_aButtonMenuMaps.push_back(ButtonMenuMap(id, sMenu));
+ m_pParserState->m_aButtonMenuMaps.emplace_back(id, sMenu);
xButton->SetImageAlign(ImageAlign::Left); //default to left
setupFromActionName(xButton, rMap, m_xFrame);
xWindow = xButton;
@@ -1647,7 +1647,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
{
OUString sMenu = BuilderUtils::extractCustomProperty(rMap);
if (!sMenu.isEmpty())
- m_pParserState->m_aButtonMenuMaps.push_back(ButtonMenuMap(id, sMenu));
+ m_pParserState->m_aButtonMenuMaps.emplace_back(id, sMenu);
setupFromActionName(static_cast<Button*>(xWindow.get()), rMap, m_xFrame);
}
}
@@ -1663,7 +1663,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
xWindow->ImplGetWindowImpl()->mpRealParent.get() << "/" <<
xWindow->ImplGetWindowImpl()->mpBorderWindow.get() << ") with helpid " <<
xWindow->GetHelpId());
- m_aChildren.push_back(WinAndId(id, xWindow, bVertical));
+ m_aChildren.emplace_back(id, xWindow, bVertical);
}
return xWindow;
}
@@ -2466,7 +2466,7 @@ void VclBuilder::handleMenu(xmlreader::XmlReader &reader, const OString &rID)
break;
}
- m_aMenus.push_back(MenuAndId(rID, pCurrentMenu));
+ m_aMenus.emplace_back(rID, pCurrentMenu);
}
void VclBuilder::handleMenuChild(PopupMenu *pParent, xmlreader::XmlReader &reader)
@@ -2580,7 +2580,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader)
{
- m_pParserState->m_aSizeGroups.push_back(SizeGroup());
+ m_pParserState->m_aSizeGroups.emplace_back();
SizeGroup &rSizeGroup = m_pParserState->m_aSizeGroups.back();
int nLevel = 1;