diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-09 10:09:42 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-09 10:10:13 +0200 |
commit | 184a00b96235f6432294ded63ce4a4a318effdb5 (patch) | |
tree | e4ae0e00cb168fa43d280cfb51a50515258b5320 /jvmfwk/source | |
parent | 534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff) |
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'jvmfwk/source')
-rw-r--r-- | jvmfwk/source/elements.cxx | 4 | ||||
-rw-r--r-- | jvmfwk/source/elements.hxx | 2 | ||||
-rw-r--r-- | jvmfwk/source/framework.cxx | 4 | ||||
-rw-r--r-- | jvmfwk/source/framework.hxx | 2 | ||||
-rw-r--r-- | jvmfwk/source/libxmlutil.cxx | 29 | ||||
-rw-r--r-- | jvmfwk/source/libxmlutil.hxx | 14 |
6 files changed, 9 insertions, 46 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 6b6ec8bd04f8..01cc105add9a 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -1097,10 +1097,6 @@ void MergedSettings::merge(const NodeJava & share, const NodeJava & user) m_JRELocations = * share.getJRELocations(); } -bool MergedSettings::getEnabled() const -{ - return m_bEnabled; -} const OUString& MergedSettings::getUserClassPath() const { return m_sClassPath; diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index 8fce7267edf4..ec708dbb482a 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -291,7 +291,7 @@ public: /** the default is true. */ - bool getEnabled() const; + bool getEnabled() const { return m_bEnabled;} const OUString & getUserClassPath() const; diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 56e24c6400a5..4931737a0e03 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -1223,10 +1223,6 @@ CJavaInfo::~CJavaInfo() jfw_freeJavaInfo(pInfo); } -CJavaInfo::operator ::JavaInfo* () -{ - return pInfo; -} JavaInfo * CJavaInfo::copyJavaInfo(const JavaInfo * pInfo) { diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx index 87f87619ad04..b69382e0d0fa 100644 --- a/jvmfwk/source/framework.hxx +++ b/jvmfwk/source/framework.hxx @@ -96,7 +96,7 @@ public: void attach(::JavaInfo* pInfo); ::JavaInfo * detach(); const ::JavaInfo* operator ->() const; - operator ::JavaInfo* (); + operator ::JavaInfo* () { return pInfo;} operator ::JavaInfo const * () const; ::JavaInfo* cloneJavaInfo() const; diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx index bb2640e7dd81..83aadca49bdd 100644 --- a/jvmfwk/source/libxmlutil.cxx +++ b/jvmfwk/source/libxmlutil.cxx @@ -44,15 +44,6 @@ CXPathObjectPtr & CXPathObjectPtr::operator = (xmlXPathObject* pObj) _object = pObj; return *this; } -xmlXPathObject* CXPathObjectPtr::operator ->() - -{ - return _object; -} -CXPathObjectPtr::operator xmlXPathObject*() const -{ - return _object; -} CXPathContextPtr::CXPathContextPtr(xmlXPathContextPtr aContext) : _object(aContext) @@ -76,15 +67,7 @@ CXPathContextPtr & CXPathContextPtr::operator = (xmlXPathContextPtr pObj) _object = pObj; return *this; } -xmlXPathContext* CXPathContextPtr::operator ->() -{ - return _object; -} -CXPathContextPtr::operator xmlXPathContext*() const -{ - return _object; -} CXmlDocPtr::CXmlDocPtr(xmlDoc* aDoc) : _object(aDoc) @@ -108,15 +91,7 @@ CXmlDocPtr & CXmlDocPtr::operator = (xmlDoc* pObj) return *this; } -xmlDoc* CXmlDocPtr::operator ->() -{ - return _object; -} -CXmlDocPtr::operator xmlDoc*() const -{ - return _object; -} CXmlCharPtr::CXmlCharPtr(xmlChar * aChar) @@ -148,10 +123,6 @@ CXmlCharPtr & CXmlCharPtr::operator = (xmlChar* pObj) return *this; } -CXmlCharPtr::operator xmlChar*() const -{ - return _object; -} CXmlCharPtr::operator OUString() { diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx index c8f68ed041db..88f8127f7929 100644 --- a/jvmfwk/source/libxmlutil.hxx +++ b/jvmfwk/source/libxmlutil.hxx @@ -39,8 +39,8 @@ public: /** Takes ownership of xmlXPathObject */ CXPathObjectPtr & operator = (xmlXPathObject* pObj); - xmlXPathObject* operator -> (); - operator xmlXPathObject* () const; + xmlXPathObject* operator -> () { return _object;} + operator xmlXPathObject* () const { return _object;} }; @@ -55,8 +55,8 @@ public: CXPathContextPtr(xmlXPathContextPtr aContext); CXPathContextPtr & operator = (xmlXPathContextPtr pObj); ~CXPathContextPtr(); - xmlXPathContext* operator -> (); - operator xmlXPathContext* () const; + xmlXPathContext* operator -> () { return _object;} + operator xmlXPathContext* () const { return _object;} }; @@ -74,8 +74,8 @@ public: */ CXmlDocPtr & operator = (xmlDoc* pObj); ~CXmlDocPtr(); - xmlDoc* operator -> (); - operator xmlDoc* () const; + xmlDoc* operator -> () { return _object;} + operator xmlDoc* () const { return _object;} }; @@ -91,7 +91,7 @@ public: CXmlCharPtr(const OUString &); ~CXmlCharPtr(); CXmlCharPtr & operator = (xmlChar* pObj); - operator xmlChar* () const; + operator xmlChar* () const { return _object;} operator OUString (); operator OString (); }; |