summaryrefslogtreecommitdiff
path: root/shell
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 /shell
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 'shell')
-rw-r--r--shell/source/win32/shlxthandler/ooofilt/propspec.cxx14
-rw-r--r--shell/source/win32/shlxthandler/ooofilt/propspec.hxx16
2 files changed, 15 insertions, 15 deletions
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
index 0860b3526a63..830bb4f486a0 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
@@ -104,7 +104,7 @@ CFullPropSpec::CFullPropSpec( CFullPropSpec const & src ) :
}
inline void * operator new( size_t /*size*/, void * p )
{
- return( p );
+ return p;
}
//+-------------------------------------------------------------------------
// Member: CFullPropSpec::operator=, public
@@ -158,12 +158,12 @@ BOOL CFullPropSpec::SetProperty( WCHAR const * wcsProperty )
memcpy( _psProperty.lpwstr,
wcsProperty,
len );
- return( TRUE );
+ return TRUE;
}
else
{
_psProperty.lpwstr = 0;
- return( FALSE );
+ return FALSE;
}
}
int CFullPropSpec::operator==( CFullPropSpec const & prop ) const
@@ -173,7 +173,7 @@ int CFullPropSpec::operator==( CFullPropSpec const & prop ) const
sizeof( _guidPropSet ) ) != 0 ||
prop._psProperty.ulKind != _psProperty.ulKind )
{
- return( 0 );
+ return 0;
}
switch( _psProperty.ulKind )
{
@@ -184,16 +184,16 @@ int CFullPropSpec::operator==( CFullPropSpec const & prop ) const
return( GetPropertyPropid() == prop.GetPropertyPropid() );
break;
default:
- return( 0 );
+ return 0;
break;
}
}
int CFullPropSpec::operator!=( CFullPropSpec const & prop ) const
{
if (*this == prop)
- return( 0 );
+ return 0;
else
- return( 1 );
+ return 1;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
index 5959cbf147b1..682d7df4b665 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
@@ -85,11 +85,11 @@ private:
inline void * CFullPropSpec::operator new( size_t size )
{
void * p = CoTaskMemAlloc( size );
- return( p );
+ return p;
}
inline void * CFullPropSpec::operator new( size_t /*size*/, void * p )
{
- return( p );
+ return p;
}
inline void CFullPropSpec::operator delete( void * p )
{
@@ -107,27 +107,27 @@ inline void CFullPropSpec::SetPropSet( GUID const & guidPropSet )
}
inline GUID const & CFullPropSpec::GetPropSet() const
{
- return( _guidPropSet );
+ return _guidPropSet;
}
inline PROPSPEC CFullPropSpec::GetPropSpec() const
{
- return( _psProperty );
+ return _psProperty;
}
inline WCHAR const * CFullPropSpec::GetPropertyName() const
{
- return( _psProperty.lpwstr );
+ return _psProperty.lpwstr;
}
inline PROPID CFullPropSpec::GetPropertyPropid() const
{
- return( _psProperty.propid );
+ return _psProperty.propid;
}
inline BOOL CFullPropSpec::IsPropertyName() const
{
- return( _psProperty.ulKind == PRSPEC_LPWSTR );
+ return _psProperty.ulKind == PRSPEC_LPWSTR;
}
inline BOOL CFullPropSpec::IsPropertyPropid() const
{
- return( _psProperty.ulKind == PRSPEC_PROPID );
+ return _psProperty.ulKind == PRSPEC_PROPID;
}
#endif // INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_PROPSPEC_HXX