From 474d8ffd63bbad835f1d5ccb73fcb82c2849db0f Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
Date: Tue, 17 May 2011 12:44:26 +0200
Subject: Some cppcheck cleaning

---
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 8 ++++----
 jvmfwk/source/framework.cxx                | 2 +-
 jvmfwk/source/libxmlutil.cxx               | 8 ++++----
 jvmfwk/source/libxmlutil.hxx               | 9 ++++-----
 4 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'jvmfwk')

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index db8d537784de..4ffd415ef9b3 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -490,7 +490,7 @@ bool getJavaProps(const OUString & exePath,
         props.push_back(std::make_pair(sKey, sVal));
     }
 
-    if (rs != FileHandleReader::RESULT_ERROR && props.size()>0)
+    if (rs != FileHandleReader::RESULT_ERROR && !props.empty())
         ret = true;
 
     //process error stream data
@@ -649,7 +649,7 @@ bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome)
 
 void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
 {
-    if(vec.size() == 0)
+    if(vec.empty())
         return;
     int size= vec.size() - 1;
     int cIter= 0;
@@ -694,7 +694,7 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
                 vec.at(j)= less;
             }
         }
-        cIter++;
+        ++cIter;
     }
 }
 
@@ -1022,7 +1022,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
             break;
     }
 
-    if (props.size() == 0)
+    if (props.empty())
         return rtl::Reference<VendorBase>();
 
     //find java.vendor property
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index cd74131b24b2..9cf2c4985932 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -802,7 +802,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
             if (plerr == JFW_PLUGIN_E_NONE)
             {
                 //check if the vendor of the found JRE is supported
-                if (vecVendors.size() == 0)
+                if (vecVendors.empty())
                 {
                     //vendor does not matter
                     *ppInfo = pInfo;
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index e121712d8672..43d90d686dfd 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -60,7 +60,7 @@ xmlXPathObject* CXPathObjectPtr::operator ->()
 {
     return _object;
 }
-CXPathObjectPtr::operator xmlXPathObject*()
+CXPathObjectPtr::operator xmlXPathObject*() const
 {
     return _object;
 }
@@ -92,7 +92,7 @@ xmlXPathContext* CXPathContextPtr::operator ->()
     return _object;
 }
 
-CXPathContextPtr::operator xmlXPathContext*()
+CXPathContextPtr::operator xmlXPathContext*() const
 {
     return _object;
 }
@@ -124,7 +124,7 @@ xmlDoc* CXmlDocPtr::operator ->()
     return _object;
 }
 
-CXmlDocPtr::operator xmlDoc*()
+CXmlDocPtr::operator xmlDoc*() const
 {
     return _object;
 }
@@ -159,7 +159,7 @@ CXmlCharPtr & CXmlCharPtr::operator = (xmlChar* pObj)
     return *this;
 }
 
-CXmlCharPtr::operator xmlChar*()
+CXmlCharPtr::operator xmlChar*() const
 {
     return _object;
 }
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index b8c4a6e2f388..ccc20a233773 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -49,7 +49,7 @@ public:
      */
     CXPathObjectPtr & operator = (xmlXPathObject* pObj);
     xmlXPathObject* operator -> ();
-    operator xmlXPathObject* ();
+    operator xmlXPathObject* () const;
 };
 
 //===========================================================
@@ -65,7 +65,7 @@ public:
     CXPathContextPtr & operator = (xmlXPathContextPtr pObj);
     ~CXPathContextPtr();
     xmlXPathContext* operator -> ();
-    operator xmlXPathContext* ();
+    operator xmlXPathContext* () const;
 };
 
 //===========================================================
@@ -84,7 +84,7 @@ public:
     CXmlDocPtr & operator = (xmlDoc* pObj);
     ~CXmlDocPtr();
     xmlDoc* operator -> ();
-    operator xmlDoc* ();
+    operator xmlDoc* () const;
 };
 
 //===========================================================
@@ -100,8 +100,7 @@ public:
     CXmlCharPtr(const ::rtl::OUString &);
     ~CXmlCharPtr();
     CXmlCharPtr & operator = (xmlChar* pObj);
-//    xmlChar* operator -> ();
-    operator xmlChar* ();
+    operator xmlChar* () const;
     operator ::rtl::OUString ();
     operator ::rtl::OString ();
 };
-- 
cgit