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
---
 binaryurp/source/binaryany.cxx |  4 ----
 binaryurp/source/binaryany.hxx |  2 +-
 binaryurp/source/bridge.cxx    | 18 +-----------------
 binaryurp/source/bridge.hxx    |  6 +++---
 binaryurp/source/proxy.cxx     |  6 ------
 binaryurp/source/proxy.hxx     |  4 ++--
 6 files changed, 7 insertions(+), 33 deletions(-)

(limited to 'binaryurp')

diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx
index a56663afad2d..d1b345a355b4 100644
--- a/binaryurp/source/binaryany.cxx
+++ b/binaryurp/source/binaryany.cxx
@@ -63,10 +63,6 @@ BinaryAny & BinaryAny::operator =(BinaryAny const & other) throw () {
     return *this;
 }
 
-uno_Any * BinaryAny::get() throw () {
-    return &data_;
-}
-
 css::uno::TypeDescription BinaryAny::getType() const throw () {
     return css::uno::TypeDescription(data_.pType);
 }
diff --git a/binaryurp/source/binaryany.hxx b/binaryurp/source/binaryany.hxx
index da359ec6dde0..38197f12b7bf 100644
--- a/binaryurp/source/binaryany.hxx
+++ b/binaryurp/source/binaryany.hxx
@@ -47,7 +47,7 @@ public:
 
     BinaryAny & operator =(BinaryAny const & other) throw ();
 
-    uno_Any * get() throw ();
+    uno_Any * get() throw () { return &data_; }
 
     com::sun::star::uno::TypeDescription getType() const throw ();
 
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index c93df640b555..dc0f3476bb9a 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -105,7 +105,7 @@ public:
 
     ~AttachThread();
 
-    rtl::ByteSequence getTid() throw ();
+    rtl::ByteSequence getTid() throw () { return tid_;}
 
 private:
     uno_ThreadPool threadPool_;
@@ -124,9 +124,6 @@ AttachThread::~AttachThread() {
     uno_releaseIdFromCurrentThread();
 }
 
-rtl::ByteSequence AttachThread::getTid() throw () {
-    return tid_;
-}
 
 class PopOutgoingRequest: private boost::noncopyable {
 public:
@@ -347,21 +344,8 @@ void Bridge::terminate(bool final) {
     terminated_.set();
 }
 
-css::uno::Reference< css::connection::XConnection > Bridge::getConnection()
-    const
-{
-    return connection_;
-}
 
-css::uno::Reference< css::bridge::XInstanceProvider > Bridge::getProvider()
-    const
-{
-    return provider_;
-}
 
-css::uno::Mapping & Bridge::getCppToBinaryMapping() {
-    return cppToBinaryMapping_;
-}
 
 BinaryAny Bridge::mapCppToBinaryAny(css::uno::Any const & cppAny) {
     css::uno::Any in(cppAny);
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index f22eb5aad5f5..e4d9c5554262 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -91,12 +91,12 @@ public:
     void terminate(bool final);
 
     com::sun::star::uno::Reference< com::sun::star::connection::XConnection >
-    getConnection() const;
+    getConnection() const { return connection_;}
 
     com::sun::star::uno::Reference< com::sun::star::bridge::XInstanceProvider >
-    getProvider() const;
+    getProvider() const { return provider_;}
 
-    com::sun::star::uno::Mapping & getCppToBinaryMapping();
+    com::sun::star::uno::Mapping & getCppToBinaryMapping() { return cppToBinaryMapping_;}
 
     BinaryAny mapCppToBinaryAny(com::sun::star::uno::Any const & cppAny);
 
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index a28dbc5ef560..571ab92a3d65 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -73,13 +73,7 @@ Proxy::Proxy(
     pDispatcher = &proxy_dispatchInterface;
 }
 
-OUString Proxy::getOid() const {
-    return oid_;
-}
 
-css::uno::TypeDescription Proxy::getType() const {
-    return type_;
-}
 
 void Proxy::do_acquire() {
     if (osl_atomic_increment(&references_) == 1) {
diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx
index b3bd4b56b362..b7491cbd691e 100644
--- a/binaryurp/source/proxy.hxx
+++ b/binaryurp/source/proxy.hxx
@@ -44,9 +44,9 @@ public:
         rtl::Reference< Bridge > const & bridge, OUString const & oid,
         com::sun::star::uno::TypeDescription const & type);
 
-    OUString getOid() const;
+    OUString getOid() const { return oid_;}
 
-    com::sun::star::uno::TypeDescription getType() const;
+    com::sun::star::uno::TypeDescription getType() const { return type_;}
 
     void do_acquire();
 
-- 
cgit