From 3e82897353e576dc6e3fbf55371fda5a0c3415df Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 12 Jun 2014 14:06:28 +0200
Subject: improve the inlinesimplememberfunctions clang plugin
Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e
---
jvmfwk/source/elements.cxx | 33 ---------------------------------
jvmfwk/source/elements.hxx | 16 ++++++++--------
jvmfwk/source/framework.cxx | 8 --------
jvmfwk/source/framework.hxx | 4 ++--
jvmfwk/source/libxmlutil.cxx | 4 ----
jvmfwk/source/libxmlutil.hxx | 2 +-
6 files changed, 11 insertions(+), 56 deletions(-)
(limited to 'jvmfwk/source')
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 01cc105add9a..0adc5931d1d6 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -681,31 +681,10 @@ void NodeJava::addJRELocation(rtl_uString * sLocation)
m_JRELocations->push_back(OUString(sLocation));
}
-const boost::optional<sal_Bool> & NodeJava::getEnabled() const
-{
- return m_enabled;
-}
-const boost::optional<std::vector<OUString> >&
-NodeJava::getJRELocations() const
-{
- return m_JRELocations;
-}
-const boost::optional<OUString> & NodeJava::getUserClassPath() const
-{
- return m_userClassPath;
-}
-const boost::optional<std::vector<OUString> > & NodeJava::getVmParameters() const
-{
- return m_vmParameters;
-}
-const boost::optional<CNodeJavaInfo> & NodeJava::getJavaInfo() const
-{
- return m_javaInfo;
-}
jfw::FileStatus NodeJava::checkSettingsFileStatus(OUString const & sURL) const
{
@@ -1097,10 +1076,6 @@ void MergedSettings::merge(const NodeJava & share, const NodeJava & user)
m_JRELocations = * share.getJRELocations();
}
-const OUString& MergedSettings::getUserClassPath() const
-{
- return m_sClassPath;
-}
::std::vector< OString> MergedSettings::getVmParametersUtf8() const
{
@@ -1113,10 +1088,6 @@ const OUString& MergedSettings::getUserClassPath() const
return ret;
}
-const OString & MergedSettings::getJavaInfoAttrVendorUpdate() const
-{
- return m_javaInfo.sAttrVendorUpdate;
-}
JavaInfo * MergedSettings::createJavaInfo() const
@@ -1172,10 +1143,6 @@ void MergedSettings::getJRELocations(
}
*size = m_JRELocations.size();
}
-const std::vector<OUString> & MergedSettings::getJRELocations() const
-{
- return m_JRELocations;
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index ec708dbb482a..17d66fef227f 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -229,22 +229,22 @@ public:
/** returns the value of the element /java/enabled
*/
- const boost::optional<sal_Bool> & getEnabled() const;
+ const boost::optional<sal_Bool> & getEnabled() const { return m_enabled;}
/** returns the value of the element /java/userClassPath.
*/
- const boost::optional< OUString> & getUserClassPath() const;
+ const boost::optional< OUString> & getUserClassPath() const { return m_userClassPath;}
/** returns the value of the element /java/javaInfo.
*/
- const boost::optional<CNodeJavaInfo> & getJavaInfo() const;
+ const boost::optional<CNodeJavaInfo> & getJavaInfo() const { return m_javaInfo;}
/** returns the parameters from the element /java/vmParameters/param.
*/
- const boost::optional< ::std::vector< OUString> > & getVmParameters() const;
+ const boost::optional< ::std::vector< OUString> > & getVmParameters() const { return m_vmParameters;}
/** returns the parameters from the element /java/jreLocations/location.
*/
- const boost::optional< ::std::vector< OUString> > & getJRELocations() const;
+ const boost::optional< ::std::vector< OUString> > & getJRELocations() const { return m_JRELocations;}
};
/** merges the settings for shared, user and installation during construction.
@@ -293,7 +293,7 @@ public:
*/
bool getEnabled() const { return m_bEnabled;}
- const OUString & getUserClassPath() const;
+ const OUString & getUserClassPath() const { return m_sClassPath;}
::std::vector< OString> getVmParametersUtf8() const;
/** returns a JavaInfo structure representing the node
@@ -305,7 +305,7 @@ public:
/** returns the value of the attribute /java/javaInfo[@vendorUpdate].
*/
- OString const & getJavaInfoAttrVendorUpdate() const;
+ OString const & getJavaInfoAttrVendorUpdate() const { return m_javaInfo.sAttrVendorUpdate;}
#ifdef WNT
/** returns the javaInfo@autoSelect attribute.
@@ -326,7 +326,7 @@ public:
*/
void getJRELocations(rtl_uString *** parLocations, sal_Int32 * size) const;
- const ::std::vector< OUString> & getJRELocations() const;
+ const ::std::vector< OUString> & getJRELocations() const { return m_JRELocations;}
};
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 4931737a0e03..1a32be20919f 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -1268,15 +1268,7 @@ CJavaInfo & CJavaInfo::operator = (const ::JavaInfo* info)
return *this;
}
-const ::JavaInfo* CJavaInfo::operator ->() const
-{
- return pInfo;
-}
-CJavaInfo::operator JavaInfo const * () const
-{
- return pInfo;
-}
OUString CJavaInfo::getVendor() const
{
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index b69382e0d0fa..cbb33edfcaff 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -95,9 +95,9 @@ public:
*/
void attach(::JavaInfo* pInfo);
::JavaInfo * detach();
- const ::JavaInfo* operator ->() const;
+ const ::JavaInfo* operator ->() const { return pInfo;}
operator ::JavaInfo* () { return pInfo;}
- operator ::JavaInfo const * () const;
+ operator ::JavaInfo const * () const { return pInfo;}
::JavaInfo* cloneJavaInfo() const;
OUString getVendor() const;
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index 83aadca49bdd..838c73590102 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -135,10 +135,6 @@ CXmlCharPtr::operator OUString()
return ret;
}
-CXmlCharPtr::operator OString()
-{
- return OString((sal_Char*) _object);
-}
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index 88f8127f7929..1679110e275f 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -93,7 +93,7 @@ public:
CXmlCharPtr & operator = (xmlChar* pObj);
operator xmlChar* () const { return _object;}
operator OUString ();
- operator OString ();
+ operator OString () { return OString((sal_Char*) _object);}
};
--
cgit