From 20c4a9ce69e73a182d60718e9b52510d66c8f20e Mon Sep 17 00:00:00 2001
From: Arkadiy Illarionov <qarkai@gmail.com>
Date: Tue, 26 Jun 2018 00:37:36 +0300
Subject: tdf#96099 Remove some trivial container iterator typedefs

Change-Id: Ifec98748d55ff6aca64c425c50c2cf2650f61591
Reviewed-on: https://gerrit.libreoffice.org/56422
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'jvmfwk')

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index dfa4653054cc..99feb5f157bc 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -891,9 +891,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
     static vector<OUString> vecBadPaths;
 
     static map<OUString, rtl::Reference<VendorBase> > mapJREs;
-    typedef map<OUString, rtl::Reference<VendorBase> >::const_iterator MapIt;
     OUString sFilePath;
-    typedef vector<OUString>::const_iterator cit_path;
     vector<pair<OUString, OUString> > props;
 
     OUString sResolvedDir = resolveDirPath(path);
@@ -908,7 +906,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
     //For example, a sun JDK contains <jdk>/bin/java and <jdk>/jre/bin/java.
     //When <jdk>/bin/java has been found then we need not find <jdk>/jre/bin/java.
     //Otherwise we would execute java two times for every JDK found.
-    MapIt entry2 = find_if(mapJREs.begin(), mapJREs.end(),
+    auto entry2 = find_if(mapJREs.cbegin(), mapJREs.cend(),
                            SameOrSubDirJREMap(sResolvedDir));
     if (entry2 != mapJREs.end())
     {
@@ -945,21 +943,21 @@ rtl::Reference<VendorBase> getJREInfoByPath(
             if (sFilePath.isEmpty())
             {
                 //The file path (to java exe) is not valid
-                cit_path ifull = find(vecBadPaths.begin(), vecBadPaths.end(), sFullPath);
-                if (ifull == vecBadPaths.end())
+                auto ifull = find(vecBadPaths.cbegin(), vecBadPaths.cend(), sFullPath);
+                if (ifull == vecBadPaths.cend())
                 {
                     vecBadPaths.push_back(sFullPath);
                 }
                 continue;
             }
 
-            cit_path ifile = find(vecBadPaths.begin(), vecBadPaths.end(), sFilePath);
-            if (ifile != vecBadPaths.end())
+            auto ifile = find(vecBadPaths.cbegin(), vecBadPaths.cend(), sFilePath);
+            if (ifile != vecBadPaths.cend())
             {
                 continue;
             }
 
-            MapIt entry =  mapJREs.find(sFilePath);
+            auto entry =  mapJREs.find(sFilePath);
             if (entry != mapJREs.end())
             {
                 JFW_TRACE2("JRE found again (detected before): " << sFilePath);
-- 
cgit