From 3e82897353e576dc6e3fbf55371fda5a0c3415df Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 12 Jun 2014 14:06:28 +0200 Subject: improve the inlinesimplememberfunctions clang plugin Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e --- configmgr/source/access.cxx | 3 --- configmgr/source/access.hxx | 2 +- configmgr/source/localizedvaluenode.cxx | 3 --- configmgr/source/localizedvaluenode.hxx | 2 +- configmgr/source/modifications.cxx | 3 --- configmgr/source/modifications.hxx | 2 +- configmgr/source/rootaccess.cxx | 3 --- configmgr/source/rootaccess.hxx | 2 +- configmgr/source/setnode.cxx | 6 ------ configmgr/source/setnode.hxx | 4 ++-- 10 files changed, 6 insertions(+), 24 deletions(-) (limited to 'configmgr') diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 7a3dcc4acec5..665b3cdd422f 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -1371,9 +1371,6 @@ css::uno::Any Access::queryInterface(css::uno::Type const & aType) return res; } -Components & Access::getComponents() const { - return components_; -} void Access::checkLocalizedPropertyAccess() { if (getNode()->kind() == Node::KIND_LOCALIZED_PROPERTY && diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index a91312f012a0..4dbc14e9adca 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -448,7 +448,7 @@ protected: com::sun::star::uno::Type const & aType) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - Components & getComponents() const; + Components & getComponents() const { return components_;} void checkLocalizedPropertyAccess(); diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx index f27f3a51ae6e..27b977d2d824 100644 --- a/configmgr/source/localizedvaluenode.cxx +++ b/configmgr/source/localizedvaluenode.cxx @@ -41,9 +41,6 @@ OUString LocalizedValueNode::getTemplateName() const { return OUString("*"); } -css::uno::Any LocalizedValueNode::getValue() const { - return value_; -} void LocalizedValueNode::setValue(int layer, css::uno::Any const & value) { setLayer(layer); diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx index 403a180428c9..08635f875251 100644 --- a/configmgr/source/localizedvaluenode.hxx +++ b/configmgr/source/localizedvaluenode.hxx @@ -38,7 +38,7 @@ public: virtual OUString getTemplateName() const SAL_OVERRIDE; - com::sun::star::uno::Any getValue() const; + com::sun::star::uno::Any getValue() const { return value_;} void setValue(int layer, com::sun::star::uno::Any const & value); diff --git a/configmgr/source/modifications.cxx b/configmgr/source/modifications.cxx index bd711f77a9cb..6b8cdf60aab3 100644 --- a/configmgr/source/modifications.cxx +++ b/configmgr/source/modifications.cxx @@ -73,9 +73,6 @@ void Modifications::remove(Path const & path) { } } -Modifications::Node const & Modifications::getRoot() const { - return root_; -} } diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx index 33bddadb3093..0521da5ae9ab 100644 --- a/configmgr/source/modifications.hxx +++ b/configmgr/source/modifications.hxx @@ -46,7 +46,7 @@ public: void remove(Path const & path); - Node const & getRoot() const; + Node const & getRoot() const { return root_;} private: Node root_; diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx index 8951dcdcf664..09ed9b0b41c4 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -106,9 +106,6 @@ OUString RootAccess::getAbsolutePathRepresentation() { return pathRepresentation_; } -OUString RootAccess::getLocale() const { - return locale_; -} void RootAccess::setAlive(bool b) { diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx index 6583cea1ce3f..4e300a7ba5c2 100644 --- a/configmgr/source/rootaccess.hxx +++ b/configmgr/source/rootaccess.hxx @@ -73,7 +73,7 @@ public: OUString getAbsolutePathRepresentation(); - OUString getLocale() const; + OUString getLocale() const { return locale_;} bool isUpdate() const { return update_;} diff --git a/configmgr/source/setnode.cxx b/configmgr/source/setnode.cxx index 76329a0570a8..d00253b891d2 100644 --- a/configmgr/source/setnode.cxx +++ b/configmgr/source/setnode.cxx @@ -80,13 +80,7 @@ int SetNode::getMandatory() const { return mandatory_; } -OUString const & SetNode::getDefaultTemplateName() const { - return defaultTemplateName_; -} -std::vector< OUString > & SetNode::getAdditionalTemplateNames() { - return additionalTemplateNames_; -} bool SetNode::isValidTemplate(OUString const & templateName) const { return Data::equalTemplateNames(templateName, defaultTemplateName_) || diff --git a/configmgr/source/setnode.hxx b/configmgr/source/setnode.hxx index 91dd7008c7b7..92774b36e344 100644 --- a/configmgr/source/setnode.hxx +++ b/configmgr/source/setnode.hxx @@ -48,9 +48,9 @@ public: virtual int getMandatory() const SAL_OVERRIDE; - OUString const & getDefaultTemplateName() const; + OUString const & getDefaultTemplateName() const { return defaultTemplateName_;} - std::vector< OUString > & getAdditionalTemplateNames(); + std::vector< OUString > & getAdditionalTemplateNames() { return additionalTemplateNames_;} bool isValidTemplate(OUString const & templateName) const; -- cgit