summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-02-11 13:20:49 +0200
committerNoel Grandin <noel@peralex.com>2015-02-23 09:26:58 +0200
commitba233e87efddf0a6751b35784dca1c805364ff3b (patch)
tree9d7c8a4256e688c2d47cb6ecf580ac196c4da2c0 /include
parenta2fa9e2468aa5c4fd4b610c5d0ebc8959e87a072 (diff)
remove unnecessary parenthesis in return statements
found with $ git grep -lP 'return\s*\(\s*\w+\s*\)\s*;' Change-Id: Ic51606877a9edcadeb647c5bf17bc928b69ab60e
Diffstat (limited to 'include')
-rw-r--r--include/o3tl/compat_functional.hxx12
-rw-r--r--include/registry/registry.hxx2
-rw-r--r--include/salhelper/refobj.hxx2
-rw-r--r--include/svx/AccessibleShape.hxx2
-rw-r--r--include/svx/dlgctl3d.hxx2
-rw-r--r--include/svx/viewpt3d.hxx2
-rw-r--r--include/tools/resid.hxx2
7 files changed, 12 insertions, 12 deletions
diff --git a/include/o3tl/compat_functional.hxx b/include/o3tl/compat_functional.hxx
index 6dff02bc7b74..6d04e6744ca3 100644
--- a/include/o3tl/compat_functional.hxx
+++ b/include/o3tl/compat_functional.hxx
@@ -43,7 +43,7 @@ struct project1st : public std::binary_function<T1, T2, T1>
{
T1 operator()(const T1& y, const T2&) const
{
- return (y);
+ return y;
}
};
@@ -53,7 +53,7 @@ struct project2nd : public std::binary_function<T1, T2, T2>
{
T2 operator()(const T1&, const T2& x) const
{
- return (x);
+ return x;
}
};
@@ -63,7 +63,7 @@ struct select1st : public std::unary_function<P, typename P::first_type>
{
const typename P::first_type& operator()(const P& y) const
{
- return (y.first);
+ return y.first;
}
};
@@ -73,7 +73,7 @@ struct select2nd : public std::unary_function<P, typename P::second_type>
{
const typename P::second_type& operator()(const P& y) const
{
- return (y.second);
+ return y.second;
}
};
@@ -86,7 +86,7 @@ class unary_compose : public std::unary_function<typename F2::argument_type, typ
typename F1::result_type operator()(const typename F2::argument_type& y) const
{
- return (ftor1(ftor2(y)));
+ return ftor1(ftor2(y));
}
protected:
@@ -98,7 +98,7 @@ class unary_compose : public std::unary_function<typename F2::argument_type, typ
template<class F1, class F2>
inline unary_compose<F1, F2> compose1(const F1& fnction1, const F2& fnction2)
{
- return (unary_compose<F1, F2>(fnction1, fnction2));
+ return unary_compose<F1, F2>(fnction1, fnction2);
}
} // namespace o3tl
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index 09194c428a3e..f17a61abe8e7 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -719,7 +719,7 @@ inline RegError RegistryKeyArray::closeKeyHandles()
m_phKeys = NULL;
return ret;
} else
- return(REG_INVALID_KEY);
+ return REG_INVALID_KEY;
}
diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx
index 4a004d2c8eb8..2eee3935f016 100644
--- a/include/salhelper/refobj.hxx
+++ b/include/salhelper/refobj.hxx
@@ -54,7 +54,7 @@ public:
}
static void* operator new (size_t, void* p)
{
- return (p);
+ return p;
}
static void operator delete (void*, void*)
{}
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index e7a6442b6537..b51e62b4cee6 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -385,7 +385,7 @@ public:
//===== Misc ========================================================
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- GetXShape() { return( mxShape );}
+ GetXShape() { return mxShape; }
/** set the index _nIndex at the accessible shape
@param _nIndex
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 31796a24ab8a..a17e9a81ab4a 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -59,7 +59,7 @@ public:
void Reset();
virtual void SetObjectType(sal_uInt16 nType);
- sal_uInt16 GetObjectType() const { return( mnObjectType ); }
+ sal_uInt16 GetObjectType() const { return mnObjectType; }
SfxItemSet Get3DAttributes() const;
virtual void Set3DAttributes(const SfxItemSet& rAttr);
};
diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx
index 481705b24a91..1778bffb8da4 100644
--- a/include/svx/viewpt3d.hxx
+++ b/include/svx/viewpt3d.hxx
@@ -96,7 +96,7 @@ class SVX_DLLPUBLIC Viewport3D
void SetProjection(ProjectionType ePrj)
{ eProjection = ePrj; bTfValid = false; }
- ProjectionType GetProjection() const { return(eProjection); }
+ ProjectionType GetProjection() const { return eProjection; }
void SetAspectMapping(AspectMapType eAsp)
{ eAspectMapping = eAsp; bTfValid = false; }
diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx
index 26f21c742536..6d9bb9204e6b 100644
--- a/include/tools/resid.hxx
+++ b/include/tools/resid.hxx
@@ -69,7 +69,7 @@ public:
sal_uInt32 GetWinBits() const { return m_nWinBits; }
void SetWinBits( sal_uInt32 nBits ) const { m_nWinBits = nBits; }
- RESOURCE_TYPE GetRT() const { return( m_nRT ); }
+ RESOURCE_TYPE GetRT() const { return m_nRT; }
/** Set the type if not already set. Ask for type with GetRT()