diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-18 14:24:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-19 11:57:57 +0100 |
| commit | a5be07d6b627a18f104e2feed063ff9020e8c610 (patch) | |
| tree | 389ea7a3c163bcafca743373b94cda4fba937552 /desktop | |
| parent | b0cecbfb03dba67f01d1411a1e8b7402c2ca90ce (diff) | |
inline use-once typedefs
Change-Id: I5c3ffc03c26b3428f1f336e6ecba7838a1cf1157
Reviewed-on: https://gerrit.libreoffice.org/46764
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/dp_persmap.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index 5ca81c9a0b7b..ac45ea30142d 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.cxx @@ -276,8 +276,7 @@ bool PersistentMap::get( OString * value, OString const & key ) const void PersistentMap::add( OString const & key, OString const & value ) { - typedef std::pair<t_string2string_map::iterator,bool> InsertRC; - InsertRC r = m_entries.emplace(key,value); + auto r = m_entries.emplace(key,value); m_bIsDirty = r.second; } diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 6bb8e3e659b7..c012750573d3 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -1193,10 +1193,9 @@ bool PackageManagerImpl::synchronizeRemovedExtensions( bool bModified = false; ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() ); - typedef ActivePackages::Entries::const_iterator ITActive; bool bShared = (m_context == "shared"); - for (ITActive i = id2temp.begin(); i != id2temp.end(); ++i) + for (auto i = id2temp.begin(); i != id2temp.end(); ++i) { try { diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 2955757f4a19..bc440df922d5 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -315,9 +315,8 @@ void printf_packages( } else { - typedef std::vector< Reference<deployment::XPackage> >::const_iterator I_EXT; int index = 0; - for (I_EXT i = allExtensions.begin(); i != allExtensions.end(); ++i, ++index) + for (auto i = allExtensions.begin(); i != allExtensions.end(); ++i, ++index) { if (vecUnaccepted[index]) printf_unaccepted_licenses(*i); |