[Libreoffice-commits] .: jvmfwk/source

[Caolán McNamara]

 jvmfwk/source/framework.cxx |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit dd0a030f6918dc3b2617fecedc23277fda45b15c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 29 21:18:22 2010 +0000

    cppcheck: prefer prefix variants

diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 5c1364c..4631530 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -101,7 +101,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         //Use every plug-in library to get Java installations.        
         typedef std::vector<jfw::PluginLibrary>::const_iterator ci_pl;
         int cModule = 0;
-         for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); i++, cModule++)
+         for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); ++i, ++cModule)
          {
             const jfw::PluginLibrary & library = *i;
             jfw::VersionInfo versionInfo =
@@ -160,7 +160,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
             typedef std::vector<rtl::OUString>::const_iterator citLoc;
             //Check every manually added location
             for (citLoc ii = vecJRELocations.begin();
-                ii != vecJRELocations.end(); ii++)
+                ii != vecJRELocations.end(); ++ii)
             {
 // 				rtl::OUString sLocation =
 // 					rtl::OStringToOUString(*ii, RTL_TEXTENCODING_UTF8);
@@ -197,9 +197,9 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         //To obtain the JavaInfos for the manually added JRE locations the function
         //jfw_getJavaInfoByPath is called which can return a JavaInfo of any vendor.
         std::vector<jfw::CJavaInfo> vecInfoManual2;
-        for (it_info ivm = vecInfoManual.begin(); ivm != vecInfoManual.end(); ivm++)
+        for (it_info ivm = vecInfoManual.begin(); ivm != vecInfoManual.end(); ++ivm)
         {
-            for (ci_pl ii = vecPlugins.begin(); ii != vecPlugins.end(); ii++)
+            for (ci_pl ii = vecPlugins.begin(); ii != vecPlugins.end(); ++ii)
             {
                 if ( ii->sVendor.equals((*ivm)->sVendor))
                 {
@@ -211,7 +211,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         //Check which JavaInfo from vector vecInfoManual2 is already
         //contained in vecInfo. If it already exists then remove it from
         //vecInfoManual2
-        for (it_info j = vecInfo.begin(); j != vecInfo.end(); j++)
+        for (it_info j = vecInfo.begin(); j != vecInfo.end(); ++j)
         {
             it_info it_duplicate = 
                 std::find_if(vecInfoManual2.begin(), vecInfoManual2.end(),
@@ -229,10 +229,10 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         typedef std::vector<jfw::CJavaInfo>::iterator it;
         int index = 0;
         //Add the automatically detected JREs
-        for (it k = vecInfo.begin(); k != vecInfo.end(); k++)
+        for (it k = vecInfo.begin(); k != vecInfo.end(); ++k)
             (*pparInfo)[index++] = k->detach();
         //Add the manually detected JREs
-        for (it l = vecInfoManual2.begin(); l != vecInfoManual2.end(); l++)
+        for (it l = vecInfoManual2.begin(); l != vecInfoManual2.end(); ++l)
             (*pparInfo)[index++] = l->detach();
             
         *pSize = nSize;
@@ -384,7 +384,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
         //add the options set by options dialog
         int index = 2;
         typedef std::vector<rtl::OString>::const_iterator cit;
-        for (cit i = vmParams.begin(); i != vmParams.end(); i ++)
+        for (cit i = vmParams.begin(); i != vmParams.end(); ++i)
         {
             arOpt[index].optionString = const_cast<sal_Char*>(i->getStr());
             arOpt[index].extraInfo = 0;
@@ -462,7 +462,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
         //Java the loop will break
         typedef std::vector<jfw::PluginLibrary>::const_iterator ci_pl;
         int cModule = 0;
-        for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); i++, cModule++)
+        for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); ++i, ++cModule)
         {
             const jfw::PluginLibrary & library = *i;
             jfw::VersionInfo versionInfo =
@@ -544,7 +544,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
                 settings.getJRELocations();
             //use every plug-in to determine the JavaInfo objects
             bool bInfoFound = false;
-            for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); i++)
+            for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); ++i)
             {
                 const jfw::PluginLibrary & library = *i;
                 jfw::VersionInfo versionInfo =
@@ -566,7 +566,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
             
                 typedef std::vector<rtl::OUString>::const_iterator citLoc;
                 for (citLoc it = vecJRELocations.begin();
-                    it != vecJRELocations.end(); it++)
+                    it != vecJRELocations.end(); ++it)
                 {
                     jfw::CJavaInfo aInfo;
                     javaPluginError err = (*jfw_plugin_getJavaInfoByPathFunc)(
@@ -764,7 +764,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
         typedef std::vector<jfw::PluginLibrary>::const_iterator ci_pl;
         int cModule = 0;
         for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end();
-             i++, cModule++)
+             ++i, ++cModule)
         {
             const jfw::PluginLibrary & library = *i;
             jfw::VersionInfo versionInfo =