diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-30 10:29:19 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-01 10:43:24 +0000 |
commit | 58aea3f36c14414f95668e229a7350598f6c53a8 (patch) | |
tree | 70c115dffd44576313cefd49e4164d293895e4bd /framework/source/services/pathsettings.cxx | |
parent | 3fcbfe10857631212d8b8db9a079bb9692ed78bc (diff) |
loplugin:unusedmethods
- improvements to the plugin to find more method calls
- improvements to python script to remove more false+
- fix the FORCE_COMPILE_ALL build flag to include code in
the $WORKDIR
Change-Id: I4d6015dcb9b9d60c26f0bcee8abad807177a7836
Reviewed-on: https://gerrit.libreoffice.org/19064
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework/source/services/pathsettings.cxx')
-rw-r--r-- | framework/source/services/pathsettings.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 3f63fd3bc971..893594c1e7ff 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -636,7 +636,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) // avoid duplicates, by removing the writeable path from // the user defined path list if it happens to be there too - OUStringList::iterator aI = find(aPathVal.lUserPaths, aPathVal.sWritePath); + OUStringList::iterator aI = std::find(aPathVal.lUserPaths.begin(), aPathVal.lUserPaths.end(), aPathVal.sWritePath); if (aI != aPathVal.lUserPaths.end()) aPathVal.lUserPaths.erase(aI); @@ -724,8 +724,8 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, else { if ( - ( find(rPath.lInternalPaths, sOld) == rPath.lInternalPaths.end()) && - ( find(rPath.lUserPaths, sOld) == rPath.lUserPaths.end() ) && + ( std::find(rPath.lInternalPaths.begin(), rPath.lInternalPaths.end(), sOld) == rPath.lInternalPaths.end()) && + ( std::find(rPath.lUserPaths.begin(), rPath.lUserPaths.end(), sOld) == rPath.lUserPaths.end() ) && (! rPath.sWritePath.equals(sOld) ) ) rPath.lUserPaths.push_back(sOld); @@ -1056,10 +1056,10 @@ void PathSettings::impl_purgeKnownPaths(PathSettings::PathInfo& rPath, ++pIt ) { const OUString& rItem = *pIt; - OUStringList::iterator pItem = find(lList, rItem); + OUStringList::iterator pItem = std::find(lList.begin(), lList.end(), rItem); if (pItem != lList.end()) lList.erase(pItem); - pItem = find(rPath.lUserPaths, rItem); + pItem = std::find(rPath.lUserPaths.begin(), rPath.lUserPaths.end(), rItem); if (pItem != rPath.lUserPaths.end()) rPath.lUserPaths.erase(pItem); } @@ -1069,7 +1069,7 @@ void PathSettings::impl_purgeKnownPaths(PathSettings::PathInfo& rPath, while ( pIt != rPath.lUserPaths.end() ) { const OUString& rItem = *pIt; - OUStringList::iterator pItem = find(lList, rItem); + OUStringList::iterator pItem = std::find(lList.begin(), lList.end(), rItem); if ( pItem == lList.end() ) { rPath.lUserPaths.erase(pIt); @@ -1087,13 +1087,13 @@ void PathSettings::impl_purgeKnownPaths(PathSettings::PathInfo& rPath, ++pIt ) { const OUString& rItem = *pIt; - OUStringList::iterator pItem = find(lList, rItem); + OUStringList::iterator pItem = std::find(lList.begin(), lList.end(), rItem); if (pItem != lList.end()) lList.erase(pItem); } // Erase the write path from lList - OUStringList::iterator pItem = find(lList, rPath.sWritePath); + OUStringList::iterator pItem = std::find(lList.begin(), lList.end(), rPath.sWritePath); if (pItem != lList.end()) lList.erase(pItem); } |