From a5be07d6b627a18f104e2feed063ff9020e8c610 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 18 Dec 2017 14:24:50 +0200 Subject: inline use-once typedefs Change-Id: I5c3ffc03c26b3428f1f336e6ecba7838a1cf1157 Reviewed-on: https://gerrit.libreoffice.org/46764 Tested-by: Jenkins Reviewed-by: Noel Grandin --- ucb/source/ucp/file/filrset.hxx | 3 +-- ucb/source/ucp/package/pkgprovider.cxx | 5 +---- ucb/source/ucp/webdav/webdavresponseparser.cxx | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'ucb/source') diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 87faa5dff7b7..22f77d574891 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -427,11 +427,10 @@ class XResultSet_impl : public Notifier, typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier > > IdentSet; typedef std::vector< css::uno::Reference< css::sdbc::XRow > > ItemSet; - typedef std::vector< OUString > UnqPathSet; IdentSet m_aIdents; ItemSet m_aItems; - UnqPathSet m_aUnqPath; + std::vector< OUString > m_aUnqPath; const OUString m_aBaseDirectory; osl::Directory m_aFolder; diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 912e1fdb7d8b..ddc3ba5d8210 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -81,10 +81,7 @@ public: }; -// Packages. -typedef std::unordered_map PackageMap; - -class Packages : public PackageMap {}; +class Packages : public std::unordered_map {}; } diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index 25b99d74252b..92f4d8b187bc 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -146,7 +146,6 @@ namespace namespace { typedef std::map< OUString, OUString > NamespaceMap; - typedef std::pair< const OUString, OUString > NamespaceValueType; class WebDAVContext { @@ -198,7 +197,7 @@ namespace { const OUString aToken(aName.copy(nIndex + 1)); - maNamespaceMap.insert(NamespaceValueType(aToken, xAttribs->getValueByIndex(a))); + maNamespaceMap.emplace(aToken, xAttribs->getValueByIndex(a)); } } } -- cgit v1.2.3