[Libreoffice-commits] .: 3 commits - jvmfwk/plugins rdbmaker/source

[Caolán McNamara]

 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx        |   12 ++++++------
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |    4 ++--
 rdbmaker/source/rdbmaker/rdbmaker.cxx               |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 5f989eb0808eeceb8a4a73ad18de59e2bdcb1d74
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 23 21:02:38 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 4fb35d4..1cc5ae3 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -104,7 +104,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     bool bAccess = false;
 
     typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
-    for (it_prop i = props.begin(); i != props.end(); i++)
+    for (it_prop i = props.begin(); i != props.end(); ++i)
     {
         if(! bVendor && sVendorProperty.equals(i->first))
         {
@@ -171,7 +171,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     
     bool bRt = false;
     typedef vector<OUString>::const_iterator i_path;
-    for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
+    for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
     {
         //Construct an absolute path to the possible runtime
         OUString usRt= m_sHome + *ip;
@@ -188,7 +188,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     if (!bRt)
     {
         m_sHome = m_sJavaHome;
-        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
+        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
         {
             //Construct an absolute path to the possible runtime
             OUString usRt= m_sHome + *ip;
@@ -207,7 +207,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     if (!bRt && m_sJavaHome != sJavaLibraryPath)
     {
         m_sHome = sJavaLibraryPath;
-        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
+        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
         {
             //Construct an absolute path to the possible runtime
             OUString usRt= m_sHome + *ip;
@@ -227,7 +227,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     if (!bRt && m_sJavaHome != rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib")))
     {
         m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib64"));
-        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
+        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
         {
             //Construct an absolute path to the possible runtime
             OUString usRt= m_sHome + *ip;
@@ -256,7 +256,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     OUString sPathSep= OUString::createFromAscii(arSep);
     bool bLdPath = true;
     int c = 0;
-    for(i_path il = ld_paths.begin(); il != ld_paths.end(); il ++, c++)
+    for(i_path il = ld_paths.begin(); il != ld_paths.end(); ++il, ++c)
     {
         OUString usAbsUrl= m_sHome + *il;
         // convert to system path
commit 1880bb128626b24703e9382542bdbb7af63d028b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 23 16:30:14 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index dd304e8..02cc1ac 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -236,7 +236,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
     vector<rtl::Reference<VendorBase> > vecVerifiedInfos;
 
     typedef vector<rtl::Reference<VendorBase> >::iterator it;    
-    for (it i= vecInfos.begin(); i != vecInfos.end(); i++)
+    for (it i= vecInfos.begin(); i != vecInfos.end(); ++i)
     {
         const rtl::Reference<VendorBase>& cur = *i;
         
@@ -313,7 +313,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
     arInfo = (JavaInfo**) rtl_allocateMemory(vecVerifiedInfos.size() * sizeof (JavaInfo*));
     int j = 0;
     typedef vector<rtl::Reference<VendorBase> >::const_iterator cit;
-    for (cit ii = vecVerifiedInfos.begin(); ii != vecVerifiedInfos.end(); ii++, j++)
+    for (cit ii = vecVerifiedInfos.begin(); ii != vecVerifiedInfos.end(); ++ii, ++j)
     {
         arInfo[j] = createJavaInfo(*ii);
     }
commit 5f13a018f520c4392d1b83859dc7cd572f6fc5f2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 23 15:08:56 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index a5d2331..ed708c7 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -142,7 +142,7 @@ sal_Bool checkFilterTypes(const OString& type)
             return sal_True;			
         }
 
-        iter++;
+        ++iter;
     }
 
     return sal_False;
@@ -185,12 +185,12 @@ void cleanUp( sal_Bool bError)
     StringList::reverse_iterator iter = dirEntries.rbegin();
     while ( iter != dirEntries.rend() )
     {
-           if (rmdir((char*)(*iter).getStr()) == -1)
+        if (rmdir((char*)(*iter).getStr()) == -1)
         {
             break;
         }
         
-        iter++;
+        ++iter;
     }
 }